From owner-trustedbsd-cvs@FreeBSD.ORG Sat Feb 11 23:04:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9897916A420 for ; Sat, 11 Feb 2006 23:04:28 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46EA243D45 for ; Sat, 11 Feb 2006 23:04:28 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 434B146C5C for ; Sat, 11 Feb 2006 18:04:15 -0500 (EST) Date: Sat, 11 Feb 2006 23:07:19 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: trustedbsd-cvs@TrustedBSD.org Message-ID: <20060211230430.R71792@fledge.watson.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Subject: trustedbsd-cvs: test post X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Feb 2006 23:04:28 -0000 This is a test post to test the transition to the FreeBSD.org mailman install. Please ignore. Robert N M Watson From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 12 01:18:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 15BBE16A420 for ; Sun, 12 Feb 2006 01:18:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1687943D45 for ; Sun, 12 Feb 2006 01:18:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D1AD046B6C for ; Sat, 11 Feb 2006 20:18:22 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6C5BA581C6; Sun, 12 Feb 2006 01:18:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AA1C16A423; Sun, 12 Feb 2006 01:18: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 2839416A422 for ; Sun, 12 Feb 2006 01:18:32 +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 6B1EB43D55 for ; Sun, 12 Feb 2006 01:18: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 k1C1IUbV021846 for ; Sun, 12 Feb 2006 01:18: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 k1C1IU8q021843 for perforce@freebsd.org; Sun, 12 Feb 2006 01:18:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 Feb 2006 01:18:30 GMT Message-Id: <200602120118.k1C1IU8q021843@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 X-Mailman-Approved-At: Sun, 12 Feb 2006 01:21:35 +0000 Cc: Subject: PERFORCE change 91600 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 01:18:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=91600 Change 91600 by rwatson@rwatson_peppercorn on 2006/02/12 01:17:49 Integrate last few changes from OpenBSM 1.0 alpha 4 from OpenBSM branch to TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#6 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#8 (text+ko) ==== @@ -64,6 +64,7 @@ Poul-Henning Kamp Christian Brueffer Olivier Houchard + Christian Peron In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -85,4 +86,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#7 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#8 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#4 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#5 $ # MAN= audit.2 \ @@ -16,4 +16,7 @@ audit_user.5 \ audit_warn.5 +MLINKS= getaudit.2 getaudit_addr.2 \ + setaudit.2 setaudit_addr.2 + .include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#5 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#6 $ */ #include @@ -41,7 +41,7 @@ usage(void) { - fprintf(stderr, "usage: dump [class|class_r|control|event|event_r|" + fprintf(stderr, "usage: audump [class|class_r|control|event|event_r|" "user|user_r]\n"); exit(-1); } From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 12 07:30:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6515E16A420 for ; Sun, 12 Feb 2006 07:30:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6357C43D53 for ; Sun, 12 Feb 2006 07:30:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4377E46BBC for ; Sun, 12 Feb 2006 02:30:20 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D15DA57B0D; Sun, 12 Feb 2006 07:30:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BFCEC16A423; Sun, 12 Feb 2006 07:30: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 76B3D16A420 for ; Sun, 12 Feb 2006 07:30:12 +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 DCF4943D55 for ; Sun, 12 Feb 2006 07:30:11 +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 k1C7UBab043673 for ; Sun, 12 Feb 2006 07:30:11 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1C7UBME043670 for perforce@freebsd.org; Sun, 12 Feb 2006 07:30:11 GMT (envelope-from csjp@freebsd.org) Date: Sun, 12 Feb 2006 07:30:11 GMT Message-Id: <200602120730.k1C7UBME043670@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 X-Mailman-Approved-At: Sun, 12 Feb 2006 07:37:30 +0000 Cc: Subject: PERFORCE change 91607 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 07:30:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=91607 Change 91607 by csjp@csjp_xor on 2006/02/12 07:29:11 Document the NO_AUDIT Affected files ... .. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#8 (text+ko) ==== @@ -467,6 +467,9 @@ .Pq Vt bool Set to not build programs and libraries related to ATM networking. +.It Va NO_AUDIT +.Pq Vt bool +Set to not build audit support. .It Va NO_AUTHPF .Pq Vt bool Set to not build From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 12 13:03:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B36816A420 for ; Sun, 12 Feb 2006 13:03:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC6CE43D45 for ; Sun, 12 Feb 2006 13:03:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C9CA946BD1 for ; Sun, 12 Feb 2006 08:03:30 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 80DBA56727; Sun, 12 Feb 2006 13:03:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7136916A423; Sun, 12 Feb 2006 13:03: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 2905716A420 for ; Sun, 12 Feb 2006 13:03:41 +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 E534943D45 for ; Sun, 12 Feb 2006 13:03:40 +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 k1CD3eGq071059 for ; Sun, 12 Feb 2006 13:03:40 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 k1CD3ebW071055 for perforce@freebsd.org; Sun, 12 Feb 2006 13:03:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 Feb 2006 13:03:40 GMT Message-Id: <200602121303.k1CD3ebW071055@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 X-Mailman-Approved-At: Sun, 12 Feb 2006 13:06:16 +0000 Cc: Subject: PERFORCE change 91612 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 13:03:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=91612 Change 91612 by rwatson@rwatson_peppercorn on 2006/02/12 13:03:30 Document that /etc files will have to be installed manually. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#15 (text+ko) ==== @@ -46,6 +46,10 @@ % bsdmake # bsdmake install +In both cases, you will need to manually propagate openbsm/etc/* into /etc +on your system; this is not done automatically so as to avoid disrupting +the current configuration. + Credits The following organizations and individuals have contributed substantially @@ -86,4 +90,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#14 $ +$P4: //depot/projects/trustedbsd/openbsm/README#15 $ From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 12 17:52:45 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5746E16A420 for ; Sun, 12 Feb 2006 17:52:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4BE143D46 for ; Sun, 12 Feb 2006 17:52:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5D37A46B52 for ; Sun, 12 Feb 2006 12:52:31 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E0A6A56072; Sun, 12 Feb 2006 17:52:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D017316A423; Sun, 12 Feb 2006 17:52:42 +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 8F46116A420 for ; Sun, 12 Feb 2006 17:52:42 +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 479ED43D46 for ; Sun, 12 Feb 2006 17:52:42 +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 k1CHqgXB093766 for ; Sun, 12 Feb 2006 17:52:42 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1CHqf6M093763 for perforce@freebsd.org; Sun, 12 Feb 2006 17:52:41 GMT (envelope-from csjp@freebsd.org) Date: Sun, 12 Feb 2006 17:52:41 GMT Message-Id: <200602121752.k1CHqf6M093763@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 91634 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 17:52:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=91634 Change 91634 by csjp@csjp_xor on 2006/02/12 17:51:52 Take the first stab at adding audit support into su(1). This will create a failure token for any error which will result in err{x}(3) being called. Here is a sample audit trail of a failed, then successful audit trail: header,68,1,su(1),0,Sun Feb 12 11:48:01 2006, + 877 msec subject,csjp,root,1001,csjp,1001,863,863,0,0.0.0.0 return,failure : Operation not permitted,1 trailer,68 header,68,1,su(1),0,Sun Feb 12 11:48:03 2006, + 655 msec subject,csjp,root,wheel,root,wheel,865,865,0,0.0.0.0 return,success,0 trailer,68 This code will conditionally be compiled into su(1) based on the status of the NO_AUDIT boolean make flag. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/Makefile#3 edit .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/Makefile#3 (text+ko) ==== @@ -10,4 +10,10 @@ BINMODE=4555 PRECIOUSPROG= +.if !defined(NO_AUDIT) +CFLAGS+= -DUSE_BSM_AUDIT +DPADD+= ${LIBBSM} +LDADD+= -lbsm +.endif + .include ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#5 (text+ko) ==== @@ -81,6 +81,9 @@ #include #include +#include +#include + #include #include #include @@ -131,6 +134,7 @@ } while (0) enum tristate { UNSET, YES, NO }; +enum auditevents { AUDIT_SU_FAILURE, AUDIT_SU_SUCCESS }; static pam_handle_t *pamh = NULL; static char **environ_pam; @@ -140,6 +144,7 @@ static void usage(void) __dead2; static void export_pam_environment(void); static int ok_to_export(const char *); +static void audit_su(au_id_t, int); extern char **environ; @@ -204,19 +209,31 @@ usage(); /* NOTREACHED */ - if (strlen(user) > MAXLOGNAME - 1) + if (strlen(user) > MAXLOGNAME - 1) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "username too long"); + } /* * Try to provide more helpful debugging output if su(1) is running * non-setuid, or was run from a file system not mounted setuid. */ - if (geteuid() != 0) + if (geteuid() != 0) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "not running setuid"); + } nargv = malloc(sizeof(char *) * (size_t)(argc + 4)); - if (nargv == NULL) + if (nargv == NULL) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "malloc failure"); + } nargv[argc + 3] = NULL; for (i = argc; i >= optind; i--) @@ -239,12 +256,20 @@ pwd = getpwnam(username); if (username == NULL || pwd == NULL || pwd->pw_uid != ruid) pwd = getpwuid(ruid); - if (pwd == NULL) + if (pwd == NULL) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "who are you?"); + } username = strdup(pwd->pw_name); - if (username == NULL) + if (username == NULL) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "strdup failure"); + } if (asme) { if (pwd->pw_shell != NULL && *pwd->pw_shell != '\0') { @@ -262,6 +287,9 @@ /* Do the whole PAM startup thing */ retcode = pam_start("su", user, &conv, &pamh); if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif syslog(LOG_ERR, "pam_start: %s", pam_strerror(pamh, retcode)); errx(1, "pam_start: %s", pam_strerror(pamh, retcode)); } @@ -275,6 +303,9 @@ retcode = pam_authenticate(pamh, 0); if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(ruid, AUDIT_SU_FAILURE); +#endif syslog(LOG_AUTH|LOG_WARNING, "BAD SU %s to %s on %s", username, user, mytty); errx(1, "Sorry"); @@ -286,8 +317,12 @@ syslog(LOG_ERR, "pam_get_item(PAM_USER): %s", pam_strerror(pamh, retcode)); pwd = getpwnam(user); - if (pwd == NULL) + if (pwd == NULL) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "unknown login: %s", user); + } retcode = pam_acct_mgmt(pamh, 0); if (retcode == PAM_NEW_AUTHTOK_REQD) { @@ -296,10 +331,16 @@ if (retcode != PAM_SUCCESS) { syslog(LOG_ERR, "pam_chauthtok: %s", pam_strerror(pamh, retcode)); +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "Sorry"); } } if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif syslog(LOG_ERR, "pam_acct_mgmt: %s", pam_strerror(pamh, retcode)); errx(1, "Sorry"); @@ -309,17 +350,29 @@ if (class == NULL) lc = login_getpwclass(pwd); else { - if (ruid != 0) + if (ruid != 0) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "only root may use -c"); + } lc = login_getclass(class); - if (lc == NULL) + if (lc == NULL) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "unknown class: %s", class); + } } /* if asme and non-standard target shell, must be root */ if (asme) { - if (ruid != 0 && !chshell(pwd->pw_shell)) + if (ruid != 0 && !chshell(pwd->pw_shell)) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "permission denied (shell)"); + } } else if (pwd->pw_shell && *pwd->pw_shell) { shell = pwd->pw_shell; @@ -343,19 +396,30 @@ /* Switch to home directory */ if (asthem) { - if (chdir(pwd->pw_dir) < 0) + if (chdir(pwd->pw_dir) < 0) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif errx(1, "no directory"); + } } /* * PAM modules might add supplementary groups in pam_setcred(), so * initialize them first. */ - if (setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETGROUP) < 0) + if (setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETGROUP) < 0) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "setusercontext"); + } retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED); if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif syslog(LOG_ERR, "pam_setcred: %s", pam_strerror(pamh, retcode)); errx(1, "failed to establish credentials."); @@ -363,6 +427,9 @@ if (asthem) { retcode = pam_open_session(pamh, 0); if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif syslog(LOG_ERR, "pam_open_session: %s", pam_strerror(pamh, retcode)); errx(1, "failed to open session."); @@ -384,6 +451,9 @@ statusp = 1; if (pipe(fds) == -1) { PAM_END(); +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "pipe"); } child_pid = fork(); @@ -416,12 +486,19 @@ child_pgrp = getpgid(child_pid); if (tcgetpgrp(STDERR_FILENO) == child_pgrp) tcsetpgrp(STDERR_FILENO, getpgrp()); - if (pid == -1) + if (pid == -1) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "waitpid"); + } PAM_END(); exit(WEXITSTATUS(statusp)); case -1: PAM_END(); +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "fork"); case 0: close(fds[1]); @@ -449,8 +526,12 @@ */ if ((asme || (!asthem && class == NULL)) && pwd->pw_uid) setwhat &= ~(LOGIN_SETPRIORITY | LOGIN_SETRESOURCES); - if (setusercontext(lc, pwd, pwd->pw_uid, setwhat) < 0) + if (setusercontext(lc, pwd, pwd->pw_uid, setwhat) < 0) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE); +#endif err(1, "setusercontext"); + } if (!asme) { if (asthem) { @@ -491,7 +572,10 @@ /* csh strips the first character... */ *np.a = asthem ? "-su" : iscsh == YES ? "_su" : "su"; - if (ruid != 0) +#ifdef USE_BSM_AUDIT + audit_su(ruid, AUDIT_SU_SUCCESS); +#endif + if (ruid != 0) syslog(LOG_NOTICE, "%s to %s%s", username, user, ontty()); @@ -578,3 +662,50 @@ snprintf(buf, sizeof(buf), " on %s", p); return buf; } + +#ifdef USE_BSM_AUDIT +static void +audit_su(au_id_t au_ctx, int what) +{ + token_t *token; + long acond; + int afd; + au_tid_t termid; + pid_t pid; + + if (auditon(A_GETCOND, &acond, sizeof(long)) < 0) { + /* + * If auditon(2) returns ENOSYS, then audit has not been + * compiled into the kernel, so just return. + */ + if (errno == ENOSYS) + return; + err(1, "auditon failed"); + } + afd = au_open(); + if (afd < 0) + err(1, "au_open failed"); + /* XXX what should we do for termid? */ + bzero(&termid, sizeof(termid)); + pid = getpid(); + token = au_to_subject32(au_ctx, geteuid(), getegid(), + getuid(), getgid(), pid, pid, &termid); + if (token == NULL) + errx(1, "audit: unable to build subject token"); + /* XXX what if au_fails? */ + (void) au_write(afd, token); + switch (what) { + case AUDIT_SU_FAILURE: + token = au_to_return32(1, EPERM); + break; + case AUDIT_SU_SUCCESS: + token = au_to_return32(0, 0); + break; + } + if (token == NULL) + errx(1, "audit: unable to build return32 token"); + (void) au_write(afd, token); + if (au_close(afd, 1, AUE_su) < 0) + errx(1, "audit: record not committed"); +} +#endif From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 12 17:58:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1926316A424 for ; Sun, 12 Feb 2006 17:58:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9387E43D46 for ; Sun, 12 Feb 2006 17:58:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C310146BBB for ; Sun, 12 Feb 2006 12:58:38 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A290F55C00; Sun, 12 Feb 2006 17:58:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 922CA16A423; Sun, 12 Feb 2006 17:58: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 5429016A420 for ; Sun, 12 Feb 2006 17:58:50 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2480543D46 for ; Sun, 12 Feb 2006 17:58:50 +0000 (GMT) (envelope-from brueffer@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 k1CHwoka094056 for ; Sun, 12 Feb 2006 17:58:50 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1CHwnci094053 for perforce@freebsd.org; Sun, 12 Feb 2006 17:58:49 GMT (envelope-from brueffer@freebsd.org) Date: Sun, 12 Feb 2006 17:58:49 GMT Message-Id: <200602121758.k1CHwnci094053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91635 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 17:58:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=91635 Change 91635 by brueffer@brueffer_serenity on 2006/02/12 17:57:59 Document NO_AUDIT. Affected files ... .. //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#9 (text+ko) ==== @@ -99,6 +99,7 @@ # To avoid building various parts of the base system: #NO_ACPI= # do not build acpiconf(8) and related programs #NO_ATM= # do not build ATM related programs and libraries +#NO_AUDIT= # do not build audit(4) support #NO_AUTHPF= # do not build and install authpf (setuid/gid) #NO_BLUETOOTH= # do not build Bluetooth related stuff #NO_BOOT= # do not build boot blocks and loader From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 12 18:52:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 923A516A420 for ; Sun, 12 Feb 2006 18:52:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12B6343D49 for ; Sun, 12 Feb 2006 18:52:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A544D46BD1 for ; Sun, 12 Feb 2006 13:51:46 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 749D4558F2; Sun, 12 Feb 2006 18:51:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6488916A423; Sun, 12 Feb 2006 18: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 1982716A420 for ; Sun, 12 Feb 2006 18:51:58 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC53243D48 for ; Sun, 12 Feb 2006 18:51:57 +0000 (GMT) (envelope-from brueffer@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 k1CIpvx4096269 for ; Sun, 12 Feb 2006 18:51:57 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1CIpvuc096266 for perforce@freebsd.org; Sun, 12 Feb 2006 18:51:57 GMT (envelope-from brueffer@freebsd.org) Date: Sun, 12 Feb 2006 18:51:57 GMT Message-Id: <200602121851.k1CIpvuc096266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91641 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 18:52:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=91641 Change 91641 by brueffer@brueffer_serenity on 2006/02/12 18:51:39 Make audit binaries conditional on NO_AUDIT. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#13 (text+ko) ==== @@ -12,10 +12,10 @@ ${_apmd} \ ${_arlcontrol} \ arp \ - audit \ - auditd \ - auditon \ - auditreduce \ + ${_audit} \ + ${_auditd} \ + ${_auditon} \ + ${_auditreduce} \ ${_asf} \ ${_atm} \ ${_authpf} \ @@ -124,7 +124,7 @@ pppd \ pppstats \ ${_praliases} \ - praudit \ + ${_praudit} \ procctl \ pstat \ pw \ @@ -200,6 +200,14 @@ _atm= atm .endif +.if !defined(NO_AUDIT) +_audit= audit +_auditd= auditd +_auditon= auditon +_auditreduce= auditreduce +_praudit= praudit +.endif + .if !defined(NO_BIND) .if !defined(NO_BIND_DNSSEC) && !defined(NO_CRYPT) _dnssec-keygen= dnssec-keygen From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 00:51:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 464D316A420 for ; Mon, 13 Feb 2006 00:51:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 824D943D48 for ; Mon, 13 Feb 2006 00:51:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C89DC46B85 for ; Sun, 12 Feb 2006 19:51:23 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E902E56E57; Mon, 13 Feb 2006 00:51:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D8D9216A423; Mon, 13 Feb 2006 00:51: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 9594416A420 for ; Mon, 13 Feb 2006 00:51:26 +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 5EAF243D45 for ; Mon, 13 Feb 2006 00:51:26 +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 k1D0pQ8Y032896 for ; Mon, 13 Feb 2006 00:51:26 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1D0pQN1032893 for perforce@freebsd.org; Mon, 13 Feb 2006 00:51:26 GMT (envelope-from csjp@freebsd.org) Date: Mon, 13 Feb 2006 00:51:26 GMT Message-Id: <200602130051.k1D0pQN1032893@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 91655 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 00:51:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=91655 Change 91655 by csjp@csjp_xor on 2006/02/13 00:50:26 - Check to see if we are runing as root, if we aren't the drop the call to audit failure. - Re-arrange the max login name logic so we don't audit failure due to excessive login name lengths when we are not root. - Don't attempt to audit after we have called setusercontext(), as it is possible that we are no longer running with the required privilege. - Move successful audits to right after the authentication succeeds. Discussed with: wsalamon Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#6 (text+ko) ==== @@ -209,22 +209,19 @@ usage(); /* NOTREACHED */ - if (strlen(user) > MAXLOGNAME - 1) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif - errx(1, "username too long"); - } - /* * Try to provide more helpful debugging output if su(1) is running * non-setuid, or was run from a file system not mounted setuid. */ if (geteuid() != 0) { + errx(1, "not running setuid"); + } + + if (strlen(user) > MAXLOGNAME - 1) { #ifdef USE_BSM_AUDIT audit_su(getuid(), AUDIT_SU_FAILURE); #endif - errx(1, "not running setuid"); + errx(1, "username too long"); } nargv = malloc(sizeof(char *) * (size_t)(argc + 4)); @@ -310,6 +307,9 @@ username, user, mytty); errx(1, "Sorry"); } +#ifdef USE_BSM_AUDIT + audit_su(ruid, AUDIT_SU_SUCCESS); +#endif retcode = pam_get_item(pamh, PAM_USER, (const void **)&p); if (retcode == PAM_SUCCESS) user = p; @@ -572,9 +572,6 @@ /* csh strips the first character... */ *np.a = asthem ? "-su" : iscsh == YES ? "_su" : "su"; -#ifdef USE_BSM_AUDIT - audit_su(ruid, AUDIT_SU_SUCCESS); -#endif if (ruid != 0) syslog(LOG_NOTICE, "%s to %s%s", username, user, ontty()); From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 01:12:10 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7FAC216A420 for ; Mon, 13 Feb 2006 01:12:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F37ED43D72 for ; Mon, 13 Feb 2006 01:11:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9729C46C21 for ; Sun, 12 Feb 2006 20:11:43 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 426E164855; Mon, 13 Feb 2006 01:11:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 31BF816A423; Mon, 13 Feb 2006 01:11: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 E681616A420 for ; Mon, 13 Feb 2006 01:11:54 +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 64DBD43D6D for ; Mon, 13 Feb 2006 01:11:51 +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 k1D1Bp8v033816 for ; Mon, 13 Feb 2006 01:11:51 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1D1BoiB033813 for perforce@freebsd.org; Mon, 13 Feb 2006 01:11:50 GMT (envelope-from csjp@freebsd.org) Date: Mon, 13 Feb 2006 01:11:50 GMT Message-Id: <200602130111.k1D1BoiB033813@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 91656 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 01:12:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=91656 Change 91656 by csjp@csjp_xor on 2006/02/13 01:11:27 Drop audit failures for reasons which were caused by the operating system instead of reasons caused by the user. An example might be failure to create a set of pipes via pipe(2) or the failure to fork a process. Discussed with: wsalamon Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#7 (text+ko) ==== @@ -226,9 +226,6 @@ nargv = malloc(sizeof(char *) * (size_t)(argc + 4)); if (nargv == NULL) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif errx(1, "malloc failure"); } @@ -262,9 +259,6 @@ username = strdup(pwd->pw_name); if (username == NULL) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "strdup failure"); } @@ -451,9 +445,6 @@ statusp = 1; if (pipe(fds) == -1) { PAM_END(); -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "pipe"); } child_pid = fork(); @@ -487,18 +478,12 @@ if (tcgetpgrp(STDERR_FILENO) == child_pgrp) tcsetpgrp(STDERR_FILENO, getpgrp()); if (pid == -1) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "waitpid"); } PAM_END(); exit(WEXITSTATUS(statusp)); case -1: PAM_END(); -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "fork"); case 0: close(fds[1]); From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 14:06:26 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A36516A420 for ; Mon, 13 Feb 2006 14:06:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 781D143D5C for ; Mon, 13 Feb 2006 14:06:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C625846BCF for ; Mon, 13 Feb 2006 09:06:05 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CCF0C5B4EC; Mon, 13 Feb 2006 14:06:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BD3E016A423; Mon, 13 Feb 2006 14:06: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 6739116A420 for ; Mon, 13 Feb 2006 14:06: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 2633543D55 for ; Mon, 13 Feb 2006 14:06: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 k1DE6Hne089865 for ; Mon, 13 Feb 2006 14:06: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 k1DE6E7U089862 for perforce@freebsd.org; Mon, 13 Feb 2006 14:06:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:06:14 GMT Message-Id: <200602131406.k1DE6E7U089862@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 91669 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:06:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=91669 Change 91669 by rwatson@rwatson_fledge on 2006/02/13 14:05:57 Move TrustedBSD.org web page from projcvs to P4 so that more TrustedBSD developers can get to it. While doing this, normalize on .pdf files as the file format for papers, rather than a blend of {postscript, pdf, compressed postscript, compressed pdf}. Obtained from: FreeBSD CVS Affected files ... .. //depot/projects/trustedbsd/www/20000809-trustedbsd-announcement.txt#1 add .. //depot/projects/trustedbsd/www/Makefile#1 add .. //depot/projects/trustedbsd/www/beastie.page#1 add .. //depot/projects/trustedbsd/www/bib-stylesheet.xsl#1 add .. //depot/projects/trustedbsd/www/components.gif#1 add .. //depot/projects/trustedbsd/www/components.page#1 add .. //depot/projects/trustedbsd/www/componentsgray.gif#1 add .. //depot/projects/trustedbsd/www/dev-stylesheet.xsl#1 add .. //depot/projects/trustedbsd/www/developers.dev#1 add .. //depot/projects/trustedbsd/www/developers.gif#1 add .. //depot/projects/trustedbsd/www/developersgray.gif#1 add .. //depot/projects/trustedbsd/www/docs.bib#1 add .. //depot/projects/trustedbsd/www/docs.gif#1 add .. //depot/projects/trustedbsd/www/docsgray.gif#1 add .. //depot/projects/trustedbsd/www/heading.xsl#1 add .. //depot/projects/trustedbsd/www/home.gif#1 add .. //depot/projects/trustedbsd/www/home.page#1 add .. //depot/projects/trustedbsd/www/homegray.gif#1 add .. //depot/projects/trustedbsd/www/horizontalbar1.gif#1 add .. //depot/projects/trustedbsd/www/includes.xsl#1 add .. //depot/projects/trustedbsd/www/legal.page#1 add .. //depot/projects/trustedbsd/www/mac.page#1 add .. //depot/projects/trustedbsd/www/mailinglists.gif#1 add .. //depot/projects/trustedbsd/www/mailinglists.page#1 add .. //depot/projects/trustedbsd/www/mailinglistsgray.gif#1 add .. //depot/projects/trustedbsd/www/minipemaquidlight.jpg#1 add .. //depot/projects/trustedbsd/www/news.page#1 add .. //depot/projects/trustedbsd/www/openbsm.page#1 add .. //depot/projects/trustedbsd/www/page.css#1 add .. //depot/projects/trustedbsd/www/page.xsl#1 add .. //depot/projects/trustedbsd/www/pemaquidlight.jpg#1 add .. //depot/projects/trustedbsd/www/powerlogo.gif#1 add .. //depot/projects/trustedbsd/www/resources.gif#1 add .. //depot/projects/trustedbsd/www/robots.txt#1 add .. //depot/projects/trustedbsd/www/sebsd-july2003.pdf#1 add .. //depot/projects/trustedbsd/www/sebsd.page#1 add .. //depot/projects/trustedbsd/www/sedarwin.page#1 add .. //depot/projects/trustedbsd/www/sidebar.xml#1 add .. //depot/projects/trustedbsd/www/trusted.web.mk#1 add .. //depot/projects/trustedbsd/www/trustedbsd-bsdcon-2000.pdf#1 add .. //depot/projects/trustedbsd/www/trustedbsd-discex3.pdf#1 add .. //depot/projects/trustedbsd/www/trustedbsd-freenix-2001.ps#1 add .. //depot/projects/trustedbsd/www/trustedbsd-supfile#1 add .. //depot/projects/trustedbsd/www/trustedbsd-usenix2003freenix.pdf#1 add .. //depot/projects/trustedbsd/www/trustydibmed2.jpg#1 add .. //depot/projects/trustedbsd/www/trustyshadow.gif#1 add .. //depot/projects/trustedbsd/www/trustyteenie.gif#1 add .. //depot/projects/trustedbsd/www/verticalbar1.gif#1 add .. //depot/projects/trustedbsd/www/wwwheader.gif#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 14:09:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F04716A420 for ; Mon, 13 Feb 2006 14:09:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A2CF43D55 for ; Mon, 13 Feb 2006 14:09:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D94E246BCF for ; Mon, 13 Feb 2006 09:09:11 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 96F86571A6; Mon, 13 Feb 2006 14:09:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8632316A423; Mon, 13 Feb 2006 14:09: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 3305E16A420 for ; Mon, 13 Feb 2006 14:09:23 +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 737E443D62 for ; Mon, 13 Feb 2006 14:09: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 k1DE9LN6090206 for ; Mon, 13 Feb 2006 14:09: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 k1DE9Lnf090203 for perforce@freebsd.org; Mon, 13 Feb 2006 14:09:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:09:21 GMT Message-Id: <200602131409.k1DE9Lnf090203@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 91670 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:09:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=91670 Change 91670 by rwatson@rwatson_fledge on 2006/02/13 14:09:07 Move one more file from postscript to pdf. Affected files ... .. //depot/projects/trustedbsd/www/trustedbsd-freenix-2001.pdf#1 add .. //depot/projects/trustedbsd/www/trustedbsd-freenix-2001.ps#2 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 14:18:12 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8385016A420 for ; Mon, 13 Feb 2006 14:18:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5A8D43D55 for ; Mon, 13 Feb 2006 14:17:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5444046C49 for ; Mon, 13 Feb 2006 09:17:44 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 50A83635BC; Mon, 13 Feb 2006 14:17:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4080616A423; Mon, 13 Feb 2006 14:17: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 CC0E416A420 for ; Mon, 13 Feb 2006 14:17:51 +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 9ADC743D66 for ; Mon, 13 Feb 2006 14:17:39 +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 k1DEHdAO090863 for ; Mon, 13 Feb 2006 14:17:39 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 k1DEHcKM090845 for perforce@freebsd.org; Mon, 13 Feb 2006 14:17:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:17:38 GMT Message-Id: <200602131417.k1DEHcKM090845@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 91671 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:18:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=91671 Change 91671 by rwatson@rwatson_fledge on 2006/02/13 14:16:41 $P4$ Affected files ... .. //depot/projects/trustedbsd/www/Makefile#2 edit .. //depot/projects/trustedbsd/www/beastie.page#2 edit .. //depot/projects/trustedbsd/www/bib-stylesheet.xsl#2 edit .. //depot/projects/trustedbsd/www/components.page#2 edit .. //depot/projects/trustedbsd/www/dev-stylesheet.xsl#2 edit .. //depot/projects/trustedbsd/www/developers.dev#2 edit .. //depot/projects/trustedbsd/www/docs.bib#2 edit .. //depot/projects/trustedbsd/www/home.page#2 edit .. //depot/projects/trustedbsd/www/includes.xsl#2 edit .. //depot/projects/trustedbsd/www/legal.page#2 edit .. //depot/projects/trustedbsd/www/mac.page#2 edit .. //depot/projects/trustedbsd/www/mailinglists.page#2 edit .. //depot/projects/trustedbsd/www/news.page#2 edit .. //depot/projects/trustedbsd/www/openbsm.page#2 edit .. //depot/projects/trustedbsd/www/page.css#2 edit .. //depot/projects/trustedbsd/www/sebsd.page#2 edit .. //depot/projects/trustedbsd/www/sedarwin.page#2 edit .. //depot/projects/trustedbsd/www/trusted.web.mk#2 edit .. //depot/projects/trustedbsd/www/trustedbsd-supfile#2 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#2 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: projects/trustedbsd/www/Makefile,v 1.17 2006/02/09 20:50:23 rwatson Exp $ +# $P4: //depot/projects/trustedbsd/www/Makefile#2 $ STYLESHEET= page.xsl ==== //depot/projects/trustedbsd/www/beastie.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/beastie.page,v 1.4 2002/12/23 22:34:04 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/beastie.page#2 $ ==== //depot/projects/trustedbsd/www/bib-stylesheet.xsl#2 (text+ko) ==== @@ -29,7 +29,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: projects/trustedbsd/www/bib-stylesheet.xsl,v 1.10 2003/08/01 17:19:56 chris Exp $ + $P4: //depot/projects/trustedbsd/www/bib-stylesheet.xsl#2 $ --> - $FreeBSD: projects/trustedbsd/www/components.page,v 1.21 2005/04/29 10:25:02 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/components.page#2 $ ==== //depot/projects/trustedbsd/www/dev-stylesheet.xsl#2 (text+ko) ==== @@ -29,7 +29,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: projects/trustedbsd/www/dev-stylesheet.xsl,v 1.4 2002/12/23 22:34:04 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/dev-stylesheet.xsl#2 $ --> - $FreeBSD: projects/trustedbsd/www/developers.dev,v 1.16 2006/02/07 22:46:16 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/developers.dev#2 $ ==== //depot/projects/trustedbsd/www/docs.bib#2 (text+ko) ==== @@ -35,7 +35,7 @@ - $FreeBSD: projects/trustedbsd/www/docs.bib,v 1.16 2005/01/21 18:39:28 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/docs.bib#2 $ ==== //depot/projects/trustedbsd/www/home.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/home.page,v 1.10 2005/04/29 10:25:23 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/home.page#2 $ ==== //depot/projects/trustedbsd/www/includes.xsl#2 (text+ko) ==== @@ -29,7 +29,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: projects/trustedbsd/www/includes.xsl,v 1.4 2003/01/17 22:31:43 chris Exp $ + $P4: //depot/projects/trustedbsd/www/includes.xsl#2 $ --> ==== //depot/projects/trustedbsd/www/legal.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/legal.page,v 1.5 2003/01/26 22:11:38 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/legal.page#2 $ ==== //depot/projects/trustedbsd/www/mac.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/mac.page,v 1.2 2005/04/29 10:26:08 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/mac.page#2 $ ==== //depot/projects/trustedbsd/www/mailinglists.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/mailinglists.page,v 1.6 2006/02/11 23:23:16 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/mailinglists.page#2 $ ==== //depot/projects/trustedbsd/www/news.page#2 (text+ko) ==== @@ -35,7 +35,7 @@ - $FreeBSD: projects/trustedbsd/www/news.page,v 1.6 2005/04/29 16:57:38 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/news.page#2 $ ==== //depot/projects/trustedbsd/www/openbsm.page#2 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: projects/trustedbsd/www/openbsm.page,v 1.2 2005/05/02 01:13:30 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#2 $ ==== //depot/projects/trustedbsd/www/page.css#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: projects/trustedbsd/www/page.css,v 1.4 2003/01/17 22:31:43 chris Exp $ + * $P4: //depot/projects/trustedbsd/www/page.css#2 $ */ BODY { ==== //depot/projects/trustedbsd/www/sebsd.page#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: projects/trustedbsd/www/sebsd.page,v 1.6 2005/07/03 10:07:17 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/sebsd.page#2 $ ==== //depot/projects/trustedbsd/www/sedarwin.page#2 (text+ko) ==== @@ -36,7 +36,7 @@ - $FreeBSD: projects/trustedbsd/www/sedarwin.page,v 1.7 2006/02/13 13:50:44 rwatson Exp $ + $P4: //depot/projects/trustedbsd/www/sedarwin.page#2 $ ==== //depot/projects/trustedbsd/www/trusted.web.mk#2 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: projects/trustedbsd/www/trusted.web.mk,v 1.5 2003/01/03 03:28:22 chris Exp $ +# $P4: //depot/projects/trustedbsd/www/trusted.web.mk#2 $ TIDY?= tidy -i -m -f /dev/null XSLTPROC?= xsltproc -nonet ==== //depot/projects/trustedbsd/www/trustedbsd-supfile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: projects/trustedbsd/www/trustedbsd-supfile,v 1.5 2005/11/16 15:51:21 rwatson Exp $ +# $P4: //depot/projects/trustedbsd/www/trustedbsd-supfile#2 $ # # This is the sample CVSup supfile for the TrustedBSD Project. # From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 14:24:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF43816A420 for ; Mon, 13 Feb 2006 14:24:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6D4143D53 for ; Mon, 13 Feb 2006 14:24:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7CF0946C49 for ; Mon, 13 Feb 2006 09:23:59 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 50598D06A1; Mon, 13 Feb 2006 14:21:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 105EA16A42B; Mon, 13 Feb 2006 14:21: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 C4E3216A425 for ; Mon, 13 Feb 2006 14:21: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 0F87A43D58 for ; Mon, 13 Feb 2006 14:21: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 k1DELvTa091088 for ; Mon, 13 Feb 2006 14:21: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 k1DELvRk091085 for perforce@freebsd.org; Mon, 13 Feb 2006 14:21:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:21:57 GMT Message-Id: <200602131421.k1DELvRk091085@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 91672 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:24:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=91672 Change 91672 by rwatson@rwatson_fledge on 2006/02/13 14:20:57 Add reference to Audit handbook chapter. Affected files ... .. //depot/projects/trustedbsd/www/docs.bib#3 edit Differences ... ==== //depot/projects/trustedbsd/www/docs.bib#3 (text+ko) ==== @@ -35,7 +35,7 @@ - $P4: //depot/projects/trustedbsd/www/docs.bib#2 $ + $P4: //depot/projects/trustedbsd/www/docs.bib#3 $ @@ -201,6 +201,23 @@ + FreeBSD Handbook: Security Event Auditing + + + Tom Rhodes + + FreeBSD Project + + + + + + + Brief introduction to configuring and using TrustedBSD audit + on FreeBSD 7.x. + + + FreeBSD Handbook: File System Access Control Lists From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 14:34:41 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 541AD16A420 for ; Mon, 13 Feb 2006 14:34:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D25E43D75 for ; Mon, 13 Feb 2006 14:34:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D979E46C5E for ; Mon, 13 Feb 2006 09:34:13 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C14FA58E61; Mon, 13 Feb 2006 14:34:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B028716A423; Mon, 13 Feb 2006 14:34: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 36E2F16A420 for ; Mon, 13 Feb 2006 14:34: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 5163843D69 for ; Mon, 13 Feb 2006 14:34:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1DEYD1O091605 for ; Mon, 13 Feb 2006 14:34:13 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 k1DEYDuT091602 for perforce@freebsd.org; Mon, 13 Feb 2006 14:34:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:34:13 GMT Message-Id: <200602131434.k1DEYDuT091602@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 91673 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:34:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=91673 Change 91673 by rwatson@rwatson_fledge on 2006/02/13 14:33:53 Correct typo. Affected files ... .. //depot/projects/trustedbsd/www/sebsd.page#3 edit Differences ... ==== //depot/projects/trustedbsd/www/sebsd.page#3 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/sebsd.page#2 $ + $P4: //depot/projects/trustedbsd/www/sebsd.page#3 $ @@ -48,7 +48,7 @@

Perforce: - //depot/projects/trustedbsd/sebsd/... + //depot/projects/trustedbsd/sebsd/... Collection: p4-cvs-trustedbsd-sebsd

From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 14:53:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8550C16A420 for ; Mon, 13 Feb 2006 14:53:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8269E43D7D for ; Mon, 13 Feb 2006 14:53:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9068B46C64 for ; Mon, 13 Feb 2006 09:52:51 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A930A56421; Mon, 13 Feb 2006 14:52:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 97B2916A423; Mon, 13 Feb 2006 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 50E7616A422 for ; Mon, 13 Feb 2006 14:52: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 18EB043D7F for ; Mon, 13 Feb 2006 14:52: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 k1DEqbXE092403 for ; Mon, 13 Feb 2006 14:52: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 k1DEqbDN092400 for perforce@freebsd.org; Mon, 13 Feb 2006 14:52:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:52:37 GMT Message-Id: <200602131452.k1DEqbDN092400@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 91674 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:53:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=91674 Change 91674 by rwatson@rwatson_fledge on 2006/02/13 14:51:45 Give audit its own web page; expand/clarify/enhance/fix/update text relating to Audit and OpenBSM. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#3 edit .. //depot/projects/trustedbsd/www/audit.page#1 add .. //depot/projects/trustedbsd/www/components.page#3 edit .. //depot/projects/trustedbsd/www/openbsm.page#3 edit .. //depot/projects/trustedbsd/www/sidebar.xml#2 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#3 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#2 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#3 $ STYLESHEET= page.xsl @@ -44,6 +44,7 @@ SRCS+= openbsm.page SRCS+= sebsd.page SRCS+= sedarwin.page +SRCS+= audit.page IMGS= components.gif componentsgray.gif IMGS+= developers.gif developersgray.gif docs.gif ==== //depot/projects/trustedbsd/www/components.page#3 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/components.page#2 $ + $P4: //depot/projects/trustedbsd/www/components.page#3 $ @@ -103,12 +103,17 @@

Event auditing permits the selective logging of - security-relevant system events for the purposes of - analysis. Several experimental implementations of audit - for FreeBSD have been explored; the current implementation is - based on OpenBSM, an open source - implementation of Sun's Basic Security Module (BSM) API and file - format donated by Apple Computer, Inc.

+ security-relevant system events for the purposes of post-mortem + analysis, intrusion detection, and system monitoring. The + TrustedBSD audit implementation + provides a complete kernel audit event framework, extensive + auditing of system events, and user space application + integration. The user space libraries, tools, and file format + are based on the de facto industry standard Sun Basic Security + Module (BSM) API and file format. The + OpenBSM library and tool suite provides a portable, + BSD-licensed implementation, and is based on source code + donated by Apple Computer, Inc.

==== //depot/projects/trustedbsd/www/openbsm.page#3 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#2 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#3 $ @@ -45,10 +45,14 @@

OpenBSM is an open source implementation of Sun's Basic Security Module (BSM) Audit API and file format. - BSM, the de facto standard for Audit, describes a set of system call - and library interfaces for managing audit records, as well as a token - stream file format that permits extensible and generalized audit - trail processing.

+ BSM, the de facto industry standard for Audit, describes a set of + system call and library interfaces for managing audit records, as + well as a token stream file format that permits extensible and + generalized audit trail processing. + OpenBSM extends the BSM API and file format in a number of ways to + support features present in the Mac OS X and FreeBSD operating + systems, such as Mach task interfaces, sendfile(), and Linux system + calls present in the FreeBSD Linux emulation layer.

OpenBSM includes system include files appropriate for inclusion in an operating system implementation of Audit, libbsm, an @@ -60,14 +64,12 @@ easier audit trail analysis, including a pattern matching library.

-

OpenBSM is an important component of the TrustedBSD Audit Implementation for - FreeBSD, providing tools, libraries, and include files. - The first official release of OpenBSM will be made shortly before - the TrustedBSD audit presentation at BSDCan, - where members of the TrustedBSD team will describe the operation of - Audit on Darwin and FreeBSD, the components of OpenBSM, and how to - develop with the BSM APIs and file format.

+

OpenBSM is the core user space component of the TrustedBSD Audit Implementation for + FreeBSD, providing tools, libraries, and include files. Pre-releases + of OpenBSM are now available as part of the FreeBSD 7-CURRENT branch, + as integration of audit into the FreeBSD CVS tree is largely + complete.

OpenBSM is derived from the BSM audit implementation found in Apple's open source Darwin operating system, generously released by ==== //depot/projects/trustedbsd/www/sidebar.xml#2 (text+ko) ==== @@ -8,11 +8,12 @@

Components

  • Access Control Lists
    • -
  • Event Auditing and OpenBSM
    • +
  • Security Event Auditing
  • Extended Attributes
  • Fine-Grained Capabilities
  • Mandatory Access Control
    • +
  • OpenBSM
  • Security-Enhanced BSD (SEBSD)
  • Security-Enhanced Darwin (SEDarwin)
    • From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 14:56:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F9D216A420 for ; Mon, 13 Feb 2006 14:56:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42C5E43D66 for ; Mon, 13 Feb 2006 14:56:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B680E46C7A for ; Mon, 13 Feb 2006 09:55:53 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 28105735C4; Mon, 13 Feb 2006 14:55:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1620B16A425; Mon, 13 Feb 2006 14:55: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 D6EC416A429 for ; Mon, 13 Feb 2006 14:55: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 DD68843D45 for ; Mon, 13 Feb 2006 14:55: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 k1DEtgiI092555 for ; Mon, 13 Feb 2006 14:55: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 k1DEtgFd092552 for perforce@freebsd.org; Mon, 13 Feb 2006 14:55:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 13 Feb 2006 14:55:42 GMT Message-Id: <200602131455.k1DEtgFd092552@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 91675 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 14:56:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=91675 Change 91675 by rwatson@rwatson_fledge on 2006/02/13 14:55:13 Being at BSDCan 2005 is no longer news. Affected files ... .. //depot/projects/trustedbsd/www/news.page#3 edit .. //depot/projects/trustedbsd/www/sidebar.xml#3 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#3 (text+ko) ==== @@ -35,7 +35,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#2 $ + $P4: //depot/projects/trustedbsd/www/news.page#3 $ ==== //depot/projects/trustedbsd/www/sidebar.xml#3 (text+ko) ==== @@ -1,8 +1,4 @@ -
    -

    TrustedBSD News - TrustedBSD - at BSDCan 2005!

    -

    Components

    From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 21:10:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC45416A420 for ; Mon, 13 Feb 2006 21:10:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECFF543D5F for ; Mon, 13 Feb 2006 21:10:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B946A46C96 for ; Mon, 13 Feb 2006 16:10:39 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 226B091709; Mon, 13 Feb 2006 21:09:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 11E9D16A423; Mon, 13 Feb 2006 21:09: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 C9BD916A420 for ; Mon, 13 Feb 2006 21:09:19 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39E2743D48 for ; Mon, 13 Feb 2006 21:09:19 +0000 (GMT) (envelope-from millert@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 k1DL9J0h025233 for ; Mon, 13 Feb 2006 21:09:19 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DL9IKw025222 for perforce@freebsd.org; Mon, 13 Feb 2006 21:09:18 GMT (envelope-from millert@freebsd.org) Date: Mon, 13 Feb 2006 21:09:18 GMT Message-Id: <200602132109.k1DL9IKw025222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91691 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 21:10:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=91691 Change 91691 by millert@millert_ibook on 2006/02/13 21:08:33 Fix cut and pasto Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#13 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#13 (text+ko) ==== @@ -1996,7 +1996,7 @@ /** @brief Access control check for receiving Mach messsages @param task Label of the receiving task - @param port Label of the sending task + @param sender Label of the sending task Access control check for receiving messages. The two labels are locked. From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 21:15:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8043F16A420 for ; Mon, 13 Feb 2006 21:15:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A031D43D55 for ; Mon, 13 Feb 2006 21:15:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5748246B32 for ; Mon, 13 Feb 2006 16:15:28 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 67A265B1E4; Mon, 13 Feb 2006 21:15:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5703F16A423; Mon, 13 Feb 2006 21:15: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 2764416A420 for ; Mon, 13 Feb 2006 21:15:37 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5625F43D72 for ; Mon, 13 Feb 2006 21:15:31 +0000 (GMT) (envelope-from millert@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 k1DLFU7B025642 for ; Mon, 13 Feb 2006 21:15:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DLFUnS025639 for perforce@freebsd.org; Mon, 13 Feb 2006 21:15:30 GMT (envelope-from millert@freebsd.org) Date: Mon, 13 Feb 2006 21:15:30 GMT Message-Id: <200602132115.k1DLFUnS025639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91692 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 21:15:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=91692 Change 91692 by millert@millert_ibook on 2006/02/13 21:15:23 Add mac_check_port_receive() receive entry points. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_mqueue.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_mqueue.c#4 (text+ko) ==== @@ -655,9 +655,15 @@ ipc_kmsg_t *kmsgp; mach_port_seqno_t *seqnop; spl_t s; +#ifdef MAC + ipc_labelh_t lh; + task_t task; + int rc; +#endif s = splsched(); imq_lock(mqueue); + self = current_thread(); /* XXXMAC - lock it too? deadlock? */ if (imq_is_set(mqueue)) { wait_queue_link_t wql; @@ -712,6 +718,21 @@ ipc_mqueue_select(port_mq, option, max_size); imq_unlock(port_mq); +#ifdef MAC + if (self->ith_kmsg != NULL && + self->ith_kmsg->ikm_sender != NULL) { + lh = self->ith_kmsg->ikm_sender; + task = current_task(); + tasklabel_lock(task); + ip_lock(lh->lh_port); + rc = mac_check_port_receive(&task->maclabel, + &lh->lh_label); + ip_unlock(lh->lh_port); + tasklabel_unlock(task); + if (rc) + self->ith_state = MACH_RCV_INVALID_DATA; + } +#endif splx(s); return; @@ -726,6 +747,21 @@ if (ipc_kmsg_queue_first(kmsgs) != IKM_NULL) { ipc_mqueue_select(mqueue, option, max_size); imq_unlock(mqueue); +#ifdef MAC + if (self->ith_kmsg != NULL && + self->ith_kmsg->ikm_sender != NULL) { + lh = self->ith_kmsg->ikm_sender; + task = current_task(); + tasklabel_lock(task); + ip_lock(lh->lh_port); + rc = mac_check_port_receive(&task->maclabel, + &lh->lh_label); + ip_unlock(lh->lh_port); + tasklabel_unlock(task); + if (rc) + self->ith_state = MACH_RCV_INVALID_DATA; + } +#endif splx(s); return; } @@ -736,7 +772,6 @@ * block on (whether the set's or the local port's) is * still locked. */ - self = current_thread(); if (option & MACH_RCV_TIMEOUT) { if (timeout == 0) { imq_unlock(mqueue); From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 13 21:19:21 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AC2816A420 for ; Mon, 13 Feb 2006 21:19:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0FAF43D68 for ; Mon, 13 Feb 2006 21:19:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 468BE46C6A for ; Mon, 13 Feb 2006 16:19:01 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 65BC473E79; Mon, 13 Feb 2006 21:17:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A5E5816A45A; Mon, 13 Feb 2006 21:17:36 +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 4016F16A440 for ; Mon, 13 Feb 2006 21:17:36 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C483543D53 for ; Mon, 13 Feb 2006 21:17:34 +0000 (GMT) (envelope-from millert@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 k1DLHYC4025802 for ; Mon, 13 Feb 2006 21:17:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1DLHY3f025799 for perforce@freebsd.org; Mon, 13 Feb 2006 21:17:34 GMT (envelope-from millert@freebsd.org) Date: Mon, 13 Feb 2006 21:17:34 GMT Message-Id: <200602132117.k1DLHY3f025799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91694 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 21:19:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=91694 Change 91694 by millert@millert_ibook on 2006/02/13 21:16:38 Implement mpo_check_port_receive Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#30 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#30 (text+ko) ==== @@ -1167,6 +1167,7 @@ } CHECK_SIMPLE_PERM(msg_send,SECCLASS_MACH_PORT,MACH_PORT__SEND); +CHECK_SIMPLE_PERM(msg_receive,SECCLASS_MACH_PORT,MACH_PORT__RECV); CHECK_SIMPLE_PERM(port_make_send,SECCLASS_MACH_PORT,MACH_PORT__MAKE_SEND); CHECK_SIMPLE_PERM(port_copy_send,SECCLASS_MACH_PORT,MACH_PORT__COPY_SEND); CHECK_SIMPLE_PERM(port_move_recv,SECCLASS_MACH_PORT,MACH_PORT__MOVE_RECV); @@ -2682,6 +2683,7 @@ .mpo_check_cred_relabel = sebsd_check_cred_relabel, .mpo_check_port_relabel = sebsd_check_port_relabel, .mpo_check_port_send = sebsd_check_msg_send, + .mpo_check_port_receive = sebsd_check_msg_receive, .mpo_check_port_make_send = sebsd_check_port_make_send, .mpo_check_port_copy_send = sebsd_check_port_copy_send, .mpo_check_port_move_receive = sebsd_check_port_move_recv, From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 14 04:58:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AF6816A420 for ; Tue, 14 Feb 2006 04:58:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CA0043D53 for ; Tue, 14 Feb 2006 04:58:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E559046B83 for ; Mon, 13 Feb 2006 23:58:10 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 899B555DE7; Tue, 14 Feb 2006 04:58:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 79A9F16A423; Tue, 14 Feb 2006 04:58:22 +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 2B92B16A420 for ; Tue, 14 Feb 2006 04:58:22 +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 AB04043D4C for ; Tue, 14 Feb 2006 04:58:21 +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 k1E4wLEv060180 for ; Tue, 14 Feb 2006 04:58:21 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E4wLMM060174 for perforce@freebsd.org; Tue, 14 Feb 2006 04:58:21 GMT (envelope-from csjp@freebsd.org) Date: Tue, 14 Feb 2006 04:58:21 GMT Message-Id: <200602140458.k1E4wLMM060174@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 91725 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 04:58:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=91725 Change 91725 by csjp@csjp_xor on 2006/02/14 04:57:23 - Remove some more audits around PAM failures which really wouldn't be a result of the user input - Implement stdargs to audit_su() so we can specify messages which will be used to create text tokens to give more verbose information for the nature of the failures or success. - Add strings to audi_su() calls for text tokens - The user must never know about auditing operations. So change any writes to stderr to syslog(3) calls and simply return. It should be noted that this is what Solaris is doing, however CAPP is pretty clear about failed audits having to result in a failed operation. That said, I am not sure what an appropriate error message would be to report to the user in the event that we have to abort the entire operation due to a audit failure. Thoughts? Discussed with: wsalamon Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#8 (text+ko) ==== @@ -96,6 +96,7 @@ #include #include #include +#include #include #include @@ -144,7 +145,7 @@ static void usage(void) __dead2; static void export_pam_environment(void); static int ok_to_export(const char *); -static void audit_su(au_id_t, int); +static void audit_su(au_id_t, int, const char *, ...); extern char **environ; @@ -219,7 +220,7 @@ if (strlen(user) > MAXLOGNAME - 1) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); + audit_su(getuid(), AUDIT_SU_FAILURE, "username too long"); #endif errx(1, "username too long"); } @@ -252,7 +253,8 @@ pwd = getpwuid(ruid); if (pwd == NULL) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); + audit_su(getuid(), AUDIT_SU_FAILURE, + "unable to determain invoking subject"); #endif errx(1, "who are you?"); } @@ -278,9 +280,6 @@ /* Do the whole PAM startup thing */ retcode = pam_start("su", user, &conv, &pamh); if (retcode != PAM_SUCCESS) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif syslog(LOG_ERR, "pam_start: %s", pam_strerror(pamh, retcode)); errx(1, "pam_start: %s", pam_strerror(pamh, retcode)); } @@ -295,14 +294,15 @@ retcode = pam_authenticate(pamh, 0); if (retcode != PAM_SUCCESS) { #ifdef USE_BSM_AUDIT - audit_su(ruid, AUDIT_SU_FAILURE); + audit_su(ruid, AUDIT_SU_FAILURE, "bad su %s to %s on %s", + username, user, mytty); #endif syslog(LOG_AUTH|LOG_WARNING, "BAD SU %s to %s on %s", username, user, mytty); errx(1, "Sorry"); } #ifdef USE_BSM_AUDIT - audit_su(ruid, AUDIT_SU_SUCCESS); + audit_su(ruid, AUDIT_SU_SUCCESS, "successful authentication"); #endif retcode = pam_get_item(pamh, PAM_USER, (const void **)&p); if (retcode == PAM_SUCCESS) @@ -313,7 +313,8 @@ pwd = getpwnam(user); if (pwd == NULL) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); + audit_su(getuid(), AUDIT_SU_FAILURE, + "unknown subject: %s", user); #endif errx(1, "unknown login: %s", user); } @@ -323,17 +324,20 @@ retcode = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); if (retcode != PAM_SUCCESS) { +#ifdef USE_BSM_AUDIT + audit_su(getuid(), AUDIT_SU_FAILURE, + "pam_chauthtok: %s", + pam_strerror(pamh, retcode)); +#endif syslog(LOG_ERR, "pam_chauthtok: %s", pam_strerror(pamh, retcode)); -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif errx(1, "Sorry"); } } if (retcode != PAM_SUCCESS) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); + audit_su(getuid(), AUDIT_SU_FAILURE, "pam_acct_mgmt: %s", + pam_strerror(pamh, retcode)); #endif syslog(LOG_ERR, "pam_acct_mgmt: %s", pam_strerror(pamh, retcode)); @@ -346,15 +350,13 @@ else { if (ruid != 0) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); + audit_su(getuid(), AUDIT_SU_FAILURE, + "only root may use -c"); #endif errx(1, "only root may use -c"); } lc = login_getclass(class); if (lc == NULL) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif errx(1, "unknown class: %s", class); } } @@ -362,9 +364,6 @@ /* if asme and non-standard target shell, must be root */ if (asme) { if (ruid != 0 && !chshell(pwd->pw_shell)) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif errx(1, "permission denied (shell)"); } } @@ -391,9 +390,6 @@ /* Switch to home directory */ if (asthem) { if (chdir(pwd->pw_dir) < 0) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif errx(1, "no directory"); } } @@ -403,17 +399,11 @@ * initialize them first. */ if (setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETGROUP) < 0) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "setusercontext"); } retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED); if (retcode != PAM_SUCCESS) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif syslog(LOG_ERR, "pam_setcred: %s", pam_strerror(pamh, retcode)); errx(1, "failed to establish credentials."); @@ -421,9 +411,6 @@ if (asthem) { retcode = pam_open_session(pamh, 0); if (retcode != PAM_SUCCESS) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif syslog(LOG_ERR, "pam_open_session: %s", pam_strerror(pamh, retcode)); errx(1, "failed to open session."); @@ -512,9 +499,6 @@ if ((asme || (!asthem && class == NULL)) && pwd->pw_uid) setwhat &= ~(LOGIN_SETPRIORITY | LOGIN_SETRESOURCES); if (setusercontext(lc, pwd, pwd->pw_uid, setwhat) < 0) { -#ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE); -#endif err(1, "setusercontext"); } @@ -647,13 +631,15 @@ #ifdef USE_BSM_AUDIT static void -audit_su(au_id_t au_ctx, int what) +audit_su(au_id_t au_ctx, int what, const char *fmt, ...) { token_t *token; long acond; int afd; au_tid_t termid; pid_t pid; + char text[1024]; + va_list ap; if (auditon(A_GETCOND, &acond, sizeof(long)) < 0) { /* @@ -662,20 +648,40 @@ */ if (errno == ENOSYS) return; - err(1, "auditon failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: auditon failed: %s", + strerror(errno)); + return; } afd = au_open(); - if (afd < 0) - err(1, "au_open failed"); + if (afd < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + strerror(errno)); + return; + } /* XXX what should we do for termid? */ bzero(&termid, sizeof(termid)); pid = getpid(); token = au_to_subject32(au_ctx, geteuid(), getegid(), getuid(), getgid(), pid, pid, &termid); - if (token == NULL) - errx(1, "audit: unable to build subject token"); + if (token == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "audit: unable to build subject token"); + return; + } /* XXX what if au_fails? */ (void) au_write(afd, token); + if (fmt != NULL) { + va_start(ap, fmt); + vsnprintf(&text[0], sizeof(text) - 1, fmt, ap); + va_end(ap); + token = au_to_text(&text[0]); + if (token == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "failed to generate text token"); + return; + } + (void) au_write(afd, token); + } switch (what) { case AUDIT_SU_FAILURE: token = au_to_return32(1, EPERM); @@ -684,10 +690,13 @@ token = au_to_return32(0, 0); break; } - if (token == NULL) - errx(1, "audit: unable to build return32 token"); + if (token == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "audit: enable to build return token"); + return; + } (void) au_write(afd, token); - if (au_close(afd, 1, AUE_su) < 0) - errx(1, "audit: record not committed"); + if (au_close(afd, 1, AUE_su) < 0) + syslog(LOG_AUTH | LOG_ERR, "audit: record not committed"); } #endif From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 14 05:02:31 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DB7116A420 for ; Tue, 14 Feb 2006 05:02:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C299F43D6E for ; Tue, 14 Feb 2006 05:02:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 696DC46BB9 for ; Tue, 14 Feb 2006 00:02:15 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BDDDB5635B; Tue, 14 Feb 2006 05:02:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AEC8B16A423; Tue, 14 Feb 2006 05: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 6FF4B16A420 for ; Tue, 14 Feb 2006 05:02:27 +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 1864743D6E for ; Tue, 14 Feb 2006 05:02:27 +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 k1E52QFA060392 for ; Tue, 14 Feb 2006 05:02:26 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E52Q8F060389 for perforce@freebsd.org; Tue, 14 Feb 2006 05:02:26 GMT (envelope-from csjp@freebsd.org) Date: Tue, 14 Feb 2006 05:02:26 GMT Message-Id: <200602140502.k1E52Q8F060389@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 91726 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 05:02:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=91726 Change 91726 by csjp@csjp_xor on 2006/02/14 05:02:10 Remove gratuitous whitespace which managed to sneak in with my previous submit. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#9 (text+ko) ==== @@ -672,16 +672,16 @@ (void) au_write(afd, token); if (fmt != NULL) { va_start(ap, fmt); - vsnprintf(&text[0], sizeof(text) - 1, fmt, ap); - va_end(ap); - token = au_to_text(&text[0]); - if (token == NULL) { + (void) vsnprintf(&text[0], sizeof(text) - 1, fmt, ap); + va_end(ap); + token = au_to_text(&text[0]); + if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "failed to generate text token"); return; } - (void) au_write(afd, token); - } + (void) au_write(afd, token); + } switch (what) { case AUDIT_SU_FAILURE: token = au_to_return32(1, EPERM); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 14 05:08:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CE5316A420 for ; Tue, 14 Feb 2006 05:08:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12BC043D76 for ; Tue, 14 Feb 2006 05:08:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3F1A446BD1 for ; Tue, 14 Feb 2006 00:07:46 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9CCCB56CBA; Tue, 14 Feb 2006 05:07:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AF4816A423; Tue, 14 Feb 2006 05:07: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 4A53C16A420 for ; Tue, 14 Feb 2006 05:07:57 +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 D3C0143D5C for ; Tue, 14 Feb 2006 05:07:54 +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 k1E57sWg060587 for ; Tue, 14 Feb 2006 05:07:54 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E57spa060584 for perforce@freebsd.org; Tue, 14 Feb 2006 05:07:54 GMT (envelope-from csjp@freebsd.org) Date: Tue, 14 Feb 2006 05:07:54 GMT Message-Id: <200602140507.k1E57spa060584@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 91728 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 05:08:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=91728 Change 91728 by csjp@csjp_xor on 2006/02/14 05:07:08 Consistently prefix audit related syslog messages with "audit". Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#10 (text+ko) ==== @@ -654,7 +654,7 @@ } afd = au_open(); if (afd < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", strerror(errno)); return; } @@ -677,7 +677,7 @@ token = au_to_text(&text[0]); if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, - "failed to generate text token"); + "audit: failed to generate text token"); return; } (void) au_write(afd, token); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 14 20:03:14 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A8C3916A420 for ; Tue, 14 Feb 2006 20:03:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FB3343D58 for ; Tue, 14 Feb 2006 20:03:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BA39C46BC4 for ; Tue, 14 Feb 2006 15:02:57 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AEB0557E47; Tue, 14 Feb 2006 19:59:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CD6616A423; Tue, 14 Feb 2006 19:59: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 5C86D16A420 for ; Tue, 14 Feb 2006 19:59:28 +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 0AD8C43D48 for ; Tue, 14 Feb 2006 19:59:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1EJxRmS030501 for ; Tue, 14 Feb 2006 19:59: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 k1EJxRNx030498 for perforce@freebsd.org; Tue, 14 Feb 2006 19:59:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 14 Feb 2006 19:59:27 GMT Message-Id: <200602141959.k1EJxRNx030498@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 91763 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2006 20:03:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=91763 Change 91763 by rwatson@rwatson_fledge on 2006/02/14 19:58:40 Update SEDarwin page: - Currently SEDarwin drop is 10.3.8. - Add DSEP project summary. - Add new DSEP drop download link. Submitted by: Christopher dot Vance at SPARTA dot com Affected files ... .. //depot/projects/trustedbsd/www/sedarwin.page#3 edit Differences ... ==== //depot/projects/trustedbsd/www/sedarwin.page#3 (text+ko) ==== @@ -36,7 +36,7 @@ - $P4: //depot/projects/trustedbsd/www/sedarwin.page#2 $ + $P4: //depot/projects/trustedbsd/www/sedarwin.page#3 $ @@ -59,7 +59,7 @@ SEBSD policy. SEDarwin is highly experimental, but current sufficiently functional to allow the enforcement of mandatory process - and file protections under Mac OS 10.3.3 and Darwin 7.3 on + and file protections under Mac OS 10.3.8 and Darwin 7.3 on a variety of Apple PowerPC hardware. The current prototype software may be downloaded using cvsup, and commits to the prototype implementation may @@ -71,6 +71,18 @@

    2006-02-08 SEDarwin (Darwin 7.8) snapshot: Download tarball.

    +

    The Darwin Security Extension Project (DSEP) complements the + SEDarwin work, but has a different goal. DSEP is primarily concerned + with updating and maintaining the TrustedBSD MAC Framework on + Darwin. While still experimental, the MAC Framework has been + updated to support Mac OS X "Tiger", currently supporting Mac OS X + 10.4.3 (Darwin 8.4). Note that the DSEP releases typically won't + have the newest FLASK and SELinux components; they will be migrated + to the Tiger platform soon.

    + +

    2006-02-13 DSEP (Darwin 8.4) snapshot: Download tarball.

    +

    2005-05-31 DSEP7 drop 20050331: Download tarball.

    From owner-trustedbsd-cvs@FreeBSD.ORG Wed Feb 15 17:58:02 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DF8816A424 for ; Wed, 15 Feb 2006 17:58:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B96FE43D45 for ; Wed, 15 Feb 2006 17:58:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 598A446BF2 for ; Wed, 15 Feb 2006 12:57:47 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CFF3455443; Wed, 15 Feb 2006 17:57:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C0E9116A423; Wed, 15 Feb 2006 17:57: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 696B816A420 for ; Wed, 15 Feb 2006 17:57:59 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C25A43D45 for ; Wed, 15 Feb 2006 17:57:59 +0000 (GMT) (envelope-from millert@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 k1FHvwC7032150 for ; Wed, 15 Feb 2006 17:57:59 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FHvw3T032147 for perforce@freebsd.org; Wed, 15 Feb 2006 17:57:58 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 17:57:58 GMT Message-Id: <200602151757.k1FHvw3T032147@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91812 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 17:58:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91812 Change 91812 by millert@millert_g4tower on 2006/02/15 17:57:41 Build and install the GUI file relabel tool Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/LabelDialog.m#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#4 (text+ko) ==== @@ -2,19 +2,23 @@ SUBDIR= checkpolicy \ loadpolicy \ - newrole + newrole \ + relabel_gui all: cd checkpolicy ; gnumake cd loadpolicy ; gnumake cd newrole ; gnumake + cd relabel_gui ; gnumake clean: cd checkpolicy ; gnumake clean cd loadpolicy ; gnumake clean cd newrole ; gnumake clean + cd relabel_gui ; gnumake clean install: cd checkpolicy ; gnumake install cd loadpolicy ; gnumake install cd newrole ; gnumake install + cd relabel_gui ; gnumake install ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/LabelDialog.m#3 (text+ko) ==== @@ -2,14 +2,16 @@ #import "LabelDialog.h" #import #import -#import +#import -const char *filename, *initial; +const char *filename; +char *initial; char **users, **roles, **types; size_t nusers, nroles, ntypes; extern int security_get_file_contexts(const char *fromcontext, char ***retcontexts, size_t *ncontexts); +extern char *getseccontext(void); static void addstring (char **ar, size_t *n, char *in) { ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#3 (text+ko) ==== @@ -171,10 +171,10 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = ""; - INSTALL_PATH = "$(HOME)/Applications"; + INSTALL_PATH = "/Applications"; LIBRARY_SEARCH_PATHS = ""; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = "../../libsebsd/libsebsd.a ../../libmac/libmac.a"; + OTHER_CFLAGS = "-I../.."; + OTHER_LDFLAGS = "../../libselinux/src/libselinux.a ../../../darwin/libmac/libmac.a"; PRODUCT_NAME = relabel; SECTORDER_FLAGS = ""; USE_GCC3_PFE_SUPPORT = NO; @@ -185,7 +185,7 @@ ); isa = PBXApplicationTarget; name = relabel_gui; - productInstallPath = "$(HOME)/Applications"; + productInstallPath = "/Applications"; productName = relabel_gui; productReference = 17587328FF379C6511CA2CBB; productSettingsXML = " From owner-trustedbsd-cvs@FreeBSD.ORG Wed Feb 15 18:01:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FFDA16A420 for ; Wed, 15 Feb 2006 18:01:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A711643D4C for ; Wed, 15 Feb 2006 18:01:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BD54C46B93 for ; Wed, 15 Feb 2006 13:00:50 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C64B755E10; Wed, 15 Feb 2006 18:01:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B5C0216A423; Wed, 15 Feb 2006 18:01: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 7832916A420 for ; Wed, 15 Feb 2006 18:01:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4558843D48 for ; Wed, 15 Feb 2006 18:01:03 +0000 (GMT) (envelope-from millert@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 k1FI13hi032433 for ; Wed, 15 Feb 2006 18:01:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FI12RS032430 for perforce@freebsd.org; Wed, 15 Feb 2006 18:01:02 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 18:01:02 GMT Message-Id: <200602151801.k1FI12RS032430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91813 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 18:01:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=91813 Change 91813 by millert@millert_g4tower on 2006/02/15 18:00:53 Simplify args to CHECK_SIMPLE_PERM macro Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#31 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#31 (text+ko) ==== @@ -1162,17 +1162,17 @@ struct task_security_struct *tsec, *psec; \ psec = SLOT(port); \ tsec = SLOT(task); \ - return avc_has_perm_ref_audit (tsec->sid, psec->sid, class, \ - perm, NULL, NULL); \ + return avc_has_perm_ref_audit (tsec->sid, psec->sid, \ + SECCLASS_ ## class, class ## __ ## perm, NULL, NULL); \ } -CHECK_SIMPLE_PERM(msg_send,SECCLASS_MACH_PORT,MACH_PORT__SEND); -CHECK_SIMPLE_PERM(msg_receive,SECCLASS_MACH_PORT,MACH_PORT__RECV); -CHECK_SIMPLE_PERM(port_make_send,SECCLASS_MACH_PORT,MACH_PORT__MAKE_SEND); -CHECK_SIMPLE_PERM(port_copy_send,SECCLASS_MACH_PORT,MACH_PORT__COPY_SEND); -CHECK_SIMPLE_PERM(port_move_recv,SECCLASS_MACH_PORT,MACH_PORT__MOVE_RECV); -CHECK_SIMPLE_PERM(port_hold_send,SECCLASS_MACH_PORT,MACH_PORT__HOLD_SEND); -CHECK_SIMPLE_PERM(port_hold_recv,SECCLASS_MACH_PORT,MACH_PORT__HOLD_RECV); +CHECK_SIMPLE_PERM(msg_send, MACH_PORT, SEND); +CHECK_SIMPLE_PERM(msg_receive, MACH_PORT, RECV); +CHECK_SIMPLE_PERM(port_make_send, MACH_PORT, MAKE_SEND); +CHECK_SIMPLE_PERM(port_copy_send, MACH_PORT, COPY_SEND); +CHECK_SIMPLE_PERM(port_move_recv, MACH_PORT, MOVE_RECV); +CHECK_SIMPLE_PERM(port_hold_send, MACH_PORT, HOLD_SEND); +CHECK_SIMPLE_PERM(port_hold_recv, MACH_PORT, HOLD_RECV); extern struct policydb policydb; From owner-trustedbsd-cvs@FreeBSD.ORG Wed Feb 15 18:07:13 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 939D716A422 for ; Wed, 15 Feb 2006 18:07:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3E7D43D45 for ; Wed, 15 Feb 2006 18:07:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BF07946BF2 for ; Wed, 15 Feb 2006 13:06:58 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B7F1A555B5; Wed, 15 Feb 2006 18:07:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A8FDD16A423; Wed, 15 Feb 2006 18:07: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 6BEE416A420 for ; Wed, 15 Feb 2006 18:07:11 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 226B443D45 for ; Wed, 15 Feb 2006 18:07:11 +0000 (GMT) (envelope-from millert@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 k1FI7Bq6032747 for ; Wed, 15 Feb 2006 18:07:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FI7AOW032744 for perforce@freebsd.org; Wed, 15 Feb 2006 18:07:10 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 18:07:10 GMT Message-Id: <200602151807.k1FI7AOW032744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91814 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 18:07:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=91814 Change 91814 by millert@millert_g4tower on 2006/02/15 18:06:52 Add mac_check_port_receive() entry point to mediate message receipt. Split off mac_check_port_move_send() from mac_check_port_copy_send(). New mac_check_port_make_send_once(), mac_check_port_move_send_once(), and mac_check_port_hold_send_once() entry points to differentiate between "send" and "send once" rights. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#14 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_right.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_port.c#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#32 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#14 (text+ko) ==== @@ -1953,11 +1953,11 @@ ); /** - @brief Access control check for transferring a send right + @brief Access control check for copying a send right to another task @param task Label of the sender task @param port Label of the affected port - Access control check for transferring send rights to the port out of the + Access control check for copying send rights to the port from the specified task. A complementary entry point, mpo_check_port_hold_send, handles the receiving task. check_port_copy_send is called as part of a group of policy invocations when messages with port rights are sent. @@ -1974,6 +1974,27 @@ ); /** + @brief Access control check for transferring a send right + @param task Label of the sender task + @param port Label of the affected port + + Access control check for transferring a send right from one task to the + task listening to the specified port. A complementary entry point, + mpo_check_port_hold_send, handles the receiving task. + check_port_move_send is called as part of a group of policy invocations + when messages with port rights are sent. All access control checks made + for a particular message must be successful for the message to be sent. + + The task label and the port are locked. Sleeping is permitted. + + @return Return 0 if access is granted, non-zero otherwise. +*/ +typedef int mpo_check_port_move_send_t( + struct label *task, + struct label *port +); + +/** @brief Access control check for obtaining a send right @param task Label of the receiving task @param port Label of the affected port @@ -4159,10 +4180,14 @@ mpo_check_port_relabel_t *mpo_check_port_relabel; mpo_check_port_send_t *mpo_check_port_send; mpo_check_port_make_send_t *mpo_check_port_make_send; + mpo_check_port_make_send_t *mpo_check_port_make_send_once; mpo_check_port_copy_send_t *mpo_check_port_copy_send; + mpo_check_port_move_send_t *mpo_check_port_move_send; + mpo_check_port_move_send_t *mpo_check_port_move_send_once; mpo_check_port_receive_t *mpo_check_port_receive; mpo_check_port_move_receive_t *mpo_check_port_move_receive; mpo_check_port_hold_send_t *mpo_check_port_hold_send; + mpo_check_port_hold_send_t *mpo_check_port_hold_send_once; mpo_check_port_hold_receive_t *mpo_check_port_hold_receive; mpo_check_cred_visible_t *mpo_check_cred_visible; mpo_check_fcntl_t *mpo_check_fcntl; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_right.c#6 (text+ko) ==== @@ -1333,6 +1333,21 @@ switch (msgt_name) { case MACH_MSG_TYPE_MAKE_SEND: + if ((bits & MACH_PORT_TYPE_RECEIVE) == 0) + return FALSE; + +#ifdef MAC + port = (ipc_port_t) entry->ie_object; + ip_lock(port); + tasklabel_lock(self); + rc = mac_check_port_make_send(&self->maclabel, &port->ip_label); + tasklabel_unlock(self); + ip_unlock(port); + if (rc) + return FALSE; +#endif + break; + case MACH_MSG_TYPE_MAKE_SEND_ONCE: if ((bits & MACH_PORT_TYPE_RECEIVE) == 0) return FALSE; @@ -1341,7 +1356,7 @@ port = (ipc_port_t) entry->ie_object; ip_lock(port); tasklabel_lock(self); - rc = mac_check_port_make_send(&self->maclabel, &port->ip_label); + rc = mac_check_port_make_send_once(&self->maclabel, &port->ip_label); tasklabel_unlock(self); ip_unlock(port); if (rc) @@ -1384,7 +1399,22 @@ active = ip_active(port); #ifdef MAC tasklabel_lock(self); - rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + switch (msgt_name) { + case MACH_MSG_TYPE_COPY_SEND: + rc = mac_check_port_copy_send(&self->maclabel, + &port->ip_label); + break; + case MACH_MSG_TYPE_MOVE_SEND: + rc = mac_check_port_move_send(&self->maclabel, + &port->ip_label); + break; + case MACH_MSG_TYPE_MOVE_SEND_ONCE: + rc = mac_check_port_move_send_once(&self->maclabel, + &port->ip_label); + break; + default: + panic("ipc_right_copyin_check: strange rights"); + } tasklabel_unlock(self); if (rc) { ip_unlock(port); @@ -1510,7 +1540,7 @@ #ifdef MAC tasklabel_lock(self); - rc = mac_check_port_make_send(&self->maclabel, &port->ip_label); + rc = mac_check_port_make_send_once(&self->maclabel, &port->ip_label); tasklabel_unlock(self); if (rc) { ip_unlock(port); @@ -1664,7 +1694,7 @@ #ifdef MAC tasklabel_lock(self); - rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + rc = mac_check_port_move_send(&self->maclabel, &port->ip_label); tasklabel_unlock(self); if (rc) { ip_unlock(port); @@ -1742,7 +1772,8 @@ #ifdef MAC tasklabel_lock(self); - rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + rc = mac_check_port_move_send_once(&self->maclabel, + &port->ip_label); tasklabel_unlock(self); if (rc) { ip_unlock(port); @@ -1947,7 +1978,7 @@ #ifdef MAC tasklabel_lock(self); - rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + rc = mac_check_port_move_send(&self->maclabel, &port->ip_label); tasklabel_unlock(self); if (rc) { ip_unlock(port); @@ -2053,7 +2084,7 @@ #ifdef MAC if (space->is_task) { tasklabel_lock(space->is_task); - rc = mac_check_port_hold_send(&space->is_task->maclabel, + rc = mac_check_port_hold_send_once(&space->is_task->maclabel, &port->ip_label); tasklabel_unlock(space->is_task); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_port.c#8 (text+ko) ==== @@ -148,6 +148,16 @@ } int +mac_check_port_make_send_once(struct label *task, struct label *port) +{ + int error; + + MAC_CHECK(check_port_make_send_once, task, port); + + return (error); +} + +int mac_check_port_copy_send(struct label *task, struct label *port) { int error; @@ -158,6 +168,26 @@ } int +mac_check_port_move_send(struct label *task, struct label *port) +{ + int error; + + MAC_CHECK(check_port_move_send, task, port); + + return (error); +} + +int +mac_check_port_move_send_once(struct label *task, struct label *port) +{ + int error; + + MAC_CHECK(check_port_move_send_once, task, port); + + return (error); +} + +int mac_check_port_move_receive(struct label *task, struct label *port) { int error; @@ -178,6 +208,16 @@ } int +mac_check_port_hold_send_once(struct label *task, struct label *port) +{ + int error; + + MAC_CHECK(check_port_hold_send_once, task, port); + + return (error); +} + +int mac_check_port_hold_receive(struct label *task, struct label *port) { int error; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#6 (text+ko) ==== @@ -129,10 +129,16 @@ { SECCLASS_MACH_PORT, MACH_PORT__SEND, "send" }, { SECCLASS_MACH_PORT, MACH_PORT__RECV, "recv" }, { SECCLASS_MACH_PORT, MACH_PORT__MAKE_SEND, "make_send" }, + { SECCLASS_MACH_PORT, MACH_PORT__MAKE_SEND_ONCE, "make_send_once" }, { SECCLASS_MACH_PORT, MACH_PORT__COPY_SEND, "copy_send" }, + { SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND, "move_send" }, + { SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND_ONCE, "move_send_once" }, { SECCLASS_MACH_PORT, MACH_PORT__MOVE_RECV, "move_recv" }, + { SECCLASS_MACH_PORT, MACH_PORT__MOVE_RECV_ONCE, "move_recv_once" }, { SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND, "hold_send" }, + { SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND_ONCE, "hold_send_once" }, { SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV, "hold_recv" }, + { SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV_ONCE, "hold_recv_once" }, { SECCLASS_MACH_TASK, MACH_TASK__TERMINATE, "terminate" }, { SECCLASS_MACH_TASK, MACH_TASK__SET_SPECIAL_PORT, "set_special_port" }, }; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#6 (text+ko) ==== @@ -606,10 +606,16 @@ #define MACH_PORT__SEND 0x0000000000000004UL #define MACH_PORT__RECV 0x0000000000000008UL #define MACH_PORT__MAKE_SEND 0x0000000000000010UL -#define MACH_PORT__COPY_SEND 0x0000000000000020UL -#define MACH_PORT__MOVE_RECV 0x0000000000000040UL -#define MACH_PORT__HOLD_SEND 0x0000000000000080UL -#define MACH_PORT__HOLD_RECV 0x0000000000000100UL +#define MACH_PORT__MAKE_SEND_ONCE 0x0000000000000020UL +#define MACH_PORT__COPY_SEND 0x0000000000000040UL +#define MACH_PORT__MOVE_SEND 0x0000000000000080UL +#define MACH_PORT__MOVE_SEND_ONCE 0x0000000000000100UL +#define MACH_PORT__MOVE_RECV 0x0000000000000200UL +#define MACH_PORT__MOVE_RECV_ONCE 0x0000000000000400UL +#define MACH_PORT__HOLD_SEND 0x0000000000000800UL +#define MACH_PORT__HOLD_SEND_ONCE 0x0000000000001000UL +#define MACH_PORT__HOLD_RECV 0x0000000000002000UL +#define MACH_PORT__HOLD_RECV_ONCE 0x0000000000004000UL #define MACH_TASK__TERMINATE 0x0000000000000001UL #define MACH_TASK__SET_SPECIAL_PORT 0x0000000000000002UL ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#7 (text+ko) ==== @@ -360,10 +360,16 @@ send recv make_send + make_send_once copy_send + move_send + move_send_once move_recv + move_recv_once hold_send + hold_send_once hold_recv + hold_recv_once } class mach_task ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#32 (text+ko) ==== @@ -116,6 +116,8 @@ int sebsd_verbose = 0; +static struct label *last_dead_cred_label, *last_dead_task_label, *last_dead_port_label; // XXX - testing + static int slot = 1; /* TBD, dynamic */ #define SLOT(l) ((void *)LABEL_TO_SLOT((l), slot).l_ptr) @@ -483,6 +485,24 @@ static void sebsd_destroy_cred_label(struct label *label) { + // printk("sebsd_destroy_cred_label(%p)\n", &LABEL_TO_SLOT((label), slot)); + last_dead_cred_label = label; + sebsd_free (SLOT(label)); + SLOT(label) = NULL; +} + +static void +sebsd_destroy_task_label(struct label *label) +{ + last_dead_task_label = label; + sebsd_free (SLOT(label)); + SLOT(label) = NULL; +} + +static void +sebsd_destroy_port_label(struct label *label) +{ + last_dead_port_label = label; sebsd_free (SLOT(label)); SLOT(label) = NULL; } @@ -1169,9 +1189,13 @@ CHECK_SIMPLE_PERM(msg_send, MACH_PORT, SEND); CHECK_SIMPLE_PERM(msg_receive, MACH_PORT, RECV); CHECK_SIMPLE_PERM(port_make_send, MACH_PORT, MAKE_SEND); +CHECK_SIMPLE_PERM(port_make_send_once, MACH_PORT, MAKE_SEND_ONCE); CHECK_SIMPLE_PERM(port_copy_send, MACH_PORT, COPY_SEND); +CHECK_SIMPLE_PERM(port_move_send, MACH_PORT, COPY_SEND); +CHECK_SIMPLE_PERM(port_move_send_once, MACH_PORT, MOVE_SEND_ONCE); CHECK_SIMPLE_PERM(port_move_recv, MACH_PORT, MOVE_RECV); CHECK_SIMPLE_PERM(port_hold_send, MACH_PORT, HOLD_SEND); +CHECK_SIMPLE_PERM(port_hold_send_once, MACH_PORT, HOLD_SEND_ONCE); CHECK_SIMPLE_PERM(port_hold_recv, MACH_PORT, HOLD_RECV); extern struct policydb policydb; @@ -2339,7 +2363,13 @@ { struct task_security_struct *task; - task = SLOT(label); + /* XXX - SLOT should not return NULL but there is a signal race */ + /* XXX - this may be fixed... */ + if ((task = SLOT(label)) == NULL) { + printk("sebsd_externalize_cred_label: SLOT returned NULL!\n"); + printk("label: %p, last_task: %p, last_cred: %p, last_port: %p\n", label, last_dead_task_label, last_dead_cred_label, last_dead_port_label); // XXX + return (ESRCH); + } return (sebsd_externalize_sid(task->sid, element_name, sb)); } @@ -2635,8 +2665,8 @@ .mpo_destroy = sebsd_destroy, .mpo_destroy_cred_label = sebsd_destroy_cred_label, - .mpo_destroy_task_label = sebsd_destroy_cred_label, - .mpo_destroy_port_label = sebsd_destroy_cred_label, + .mpo_destroy_task_label = sebsd_destroy_task_label, + .mpo_destroy_port_label = sebsd_destroy_port_label, .mpo_destroy_vnode_label = sebsd_destroy_vnode_label, .mpo_destroy_devfsdirent_label = sebsd_destroy_vnode_label, @@ -2685,9 +2715,13 @@ .mpo_check_port_send = sebsd_check_msg_send, .mpo_check_port_receive = sebsd_check_msg_receive, .mpo_check_port_make_send = sebsd_check_port_make_send, + .mpo_check_port_make_send_once = sebsd_check_port_make_send_once, .mpo_check_port_copy_send = sebsd_check_port_copy_send, + .mpo_check_port_move_send = sebsd_check_port_move_send, + .mpo_check_port_move_send_once = sebsd_check_port_move_send_once, .mpo_check_port_move_receive = sebsd_check_port_move_recv, .mpo_check_port_hold_send = sebsd_check_port_hold_send, + .mpo_check_port_hold_send_once = sebsd_check_port_hold_send_once, .mpo_check_port_hold_receive = sebsd_check_port_hold_recv, .mpo_check_proc_setlcid = sebsd_check_proc_setlcid, .mpo_check_proc_signal = sebsd_check_proc_signal, From owner-trustedbsd-cvs@FreeBSD.ORG Wed Feb 15 18:15:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7037816A420 for ; Wed, 15 Feb 2006 18:15:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1AFA43D4C for ; Wed, 15 Feb 2006 18:15:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CB6E446BDA for ; Wed, 15 Feb 2006 13:15:09 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 19ACC56E23; Wed, 15 Feb 2006 18:15:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A98416A423; Wed, 15 Feb 2006 18:15:22 +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 C0ED216A420 for ; Wed, 15 Feb 2006 18:15:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84F9643D4C for ; Wed, 15 Feb 2006 18:15:21 +0000 (GMT) (envelope-from millert@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 k1FIFLCO033196 for ; Wed, 15 Feb 2006 18:15:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FIFLoI033193 for perforce@freebsd.org; Wed, 15 Feb 2006 18:15:21 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 18:15:21 GMT Message-Id: <200602151815.k1FIFLoI033193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91815 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 18:15:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=91815 Change 91815 by millert@millert_g4tower on 2006/02/15 18:14:27 Update for new Mach message entry points. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/macros/global_macros.te#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/macros/global_macros.te#5 (text+ko) ==== @@ -1219,28 +1219,28 @@ ##### define(`allow_mach_ipc', ` -allow $1 $2:mach_port { send copy_send make_send hold_send hold_recv }; -allow $2 $1:mach_port { send copy_send make_send hold_send hold_recv }; +allow $1 $2:mach_port { send copy_send move_send move_send_once make_send make_send_once hold_send hold_send_once recv hold_recv }; +allow $2 $1:mach_port { send copy_send move_send move_send_once make_send make_send_once hold_send hold_send_once recv hold_recv }; ') define(`mach_bootstrap', ` -allow $1 $2:mach_port { send copy_send make_send hold_send hold_recv }; +allow $1 $2:mach_port { send copy_send move_send move_send_once make_send make_send_once hold_send hold_send_once recv hold_recv }; allow $1 $2:mi_bootstrap { bootstrap_look_up bootstrap_look_up_array }; -allow mach_init_d $1:mach_port { send copy_send hold_send hold_recv }; +allow mach_init_d $1:mach_port { send copy_send move_send move_send_once hold_send hold_send_once recv hold_recv }; ') define(`mach_bootstrap_register', ` allow $1 $2:mi_bootstrap *; -allow $1 $2:mach_port { send copy_send hold_send hold_recv }; -allow mach_init_d $1:mach_port { send copy_send hold_send hold_recv }; +allow $1 $2:mach_port { send copy_send move_send move_send_once hold_send hold_send_once recv hold_recv }; +allow mach_init_d $1:mach_port { send copy_send move_send move_send_once hold_send hold_send_once recv hold_recv }; ') define(`allow_notify_ipc', ` allow $1 mach_init_d:mi_notify_ipc *; allow $1 notifyd_d:mi_notify_ipc *; allow notifyd_d $1:mi_notify_ipc *; -allow $1 notifyd_d:mach_port { send copy_send hold_send hold_recv }; -allow notifyd_d $1:mach_port { send copy_send hold_send hold_recv }; +allow $1 notifyd_d:mach_port { send copy_send move_send move_send_once hold_send hold_send_once recv hold_recv }; +allow notifyd_d $1:mach_port { send copy_send move_send move_send_once hold_send hold_send_once recv hold_recv }; ') ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#7 (text+ko) ==== @@ -167,13 +167,13 @@ type_change user_d devpts_t:chr_file user_devpts_t; -allow domain2 self:mach_port { send make_send copy_send hold_send move_recv hold_recv }; -allow domain2 kernel_d:mach_port { send make_send copy_send hold_send }; +allow domain2 self:mach_port { send make_send make_send_once copy_send move_send move_send_once hold_send hold_send_once recv move_recv hold_recv }; +allow domain2 kernel_d:mach_port { send make_send make_send_once copy_send move_send move_send_once hold_send hold_send_once }; allow domain2 self:mach_task set_special_port; allow domain2 self:mi_bootstrap { bootstrap_look_up }; allow domain2 root_t:dir { search getattr read }; allow domain2 self:process getsched; -allow kernel_d domain2:mach_port { send make_send copy_send hold_send }; +allow kernel_d domain2:mach_port { send make_send make_send_once copy_send move_send move_send_once hold_send hold_send_once }; allow domain2 file:{file lnk_file sock_file fifo_file} {create_file_perms execute }; allow domain2 file:file execute_no_trans; @@ -246,7 +246,7 @@ allow mach_init_d mach_init_d:mach_port relabelfrom; allow mach_init_d boot_names_t:mach_port relabelto; allow mach_init_d {loginwindow_d windowserver_d}:mach_port relabelto; -allow mach_init_d user_names_t:mach_port { copy_send hold_send relabelto }; +allow mach_init_d user_names_t:mach_port { copy_send move_send move_send_once hold_send hold_send_once relabelto }; allow_mach_ipc(systemstarter_d,unlabeled_t); allow_mach_ipc(systemstarter_d,boot_names_t); @@ -311,8 +311,8 @@ #diskarbitrationd rules mach_bootstrap(diskarbitrationd_d,mach_init_d); #allow diskarbitrationd_d notifyd_d:mi_notify_ipc { _notify_server_register_check _notify_server_register_mach_port }; -#allow notifyd_d diskarbitrationd_d:mach_port { copy_send hold_send }; -#allow diskarbitrationd_d notifyd_d:mach_port { copy_send hold_send }; +#allow notifyd_d diskarbitrationd_d:mach_port { copy_send move_send move_send_once hold_send hold_send_once }; +#allow diskarbitrationd_d notifyd_d:mach_port { copy_send move_send move_send_once hold_send hold_send_once }; allow_notify_ipc(diskarbitrationd_d); allow_mach_ipc(diskarbitrationd_d,unlabeled_t); allow_mach_ipc(diskarbitrationd_d,mach_servers_d); @@ -425,7 +425,7 @@ allow_mach_ipc($1,lookupd_d); allow_mach_ipc(pbs_d,$1); -allow pbs_d $1:mach_port { send copy_send hold_send }; +allow pbs_d $1:mach_port { send copy_send move_send move_send_once hold_send hold_send_once }; mach_bootstrap_register(pbs_d,$2); mach_bootstrap(pbs_d,$2); @@ -439,4 +439,4 @@ bool lookups false; if (lookups) { allow user_d {mach_init_d init_d systemstarter_d loginwindow_d user_d}:mi_bootstrap bootstrap_info; -}+} From owner-trustedbsd-cvs@FreeBSD.ORG Wed Feb 15 18:34:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83A0A16A422 for ; Wed, 15 Feb 2006 18:34:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09A3C43D46 for ; Wed, 15 Feb 2006 18:34:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1432746B20 for ; Wed, 15 Feb 2006 13:34:35 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 46C5156883; Wed, 15 Feb 2006 18:34:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3678916A423; Wed, 15 Feb 2006 18: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 EC9D116A422 for ; Wed, 15 Feb 2006 18:34:46 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6CC343D46 for ; Wed, 15 Feb 2006 18:34:46 +0000 (GMT) (envelope-from millert@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 k1FIYkqE034127 for ; Wed, 15 Feb 2006 18:34:46 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FIYk4t034124 for perforce@freebsd.org; Wed, 15 Feb 2006 18:34:46 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 18:34:46 GMT Message-Id: <200602151834.k1FIYk4t034124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91819 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 18:34:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=91819 Change 91819 by millert@millert_g4tower on 2006/02/15 18:34:39 Add missing Makefile for GUI file label tool Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/Makefile#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Wed Feb 15 18:37:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 10BE516A428 for ; Wed, 15 Feb 2006 18:37:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61A7543D55 for ; Wed, 15 Feb 2006 18:36:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1EEB946BF2 for ; Wed, 15 Feb 2006 13:36:45 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 82F0D56347; Wed, 15 Feb 2006 18:36:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7468D16A423; Wed, 15 Feb 2006 18:36: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 34EF116A422 for ; Wed, 15 Feb 2006 18:36:56 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C50143D5C for ; Wed, 15 Feb 2006 18:36:50 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1FIao9V034359 for ; Wed, 15 Feb 2006 18:36:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FIanac034356 for perforce@freebsd.org; Wed, 15 Feb 2006 18:36:49 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 18:36:49 GMT Message-Id: <200602151836.k1FIanac034356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91821 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 18:37:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=91821 Change 91821 by millert@millert_g4tower on 2006/02/15 18:36:40 Fix some whitespace issues introduced by "diff -wu" when updating from the SEFOS tree. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.m#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kdp/kdp_udp.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/system.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/sebsd-relabel.sh#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.m#3 (text+ko) ==== @@ -127,7 +127,7 @@ - (void) policyWillLogin { free(username); if (label != NULL) /* XXX */ - mac_free(label); + mac_free(label); } - (void) policyWillLogout { return; } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#8 (text+ko) ==== @@ -2057,7 +2057,7 @@ printf("ipc_kmsg_copyout_header: can't grow user ipc space\n"); return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_SPACE); - } + } } /* space is locked again; start over */ ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kdp/kdp_udp.c#4 (text+ko) ==== @@ -631,8 +631,8 @@ { kdp_handle_arp(); return; - } } + } if (pkt.len < (sizeof (struct ether_header) + sizeof (struct udpiphdr))) return; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/system.c#4 (text+ko) ==== @@ -76,9 +76,9 @@ if (fp == NULL) return errno; - fseek (fp, 0, SEEK_END); - la.len = ftell (fp); - fseek (fp, 0, SEEK_SET); + fseek(fp, 0, SEEK_END); + la.len = ftell(fp); + fseek(fp, 0, SEEK_SET); if ((la.data = malloc (la.len)) == NULL) return (ENOMEM); if (fread(la.data, la.len, 1, fp) != 1) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/sebsd-relabel.sh#4 (text+ko) ==== @@ -28,4 +28,4 @@ $SETFMAC sebsd/system_u:object_r:pbs_exec_t /System/Library/CoreServices/pbs $SETFMAC sebsd/system_u:object_r:windowserver_exec_t /System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/WindowServer* $SETFMAC sebsd/system_u:object_r:securityserver_exec_t /System/Library/CoreServices/SecurityServer -$SETFMAC sebsd/system_u:object_r:coreservices_exec_t /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Support/coreservicesd+$SETFMAC sebsd/system_u:object_r:coreservices_exec_t /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Support/coreservicesd From owner-trustedbsd-cvs@FreeBSD.ORG Wed Feb 15 22:43:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED70016A427 for ; Wed, 15 Feb 2006 22:43:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68CDF43D45 for ; Wed, 15 Feb 2006 22:43:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CF4BC46B96 for ; Wed, 15 Feb 2006 17:42:51 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CE37E55690; Wed, 15 Feb 2006 22:43:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BE4FA16A423; Wed, 15 Feb 2006 22:43: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 68A7116A420 for ; Wed, 15 Feb 2006 22:43:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AF9943D45 for ; Wed, 15 Feb 2006 22:43:03 +0000 (GMT) (envelope-from millert@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 k1FMh2ah052689 for ; Wed, 15 Feb 2006 22:43:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1FMh20U052686 for perforce@freebsd.org; Wed, 15 Feb 2006 22:43:02 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Feb 2006 22:43:02 GMT Message-Id: <200602152243.k1FMh20U052686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91843 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2006 22:43:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=91843 Change 91843 by millert@millert_ibook on 2006/02/15 22:43:01 Fix cust and pasto; there is no such thing as a "receive once" right Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#7 (text+ko) ==== @@ -134,11 +134,9 @@ { SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND, "move_send" }, { SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND_ONCE, "move_send_once" }, { SECCLASS_MACH_PORT, MACH_PORT__MOVE_RECV, "move_recv" }, - { SECCLASS_MACH_PORT, MACH_PORT__MOVE_RECV_ONCE, "move_recv_once" }, { SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND, "hold_send" }, { SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND_ONCE, "hold_send_once" }, { SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV, "hold_recv" }, - { SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV_ONCE, "hold_recv_once" }, { SECCLASS_MACH_TASK, MACH_TASK__TERMINATE, "terminate" }, { SECCLASS_MACH_TASK, MACH_TASK__SET_SPECIAL_PORT, "set_special_port" }, }; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#7 (text+ko) ==== @@ -611,11 +611,9 @@ #define MACH_PORT__MOVE_SEND 0x0000000000000080UL #define MACH_PORT__MOVE_SEND_ONCE 0x0000000000000100UL #define MACH_PORT__MOVE_RECV 0x0000000000000200UL -#define MACH_PORT__MOVE_RECV_ONCE 0x0000000000000400UL -#define MACH_PORT__HOLD_SEND 0x0000000000000800UL -#define MACH_PORT__HOLD_SEND_ONCE 0x0000000000001000UL -#define MACH_PORT__HOLD_RECV 0x0000000000002000UL -#define MACH_PORT__HOLD_RECV_ONCE 0x0000000000004000UL +#define MACH_PORT__HOLD_SEND 0x0000000000000400UL +#define MACH_PORT__HOLD_SEND_ONCE 0x0000000000000800UL +#define MACH_PORT__HOLD_RECV 0x0000000000001000UL #define MACH_TASK__TERMINATE 0x0000000000000001UL #define MACH_TASK__SET_SPECIAL_PORT 0x0000000000000002UL ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask.h#6 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#8 (text+ko) ==== @@ -365,11 +365,9 @@ move_send move_send_once move_recv - move_recv_once hold_send hold_send_once hold_recv - hold_recv_once } class mach_task From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 16 14:29:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 99B6C16A420 for ; Thu, 16 Feb 2006 14:29:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A430743D46 for ; Thu, 16 Feb 2006 14:29:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0B96F46BE5 for ; Thu, 16 Feb 2006 09:29:02 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7203F57D52; Thu, 16 Feb 2006 14:27:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 619E916A425; Thu, 16 Feb 2006 14:27:38 +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 1A73416A423 for ; Thu, 16 Feb 2006 14:27:38 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C71143D4C for ; Thu, 16 Feb 2006 14:27:37 +0000 (GMT) (envelope-from millert@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 k1GERbAd027766 for ; Thu, 16 Feb 2006 14:27:37 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1GERbMm027763 for perforce@freebsd.org; Thu, 16 Feb 2006 14:27:37 GMT (envelope-from millert@freebsd.org) Date: Thu, 16 Feb 2006 14:27:37 GMT Message-Id: <200602161427.k1GERbMm027763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 91886 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2006 14:29:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=91886 Change 91886 by millert@millert_g4tower on 2006/02/16 14:26:54 Grab MAC Framework includes from source dir, not system include dir. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#4 (text+ko) ==== @@ -173,7 +173,7 @@ HEADER_SEARCH_PATHS = ""; INSTALL_PATH = "/Applications"; LIBRARY_SEARCH_PATHS = ""; - OTHER_CFLAGS = "-I../.."; + OTHER_CFLAGS = "-I../.. -I../../../darwin/xnu/BUILD/obj/EXPORT_HDRS/bsd -idirafter ../../../darwin/xnu/BUILD/obj/EXPORT_HDRS/osfmk"; OTHER_LDFLAGS = "../../libselinux/src/libselinux.a ../../../darwin/libmac/libmac.a"; PRODUCT_NAME = relabel; SECTORDER_FLAGS = ""; From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 19 00:18:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 655A116A420 for ; Sun, 19 Feb 2006 00:18:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 849E843D46 for ; Sun, 19 Feb 2006 00:18:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8DB9546BA7 for ; Sat, 18 Feb 2006 19:18:10 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D772F55936; Sun, 19 Feb 2006 00:18:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C9C0116A423; Sun, 19 Feb 2006 00:18:22 +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 70BC816A420 for ; Sun, 19 Feb 2006 00:18:22 +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 3E76F43D46 for ; Sun, 19 Feb 2006 00:18:22 +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 k1J0IMje076769 for ; Sun, 19 Feb 2006 00:18:22 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J0ILWv076766 for perforce@freebsd.org; Sun, 19 Feb 2006 00:18:21 GMT (envelope-from wsalamon@computer.org) Date: Sun, 19 Feb 2006 00:18:21 GMT Message-Id: <200602190018.k1J0ILWv076766@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 92018 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Feb 2006 00:18:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=92018 Change 92018 by wsalamon@gretsch on 2006/02/19 00:18:08 Remove extraneous blank lines. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#10 edit .. //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#10 (text+ko) ==== @@ -1711,7 +1711,6 @@ int error; AUDIT_ARG(signum, uap->signum); - if ((u_int)uap->signum > _SIG_MAXSIG) return (EINVAL); @@ -1764,7 +1763,6 @@ */ AUDIT_ARG(signum, uap->signum); AUDIT_ARG(pid, uap->pgid); - if ((u_int)uap->signum > _SIG_MAXSIG) return (EINVAL); ==== //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#9 (text+ko) ==== @@ -410,7 +410,6 @@ AUDIT_ARG(cmd, uap->req); AUDIT_ARG(addr, uap->addr); AUDIT_ARG(value, uap->data); - addr = &r; switch (uap->req) { case PT_GETREGS: From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 19 00:22:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B74BC16A420 for ; Sun, 19 Feb 2006 00:22:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30C2A43D48 for ; Sun, 19 Feb 2006 00:22:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 09BB246BA7 for ; Sat, 18 Feb 2006 19:22:14 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 40B7258756; Sun, 19 Feb 2006 00:22:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 32CDA16A423; Sun, 19 Feb 2006 00:22: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 D404216A420 for ; Sun, 19 Feb 2006 00:22:27 +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 9D91F43D46 for ; Sun, 19 Feb 2006 00:22:27 +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 k1J0MR65077018 for ; Sun, 19 Feb 2006 00:22:27 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1J0MR02077015 for perforce@freebsd.org; Sun, 19 Feb 2006 00:22:27 GMT (envelope-from wsalamon@computer.org) Date: Sun, 19 Feb 2006 00:22:27 GMT Message-Id: <200602190022.k1J0MR02077015@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 92019 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Feb 2006 00:22:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=92019 Change 92019 by wsalamon@gretsch on 2006/02/19 00:22:10 Cleanup: line lengths, remove extraneous semi-colon Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#26 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#26 (text+ko) ==== @@ -71,7 +71,6 @@ #include #include -#include #include #include @@ -694,9 +693,7 @@ fdrop(fp, td); vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, vp, ARG_VNODE1); - if (vp->v_type != VDIR) error = ENOTDIR; #ifdef MAC @@ -1193,7 +1190,6 @@ AUDIT_ARG(mode, mode); AUDIT_ARG(dev, dev); - switch (mode & S_IFMT) { case S_IFCHR: case S_IFBLK: @@ -2544,8 +2540,7 @@ int vfslocked; AUDIT_ARG(mode, mode); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -2688,8 +2683,7 @@ int vfslocked; AUDIT_ARG(owner, uid, gid); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -2732,8 +2726,7 @@ int vfslocked; AUDIT_ARG(owner, uid, gid); - NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -3198,7 +3191,7 @@ int vfslocked; int error; - AUDIT_ARG(fd, uap->fd);; + AUDIT_ARG(fd, uap->fd); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vp = fp->f_vnode; From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 19 15:54:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F078716A420 for ; Sun, 19 Feb 2006 15:54:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F21643D45 for ; Sun, 19 Feb 2006 15:54:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A8AC646BF0 for ; Sun, 19 Feb 2006 10:54:36 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 18D2356C88; Sun, 19 Feb 2006 15:54:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 074E816A423; Sun, 19 Feb 2006 15:54: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 B924D16A420 for ; Sun, 19 Feb 2006 15:54:50 +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 71D1D43D46 for ; Sun, 19 Feb 2006 15:54:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1JFsoeb045069 for ; Sun, 19 Feb 2006 15:54:50 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 k1JFsoXR045066 for perforce@freebsd.org; Sun, 19 Feb 2006 15:54:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Feb 2006 15:54:50 GMT Message-Id: <200602191554.k1JFsoXR045066@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 92044 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Feb 2006 15:54:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92044 Change 92044 by rwatson@rwatson_fledge on 2006/02/19 15:54:16 Add UFS2 reference to EA section. Add GEOM section. Add OpenPAM section. Add side bar to front page. Use small Trusty on front page. Affected files ... .. //depot/projects/trustedbsd/www/components.page#4 edit .. //depot/projects/trustedbsd/www/home.page#3 edit .. //depot/projects/trustedbsd/www/page.xsl#2 edit .. //depot/projects/trustedbsd/www/sidebar.xml#4 edit Differences ... ==== //depot/projects/trustedbsd/www/components.page#4 (text+ko) ==== @@ -1,5 +1,5 @@ - - Trusty - - - Trusty - - + Trusty
    @@ -100,8 +91,8 @@

      + Copyright 2000-2006 Robert Watson. All rights reserved.
      Copyright 2005 SPARTA, Inc. All rights reserved.
      - Copyright 2000-2005 Robert Watson. All rights reserved.
      Copyright 2002, Leigh Denault. All rights reserved.
      Copyright 2002, 2003 Networks Associates, Inc. All rights reserved.
      ==== //depot/projects/trustedbsd/www/sidebar.xml#4 (text+ko) ==== @@ -1,18 +1,36 @@ +
      +

      TrustedBSD News

      + +
      +

      Components

      From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 19 16:03:03 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA2B716A422 for ; Sun, 19 Feb 2006 16:03:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54C6743D45 for ; Sun, 19 Feb 2006 16:03:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A229746BF0 for ; Sun, 19 Feb 2006 11:02:47 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4856358734; Sun, 19 Feb 2006 16:03:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 366DC16A423; Sun, 19 Feb 2006 16:03: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 ED77516A420 for ; Sun, 19 Feb 2006 16:03: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 B61ED43D48 for ; Sun, 19 Feb 2006 16:03: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 k1JG30YB045438 for ; Sun, 19 Feb 2006 16:03: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 k1JG30Kj045433 for perforce@freebsd.org; Sun, 19 Feb 2006 16:03:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Feb 2006 16:03:00 GMT Message-Id: <200602191603.k1JG30Kj045433@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 92045 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Feb 2006 16:03:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=92045 Change 92045 by rwatson@rwatson_fledge on 2006/02/19 16:02:28 Add news items about audit integration and mailing list server change. Affected files ... .. //depot/projects/trustedbsd/www/news.page#4 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#4 (text+ko) ==== @@ -35,7 +35,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#3 $ + $P4: //depot/projects/trustedbsd/www/news.page#4 $ @@ -46,13 +46,25 @@

      News announcements and press clippings related to the TrustedBSD Project.

      - +

      Robert Watson and Wayne Salamon announce the beginning of the + merging of CAPP Audit support to the + base FreeBSD CVS tree, which will take several weeks to complete. + They also announce integration of an OpenBSM pre-release into CVS.

      -
      April 29, 2005 TrustedBSD at BSDCan 2005

      The TrustedBSD Project will be presenting on the TrustedBSD / From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 19 19:29:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F8E816A420 for ; Sun, 19 Feb 2006 19:29:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7238443D46 for ; Sun, 19 Feb 2006 19:29:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B506F46BA7 for ; Sun, 19 Feb 2006 14:29:12 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2776E5625F; Sun, 19 Feb 2006 19:29:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1452F16A423; Sun, 19 Feb 2006 19:29: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 A205016A420 for ; Sun, 19 Feb 2006 19:29:26 +0000 (GMT) (envelope-from scottk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49E7C43D45 for ; Sun, 19 Feb 2006 19:29:26 +0000 (GMT) (envelope-from scottk@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 k1JJTQJK063257 for ; Sun, 19 Feb 2006 19:29:26 GMT (envelope-from scottk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1JJTN06063193 for perforce@freebsd.org; Sun, 19 Feb 2006 19:29:23 GMT (envelope-from scottk@freebsd.org) Date: Sun, 19 Feb 2006 19:29:23 GMT Message-Id: <200602191929.k1JJTN06063193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottk@freebsd.org using -f From: Scott Kamp To: Perforce Change Reviews Cc: Subject: PERFORCE change 92056 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Feb 2006 19:29:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=92056 Change 92056 by scottk@pavilion on 2006/02/19 19:22:23 Migrate from sebsd to sebsd2 to start new branch to bring current Integrate vendor branch //depot/vendor/freebsd/src/... to /depot/projects/trustedbsd/sebsd2 to bring SeBSD up to date and current with FreeBSD CURRENT Submitted by: scottk@freebsd.org Affected files ... .. //depot/projects/trustedbsd/sebsd2/COPYRIGHT#1 branch .. //depot/projects/trustedbsd/sebsd2/LOCKS#1 branch .. //depot/projects/trustedbsd/sebsd2/MAINTAINERS#1 branch .. //depot/projects/trustedbsd/sebsd2/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/Makefile.inc1#1 branch .. //depot/projects/trustedbsd/sebsd2/ObsoleteFiles.inc#1 branch .. //depot/projects/trustedbsd/sebsd2/README#1 branch .. //depot/projects/trustedbsd/sebsd2/UPDATING#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cat/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cat/cat.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cat/cat.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chflags/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chflags/chflags.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chflags/chflags.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chio/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chio/chio.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chio/chio.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chio/defs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chio/pathnames.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chmod/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chmod/chmod.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/chmod/chmod.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cp/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cp/cp.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cp/cp.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cp/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/cp/utils.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/config.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/config_p.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/host.defs#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/iconv.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/csh/iconv_stub.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/date.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/date.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/netdate.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/vary.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/date/vary.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/args.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/conv.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/conv_tab.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/dd.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/dd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/dd.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/gen.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/misc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/position.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.ascii#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.ebcdic#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.ibm#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.lcase#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.oldascii#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.oldibm#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.pareven#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.parnone#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.parodd#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.parset#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.swab#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/dd/ref.ucase#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/df/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/df/df.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/df/df.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/domainname/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/domainname/domainname.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/domainname/domainname.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/echo/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/echo/echo.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/echo/echo.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/POSIX#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/README#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/buf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/cbc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/ed.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/ed.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/glbl.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/io.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/main.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/re.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/sub.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/=.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/README#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/TODO#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/a.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/a.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/a.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/a1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/a2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/addr.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/addr.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/addr.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/addr1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/addr2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/ascii.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/bang1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/bang1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/bang1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/bang1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/bang2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/c.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/c.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/c.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/c1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/c2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/d.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/d.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/d.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/d.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e3.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e3.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e3.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e4.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e4.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/e4.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/f1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/f2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g3.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g3.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g3.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g4.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g4.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g4.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g5.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g5.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/g5.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/h.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/i3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/j.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/j.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/j.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/k4.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/l.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/l.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/l.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/m.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/m.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/m.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/m.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/n.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/n.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/n.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/nl2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/p.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/p.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/p.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/q.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/q.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/q.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/q1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r3.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r3.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/r3.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s10.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s3.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s3.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s3.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s4.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s5.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s6.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s7.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s8.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/s9.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t1.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t1.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t1.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t2.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t2.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/t2.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/u.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/u.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/u.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/u.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/v.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/v.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/v.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w.d#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w.r#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w.t#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w1.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w2.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/w3.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/x.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/test/z.err#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ed/undo.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/expr/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/expr/expr.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/expr/expr.y#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/getfacl/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/getfacl/getfacl.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/getfacl/getfacl.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/hostname/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/hostname/hostname.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/hostname/hostname.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kenv/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kenv/kenv.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kenv/kenv.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kill/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kill/kill.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/kill/kill.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ln/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ln/ln.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ln/ln.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ln/symlink.7#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/cmp.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/ls.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/ls.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/ls.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/print.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ls/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mkdir/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mkdir/mkdir.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mkdir/mkdir.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mv/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mv/mv.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/mv/mv.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/ar_io.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/ar_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/buf_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/cache.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/cache.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/cpio.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/cpio.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/cpio.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/file_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/ftree.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/ftree.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/gen_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/getoldopt.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/options.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/options.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/pat_rep.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/pat_rep.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/pax.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/pax.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/pax.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/sel_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/sel_subs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tables.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tables.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tar.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tar.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tar.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pax/tty_subs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/fmt.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/keyword.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/nlist.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/print.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/ps.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/ps.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/ps/ps.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pwd/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pwd/pwd.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/pwd/pwd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rcp/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rcp/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rcp/rcp.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rcp/rcp.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rcp/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/realpath/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/realpath/realpath.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/realpath/realpath.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rm/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rm/rm.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rm/rm.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rmail/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rmdir/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rmdir/rmdir.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/rmdir/rmdir.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/file.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/mask.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/merge.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/remove.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/setfacl.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/setfacl.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/setfacl.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/setfacl/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/TOUR#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/alias.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/alias.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/arith.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/arith.y#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/arith_lex.l#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/bltin/echo.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/bltin/echo.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/builtins.def#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/cd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/cd.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/error.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/error.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/eval.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/eval.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/exec.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/exec.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/expand.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/expand.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/cmv#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/dirs#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/kill#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/login#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/newgrp#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/popd#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/pushd#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/funcs/suspend#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/histedit.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/init.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/input.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/input.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/jobs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/jobs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mail.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mail.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/main.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/main.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/memalloc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/memalloc.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/miscbltin.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mkbuiltins#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mkinit.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mknodes.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mksyntax.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mktokens#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/myhistedit.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mystring.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/mystring.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/nodes.c.pat#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/nodetypes#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/options.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/options.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/output.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/output.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/parser.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/parser.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/redir.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/redir.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/sh.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/shell.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/show.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/show.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/trap.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/trap.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/var.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sh/var.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sleep/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sleep/sleep.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sleep/sleep.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/cchar.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/gfmt.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/key.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/modes.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/print.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/stty.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/stty.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/stty.h#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/stty/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sync/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sync/sync.8#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/sync/sync.c#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/TEST.README#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/TEST.csh#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/TEST.sh#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/test.1#1 branch .. //depot/projects/trustedbsd/sebsd2/bin/test/test.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/AUTHORS#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/BUGS#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/COPYING#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/ChangeLog#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/INSTALL#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/NEWS#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/README#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/README.ldap#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/README.y2k#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amd.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amd.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/autil.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/clock.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/conf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/map.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/opts.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/restart.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/sched.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/amq.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/amq.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/amq.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/bootstrap#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/doc/version.texi#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/amindent#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/autopat#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/mkconf#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/tasks#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/AUTHORS#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/ChangeLog#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/FAQ#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/INSTALL#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/NEWS#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/README#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/array.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/atan.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/div.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/exp.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/fact.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/jn.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/ln.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/mul.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/raise.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/signum#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/sine.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/Test/timetest#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/acconfig.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/aclocal.m4#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/bc.y#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/const.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/execute.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/global.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/global.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/load.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/main.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/proto.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/scan.l#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/storage.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/bc/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/config.h.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/configure#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/configure.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/array.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/dc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/dc.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/eval.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/misc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/stack.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/dc/string.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/bc.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/dc.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/h/number.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/install-sh#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/lib/number.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/missing#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bc/stamp-h.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/CHANGES#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/FAQ#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/README#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/acconfig.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/config.guess#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/config.sub#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/config.threads.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/configure.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/trustedbsd/sebsd2/contrib/bind9/doc/rfc/rfc3364.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 20 18:59:09 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D9ACC16A457 for ; Mon, 20 Feb 2006 18:59:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD97643D46 for ; Mon, 20 Feb 2006 18:59:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 00A6746C19 for ; Mon, 20 Feb 2006 13:58:48 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 01A415BB52; Mon, 20 Feb 2006 18:59:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E405916A424; Mon, 20 Feb 2006 18:59: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 6F91216A420; Mon, 20 Feb 2006 18:59:01 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id D735143D46; Mon, 20 Feb 2006 18:59:00 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k1KIwoVU022835; Mon, 20 Feb 2006 13:58:59 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Scott Kamp Date: Mon, 20 Feb 2006 13:59:34 -0500 User-Agent: KMail/1.9.1 References: <200602191929.k1JJTN06063193@repoman.freebsd.org> In-Reply-To: <200602191929.k1JJTN06063193@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200602201359.35492.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1293/Sun Feb 19 11:40:25 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED,AWL autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews , rwatson@freebsd.org Subject: Re: PERFORCE change 92056 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Feb 2006 18:59:10 -0000 On Sunday 19 February 2006 14:29, Scott Kamp wrote: > http://perforce.freebsd.org/chv.cgi?CH=92056 > > Change 92056 by scottk@pavilion on 2006/02/19 19:22:23 > > Migrate from sebsd to sebsd2 to start new branch to bring current > Integrate vendor branch //depot/vendor/freebsd/src/... to > /depot/projects/trustedbsd/sebsd2 to bring SeBSD up to date and current > with FreeBSD CURRENT Submitted by: scottk@freebsd.org FYI, all the other TrustedBSD branches use 'trustedbsd_' as a prefix of their branch name: trustedbsd_acl trustedbsd_acl_nfsv4 trustedbsd_audit trustedbsd_audit2 trustedbsd_audit3 trustedbsd_audit3_old trustedbsd_audit3_openbsm_sys trustedbsd_cap trustedbsd_doc trustedbsd_dsep trustedbsd_mac trustedbsd_objlabel trustedbsd_openbsm_audit3 trustedbsd_sebsd trustedbsd_sedarwin If you were following that pattern you would use 'trustedbsd_sebsd2' rather than just 'sebsd2'. Also, all the other TrustedBSD branches are branched from the 'trustedbsd' base branch in //depot/projects/trustedbsd/base/... For example, the audit3 branch's view is: View: //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... Wherease the sebsd2 branch's view is: View: //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... Is the inconsistency intentional? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 20 20:46:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3745E16A420 for ; Mon, 20 Feb 2006 20:46:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 617BC43D46 for ; Mon, 20 Feb 2006 20:46:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 664EE46BC8 for ; Mon, 20 Feb 2006 15:46:13 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7ABD955822; Mon, 20 Feb 2006 20:46:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 67B5C16A423; Mon, 20 Feb 2006 20:46: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 E1D5416A420; Mon, 20 Feb 2006 20:46:22 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from mail.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECC9D43D45; Mon, 20 Feb 2006 20:46:21 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (unknown [127.0.0.1]) by mail.optimhosts.com (Postfix) with ESMTP id 3CEED8C86B3; Tue, 21 Feb 2006 04:48:03 +0800 (PHT) Received: from mail.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 79576-07; Tue, 21 Feb 2006 04:47:35 +0800 (PHT) Received: from [192.168.2.185] (adsl-217-74-108.asm.bellsouth.net [68.217.74.108]) by mail.optimhosts.com (Postfix) with ESMTP id 4304B8C8541; Tue, 21 Feb 2006 04:47:31 +0800 (PHT) From: D1ng0 To: John Baldwin In-Reply-To: <200602201359.35492.jhb@freebsd.org> References: <200602191929.k1JJTN06063193@repoman.freebsd.org> <200602201359.35492.jhb@freebsd.org> Content-Type: text/plain Date: Tue, 21 Feb 2006 04:45:38 +0800 Message-Id: <1140468339.799.9.camel@pavilion.optimlabs.com> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: rwatson@freebsd.org, Scott Kamp , Perforce Change Reviews Subject: Re: PERFORCE change 92056 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Feb 2006 20:46:30 -0000 > FYI, all the other TrustedBSD branches use 'trustedbsd_' as a prefix of their > branch name: > > trustedbsd_acl > trustedbsd_acl_nfsv4 > trustedbsd_audit > trustedbsd_audit2 > trustedbsd_audit3 > trustedbsd_audit3_old > trustedbsd_audit3_openbsm_sys > trustedbsd_cap > trustedbsd_doc > trustedbsd_dsep > trustedbsd_mac > trustedbsd_objlabel > trustedbsd_openbsm_audit3 > trustedbsd_sebsd > trustedbsd_sedarwin > > If you were following that pattern you would use 'trustedbsd_sebsd2' rather > than just 'sebsd2'. Also, all the other TrustedBSD branches are branched > from the 'trustedbsd' base branch in //depot/projects/trustedbsd/base/... > For example, the audit3 branch's view is: > > View: > //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... > > Wherease the sebsd2 branch's view is: > > View: > //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... > > Is the inconsistency intentional? > the trustedbsd_ branch name was an over sight, the branching from //depot/vendor/freebsd/src/... instead of //depot/projects/trustedbsd/base/... was due to a conversation pertaining to pulling in audit to sebsd2 while working to bring it current, referring to the specific email would be Subject: Re: Migrating SeBSD to CUREENT - Are we alive ??? Date: Thu, 16 Feb 2006 13:45:11 +0000 (GMT) (21:45 PHT) where Robert stated it would be best to branch from vendor/freebsd or even trustedbsd/mac to include the audit code, though mac is in an untested state. So i went with vendor/src/... now as for the branch name, how can we resolv that. From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 20 20:58:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 924B716A420 for ; Mon, 20 Feb 2006 20:58:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD6C043D73 for ; Mon, 20 Feb 2006 20:58:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9DFDC46B96 for ; Mon, 20 Feb 2006 15:58:07 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CA82C63F33; Mon, 20 Feb 2006 20:57:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B638A16A425; Mon, 20 Feb 2006 20:57: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 B2BD116A420; Mon, 20 Feb 2006 20:57:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44C8043D48; Mon, 20 Feb 2006 20:57:06 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k1KKv4vR023823; Mon, 20 Feb 2006 15:57:04 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: D1ng0 Date: Mon, 20 Feb 2006 15:58:05 -0500 User-Agent: KMail/1.9.1 References: <200602191929.k1JJTN06063193@repoman.freebsd.org> <200602201359.35492.jhb@freebsd.org> <1140468339.799.9.camel@pavilion.optimlabs.com> In-Reply-To: <1140468339.799.9.camel@pavilion.optimlabs.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200602201558.07967.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1293/Sun Feb 19 11:40:25 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED,AWL autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: rwatson@freebsd.org, Scott Kamp , Perforce Change Reviews Subject: Re: PERFORCE change 92056 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Feb 2006 20:58:27 -0000 On Monday 20 February 2006 15:45, D1ng0 wrote: > > FYI, all the other TrustedBSD branches use 'trustedbsd_' as a prefix of > > their branch name: > > > > trustedbsd_acl > > trustedbsd_acl_nfsv4 > > trustedbsd_audit > > trustedbsd_audit2 > > trustedbsd_audit3 > > trustedbsd_audit3_old > > trustedbsd_audit3_openbsm_sys > > trustedbsd_cap > > trustedbsd_doc > > trustedbsd_dsep > > trustedbsd_mac > > trustedbsd_objlabel > > trustedbsd_openbsm_audit3 > > trustedbsd_sebsd > > trustedbsd_sedarwin > > > > If you were following that pattern you would use 'trustedbsd_sebsd2' > > rather than just 'sebsd2'. Also, all the other TrustedBSD branches are > > branched from the 'trustedbsd' base branch in > > //depot/projects/trustedbsd/base/... For example, the audit3 branch's > > view is: > > > > View: > > //depot/projects/trustedbsd/base/... > > //depot/projects/trustedbsd/audit3/... > > > > Wherease the sebsd2 branch's view is: > > > > View: > > //depot/vendor/freebsd/src/... > > //depot/projects/trustedbsd/sebsd2/... > > > > Is the inconsistency intentional? > > the trustedbsd_ branch name was an over sight, the branching > from //depot/vendor/freebsd/src/... instead > of //depot/projects/trustedbsd/base/... was due to a conversation > pertaining to pulling in audit to sebsd2 while working to bring it > current, referring to the specific email would be > > Subject: > Re: Migrating SeBSD to CUREENT - Are > we alive ??? > Date: > Thu, 16 Feb 2006 13:45:11 +0000 > (GMT) (21:45 PHT) > > where Robert stated it would be best to branch from vendor/freebsd or > even trustedbsd/mac to include the audit code, though mac is in an > untested state. So i went with vendor/src/... now as for the branch > name, how can we resolv that. I think Robert would probably prefer //depot/projects/trustedbsd/base/... It's basically a snapshot of //depot/vendor/freebsd/... I'll leave that to him to clarify. As far as the branch, you can just create a new trustedbsd_sebsd2 branch with the correct view and delete the old sebsd2 branch. Branches are just names for views in p4. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 21 04:09:16 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 768BF16A422 for ; Tue, 21 Feb 2006 04:09:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FE6843D45 for ; Tue, 21 Feb 2006 04:09:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BA35F46BD7 for ; Mon, 20 Feb 2006 23:08:56 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A1AD455912; Tue, 21 Feb 2006 04:09:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 93B3B16A423; Tue, 21 Feb 2006 04:09: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 3E81716A420 for ; Tue, 21 Feb 2006 04:09:11 +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 E3E0543D49 for ; Tue, 21 Feb 2006 04:09:10 +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 k1L49Atp083031 for ; Tue, 21 Feb 2006 04:09:10 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L49AOj083028 for perforce@freebsd.org; Tue, 21 Feb 2006 04:09:10 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 04:09:10 GMT Message-Id: <200602210409.k1L49AOj083028@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 92109 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2006 04:09:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92109 Change 92109 by csjp@csjp_xor on 2006/02/21 04:09:03 CAPP says that failing to audit an auditable event should result in the event not happening. So, if auditing any of these events fails, terminate the process all together. Also, do not ignore au_write failures. This change needs to be made in the login(1) too. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#11 (text+ko) ==== @@ -650,13 +650,13 @@ return; syslog(LOG_AUTH | LOG_ERR, "audit: auditon failed: %s", strerror(errno)); - return; + errx(1, "Permission denied"); } afd = au_open(); if (afd < 0) { syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", strerror(errno)); - return; + errx(1, "Permission denied"); } /* XXX what should we do for termid? */ bzero(&termid, sizeof(termid)); @@ -666,10 +666,13 @@ if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "audit: unable to build subject token"); - return; + errx(1, "Permission denied"); + } + if (au_write(afd, token) < 0) { + syslog(LOG_AUTH | LOG_ERR, + "audit: au_write failed: %s", strerror(errno)); + errx(1, "Permission denied"); } - /* XXX what if au_fails? */ - (void) au_write(afd, token); if (fmt != NULL) { va_start(ap, fmt); (void) vsnprintf(&text[0], sizeof(text) - 1, fmt, ap); @@ -678,9 +681,13 @@ if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "audit: failed to generate text token"); - return; + errx(1, "Permission denied"); + } + if (au_write(afd, token) < 0) { + syslog(LOG_AUTH | LOG_ERR, + "audit: au_write failed: %s", strerror(errno)); + errx(1, "Permission denied"); } - (void) au_write(afd, token); } switch (what) { case AUDIT_SU_FAILURE: @@ -693,10 +700,16 @@ if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "audit: enable to build return token"); - return; + errx(1, "Permission denied"); + } + if (au_write(afd, token) < 0) { + syslog(LOG_AUTH | LOG_ERR, + "audit: au_write failed: %s", strerror(errno)); + errx(1, "Permission denied"); } - (void) au_write(afd, token); - if (au_close(afd, 1, AUE_su) < 0) + if (au_close(afd, 1, AUE_su) < 0) { syslog(LOG_AUTH | LOG_ERR, "audit: record not committed"); + errx(1, "Permission denied"); + } } #endif From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 21 04:12:17 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7478E16A422 for ; Tue, 21 Feb 2006 04:12:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D98B243D4C for ; Tue, 21 Feb 2006 04:12:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E8C3446B84 for ; Mon, 20 Feb 2006 23:12:00 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CC35A55A94; Tue, 21 Feb 2006 04:12:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BDD6616A423; Tue, 21 Feb 2006 04:12: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 6969716A420 for ; Tue, 21 Feb 2006 04:12:15 +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 211F143D46 for ; Tue, 21 Feb 2006 04:12:15 +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 k1L4CFZt083204 for ; Tue, 21 Feb 2006 04:12:15 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L4CERS083201 for perforce@freebsd.org; Tue, 21 Feb 2006 04:12:14 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 04:12:14 GMT Message-Id: <200602210412.k1L4CERS083201@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 92110 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2006 04:12:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=92110 Change 92110 by csjp@csjp_xor on 2006/02/21 04:11:49 Actually check the audit condition. Somewhere along the way this got dropped. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#12 (text+ko) ==== @@ -652,6 +652,8 @@ strerror(errno)); errx(1, "Permission denied"); } + if (acond == AUC_NOAUDIT) + return; afd = au_open(); if (afd < 0) { syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 21 04:21:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B273316A42A for ; Tue, 21 Feb 2006 04:21:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C62D443D46 for ; Tue, 21 Feb 2006 04:21:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8CC8446B84 for ; Mon, 20 Feb 2006 23:21:12 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8C16E55F8F; Tue, 21 Feb 2006 04:21:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E09016A423; Tue, 21 Feb 2006 04:21: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 3AC5116A422 for ; Tue, 21 Feb 2006 04:21:27 +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 ACC4243D46 for ; Tue, 21 Feb 2006 04:21:26 +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 k1L4LQQq083602 for ; Tue, 21 Feb 2006 04:21:26 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L4LQc7083599 for perforce@freebsd.org; Tue, 21 Feb 2006 04:21:26 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 04:21:26 GMT Message-Id: <200602210421.k1L4LQc7083599@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 92111 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2006 04:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=92111 Change 92111 by csjp@csjp_xor on 2006/02/21 04:21:22 Conditionally compile the login_audit and in login.c conditionally compile in calls to audit functions. This behaviour differs a bit from my previous change, where the audit functions were NOPs in the event audit was not wanted. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#15 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#15 (text+ko) ==== @@ -292,19 +292,25 @@ pam_err = pam_start("login", username, &pamc, &pamh); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_start()"); +#ifdef USE_BSM_AUDIT au_login_fail("PAM Error", 1); +#endif bail(NO_SLEEP_EXIT, 1); } pam_err = pam_set_item(pamh, PAM_TTY, tty); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_set_item(PAM_TTY)"); +#ifdef USE_BSM_AUDIT au_login_fail("PAM Error", 1); +#endif bail(NO_SLEEP_EXIT, 1); } pam_err = pam_set_item(pamh, PAM_RHOST, hostname); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_set_item(PAM_RHOST)"); +#ifdef USE_BSM_AUDIT au_login_fail("PAM Error", 1); +#endif bail(NO_SLEEP_EXIT, 1); } @@ -338,7 +344,9 @@ * We are not exiting here, but this corresponds to a failed * login event, so set exitstatus to 1. */ +#ifdef USE_BSM_AUDIT au_login_fail("Login incorrect", 1); +#endif (void)printf("Login incorrect\n"); failures++; @@ -362,9 +370,11 @@ endpwent(); +#ifdef USE_BSM_AUDIT /* Audit successful login. */ if (auditsuccess) au_login_success(); +#endif /* * Establish the login class. @@ -951,7 +961,9 @@ { pam_cleanup(); +#ifdef USE_BSM_AUDIT audit_logout(); +#endif (void)sleep(sec); exit(eval); } ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#11 (text+ko) ==== @@ -46,6 +46,7 @@ #include "login.h" +#ifdef USE_BSM_AUDIT /* * Audit data */ @@ -58,7 +59,6 @@ void au_login_success(void) { -#ifdef USE_BSM_AUDIT token_t *tok; int aufd; au_mask_t aumask; @@ -103,7 +103,6 @@ if (au_close(aufd, 1, AUE_login) == -1) errx(1, "login: Audit Record was not committed."); -#endif /* USE_BSM_AUDIT */ } /* @@ -113,7 +112,6 @@ void au_login_fail(char *errmsg, int na) { -#ifdef USE_BSM_AUDIT token_t *tok; int aufd; long au_cond; @@ -162,7 +160,6 @@ if (au_close(aufd, 1, AUE_login) == -1) errx(1, "login: Audit Error: au_close() was not committed"); -#endif /* USE_BSM_AUDIT */ } /* @@ -172,7 +169,6 @@ void audit_logout(void) { -#ifdef USE_BSM_AUDIT token_t *tok; int aufd; au_mask_t aumask; @@ -206,5 +202,5 @@ if (au_close(aufd, 1, AUE_logout) == -1) errx(1, "login: Audit Record was not committed."); +} #endif /* USE_BSM_AUDIT */ -} From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 21 05:11:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86C8E16A420 for ; Tue, 21 Feb 2006 05:11:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6860D43D53 for ; Tue, 21 Feb 2006 05:11:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B511946BC9 for ; Tue, 21 Feb 2006 00:11:21 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CCBBA58798; Tue, 21 Feb 2006 05:11:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BDAE916A423; Tue, 21 Feb 2006 05:11: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 7912F16A420 for ; Tue, 21 Feb 2006 05:11:28 +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 331A843D45 for ; Tue, 21 Feb 2006 05:11:28 +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 k1L5BS7E092641 for ; Tue, 21 Feb 2006 05:11:28 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1L5BRlJ092638 for perforce@freebsd.org; Tue, 21 Feb 2006 05:11:27 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 05:11:27 GMT Message-Id: <200602210511.k1L5BRlJ092638@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 92112 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2006 05:11:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92112 Change 92112 by csjp@csjp_xor on 2006/02/21 05:10:49 Overhaul error handling logic here. The subject shouldn't know anything about the auditing configuration concerning them. So, instead of printing errors to stderr which gives away information about auditing config, print a vague message to stderr and log the details to syslog (LOG_AUTH|LOG_ERR). This is a CAPP requirement. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#12 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include "login.h" @@ -72,37 +73,55 @@ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - err(1, "login: Could not determine audit condition"); + syslog(LOG_AUTH | LOG_ERR, + "Could not determine audit condition: %s", + strerror(errno)); + errx(1, "Permission denied"); } if (au_cond == AUC_NOAUDIT) return; /* Compute and set the user's preselection mask. */ - if (au_user_mask(pwd->pw_name, &aumask) == -1) - errx(1, "login: Could not set audit mask\n"); + if (au_user_mask(pwd->pw_name, &aumask) == -1) { + syslog(LOG_AUTH | LOG_ERR, + "Could not set audit mask: %s", strerror(errno)); + errx(1, "Permission denied"); + } /* Set the audit info for the user. */ auinfo.ai_auid = uid; auinfo.ai_asid = pid; bcopy(&tid, &auinfo.ai_termid, sizeof(auinfo.ai_termid)); bcopy(&aumask, &auinfo.ai_mask, sizeof(auinfo.ai_mask)); - if (setaudit(&auinfo) != 0) - err(1, "login: setaudit failed"); + if (setaudit(&auinfo) != 0) { + syslog(LOG_AUTH | LOG_ERR, "setaudit failed: %s", + strerror(errno)); + errx(1, "Permission denied"); + } - if ((aufd = au_open()) == -1) - errx(1,"login: Audit Error: au_open() failed"); + if ((aufd = au_open()) == -1) { + syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + strerror(errno)); + errx(1,"Permission denied"); + } if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, - pid, &tid)) == NULL) - errx(1, "login: Audit Error: au_to_subject32() failed"); + pid, &tid)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if ((tok = au_to_return32(0, 0)) == NULL) - errx(1, "login: Audit Error: au_to_return32() failed"); + if ((tok = au_to_return32(0, 0)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, "au_to_return32 failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if (au_close(aufd, 1, AUE_login) == -1) - errx(1, "login: Audit Record was not committed."); + if (au_close(aufd, 1, AUE_login) == -1) { + syslog(LOG_AUTH | LOG_ERR, "audit record not committed"); + errx(1, "Permission denied"); + } } /* @@ -123,13 +142,19 @@ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - err(1, "login: Could not determine audit condition"); + syslog(LOG_AUTH | LOG_ERR, + "could not determine audit condition: %s", + strerror(errno)); + errx(1, "Permission denied"); } if (au_cond == AUC_NOAUDIT) return; - if ((aufd = au_open()) == -1) - errx(1, "login: Audit Error: au_open() failed"); + if ((aufd = au_open()) == -1) { + syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if (na) { /* @@ -137,29 +162,41 @@ * within a user's session => auid,asid == -1. */ if ((tok = au_to_subject32(-1, geteuid(), getegid(), -1, -1, - pid, -1, &tid)) == NULL) - errx(1, "login: Audit Error: au_to_subject32() failed"); + pid, -1, &tid)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + errx(1, "Permission denied"); + } } else { /* We know the subject -- so use its value instead. */ uid = pwd->pw_uid; gid = pwd->pw_gid; if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, - gid, pid, pid, &tid)) == NULL) - errx(1, "login: Audit Error: au_to_subject32() failed"); + gid, pid, pid, &tid)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + errx(1, "Permission denied"); + } } au_write(aufd, tok); /* Include the error message. */ - if ((tok = au_to_text(errmsg)) == NULL) - errx(1, "login: Audit Error: au_to_text() failed"); + if ((tok = au_to_text(errmsg)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, "au_to_text failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if ((tok = au_to_return32(1, errno)) == NULL) - errx(1, "login: Audit Error: au_to_return32() failed"); + if ((tok = au_to_return32(1, errno)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "login: Audit Error: au_to_return32() failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if (au_close(aufd, 1, AUE_login) == -1) - errx(1, "login: Audit Error: au_close() was not committed"); + if (au_close(aufd, 1, AUE_login) == -1) { + syslog(LOG_AUTH | LOG_ERR, + "login: Audit Error: au_close() was not committed"); + errx(1, "Permission denied"); + } } /* @@ -182,25 +219,39 @@ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - errx(1, "login: Could not determine audit condition"); + syslog(LOG_AUTH | LOG_ERR, + "login: Could not determine audit condition: %s", + strerror(errno)); + errx(1, "Permission denied"); } if (au_cond == AUC_NOAUDIT) return; - if ((aufd = au_open()) == -1) - errx(1, "login: Audit Error: au_open() failed"); + if ((aufd = au_open()) == -1) { + syslog(LOG_AUTH | LOG_ERR, + "login: Audit Error: au_open() failed"); + errx(1, "Permission denied"); + } /* The subject that is created (euid, egid of the current process). */ if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, - pid, &tid)) == NULL) - errx(1, "login: Audit Error: au_to_subject32() failed"); + pid, &tid)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "login: Audit Error: au_to_subject32() failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if ((tok = au_to_return32(0, 0)) == NULL) - errx(1, "login: Audit Error: au_to_return32() failed"); + if ((tok = au_to_return32(0, 0)) == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "login: Audit Error: au_to_return32() failed"); + errx(1, "Permission denied"); + } au_write(aufd, tok); - if (au_close(aufd, 1, AUE_logout) == -1) - errx(1, "login: Audit Record was not committed."); + if (au_close(aufd, 1, AUE_logout) == -1) { + syslog(LOG_AUTH | LOG_ERR, "Audit Record was not committed."); + errx(1, "Permission denied"); + } } #endif /* USE_BSM_AUDIT */ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 21 15:13:33 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B02216A420 for ; Tue, 21 Feb 2006 15:13:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F30F43D48 for ; Tue, 21 Feb 2006 15:13:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B323046BE0 for ; Tue, 21 Feb 2006 10:13:05 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B728C915FB; Tue, 21 Feb 2006 15:13:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AC81416A423; Tue, 21 Feb 2006 15:13: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 5D74916A420 for ; Tue, 21 Feb 2006 15:13:20 +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 4AC1543D6A for ; Tue, 21 Feb 2006 15:13:18 +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 k1LFDITb037117 for ; Tue, 21 Feb 2006 15:13:18 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LFDI3G037114 for perforce@freebsd.org; Tue, 21 Feb 2006 15:13:18 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 15:13:18 GMT Message-Id: <200602211513.k1LFDI3G037114@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 92125 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2006 15:13:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=92125 Change 92125 by csjp@csjp_xor on 2006/02/21 15:12:46 Minimize namespace pollution by moving the #includes under the #if USE_BSM_AUDIT Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#13 (text+ko) ==== @@ -31,6 +31,7 @@ * @APPLE_BSD_LICENSE_HEADER_END@ */ +#ifdef USE_BSM_AUDIT #include __FBSDID("$FreeBSD$"); @@ -47,7 +48,6 @@ #include "login.h" -#ifdef USE_BSM_AUDIT /* * Audit data */ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 21 15:13:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 693C616A422 for ; Tue, 21 Feb 2006 15:13:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F47B43D45 for ; Tue, 21 Feb 2006 15:13:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 89AE946BF4 for ; Tue, 21 Feb 2006 10:13:28 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4446191839; Tue, 21 Feb 2006 15:13:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3971C16A423; Tue, 21 Feb 2006 15:13: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 D232116A420 for ; Tue, 21 Feb 2006 15:13:42 +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 1EBCB43D46 for ; Tue, 21 Feb 2006 15:13:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LFDf9m037220 for ; Tue, 21 Feb 2006 15:13:41 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 k1LFDI0p037120 for perforce@freebsd.org; Tue, 21 Feb 2006 15:13:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 21 Feb 2006 15:13:18 GMT Message-Id: <200602211513.k1LFDI0p037120@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 92126 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2006 15:13:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92126 Change 92126 by rwatson@rwatson_zoo on 2006/02/21 15:12:55 Integrate TrustedBSD base branch from FreeBSD CVS: - snmp updates - OpenBSM update to 1.0a4. - NO_AUDIT - atheros driver, 802.11 updates - Normal plethora of driver tweaks, meta-data additions, bug fixes, etc. - Accounting fixup. - Audit arguments to signal, process system calls. - Page size jumbo mbuf clusters. - Various audit bug fixes. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#68 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#6 integrate .. //depot/projects/trustedbsd/base/UPDATING#62 integrate .. //depot/projects/trustedbsd/base/bin/csh/Makefile#12 integrate .. //depot/projects/trustedbsd/base/bin/csh/config.h#6 integrate .. //depot/projects/trustedbsd/base/bin/csh/iconv.h#1 branch .. //depot/projects/trustedbsd/base/bin/csh/iconv_stub.c#1 branch .. //depot/projects/trustedbsd/base/bin/ln/ln.1#10 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.c#12 integrate .. //depot/projects/trustedbsd/base/bin/ps/print.c#19 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/CHANGELOG#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_user#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/et/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/french/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/german/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/greek/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/italian/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/spanish/charset#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/charset#1 branch .. //depot/projects/trustedbsd/base/etc/Makefile#47 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#51 integrate .. //depot/projects/trustedbsd/base/etc/hosts.allow#6 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/440.status-mailq#5 integrate .. //depot/projects/trustedbsd/base/etc/rc#29 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#35 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/SERVERS#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/abi#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/archdep#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/localpkg#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/named#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netif#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pccard#7 delete .. //depot/projects/trustedbsd/base/etc/rc.d/root#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#24 integrate .. //depot/projects/trustedbsd/base/etc/snmpd.config#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#48 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/dialog/dialog.1#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/dialog/dialog.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/search.c#7 integrate .. //depot/projects/trustedbsd/base/include/proc_service.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/grantpt.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#10 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_set_policy.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_strerror.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libmemstat/memstat_uma.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#30 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_once.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#17 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_suspend_np.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libpthread_db.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libthr_db.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libutil/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libutil/kld.3#1 branch .. //depot/projects/trustedbsd/base/lib/libutil/kld.c#1 branch .. //depot/projects/trustedbsd/base/lib/libutil/libutil.h#8 integrate .. //depot/projects/trustedbsd/base/release/Makefile#72 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#65 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#97 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#11 integrate .. //depot/projects/trustedbsd/base/sbin/gbde/gbde.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/gbde/gbde.c#15 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#36 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#43 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#35 integrate .. //depot/projects/trustedbsd/base/sbin/mca/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/mca/mca.8#1 branch .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.c#20 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#14 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.c#14 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#18 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#40 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#63 integrate .. //depot/projects/trustedbsd/base/share/man/man4/agp.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#18 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ataraid.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/atkbd.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipmi.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ipsec.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/lp.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_ibm.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.sparc64/eeprom.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/myri10ge.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_one2many.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ohci.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/syscons.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/twa.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uart.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vga.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#20 integrate .. //depot/projects/trustedbsd/base/share/man/man5/group.5#7 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#38 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#55 integrate .. //depot/projects/trustedbsd/base/share/man/man9/acl.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/buf.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/memguard.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mtx_pool.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/rman.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/vm_page_wakeup.9#3 integrate .. //depot/projects/trustedbsd/base/share/mklocale/ja_JP.SJIS.src#4 integrate .. //depot/projects/trustedbsd/base/share/mklocale/ja_JP.eucJP.src#3 integrate .. //depot/projects/trustedbsd/base/share/msgdef/am_ET.UTF-8.src#2 integrate .. //depot/projects/trustedbsd/base/share/msgdef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#42 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mp_machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#30 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/identcpu.c#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#24 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/tsc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_syscall.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#11 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91st.c#2 delete .. //depot/projects/trustedbsd/base/sys/arm/at91/files.at91#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/files.at91rm92#2 delete .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/std.at91#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/std.at91rm92#2 delete .. //depot/projects/trustedbsd/base/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/KB920X#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#96 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#25 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#59 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#46 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#40 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/README#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah.h#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/version.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_throttle.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athioctl.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfe.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/cs/if_csvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_cbus.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_osdep.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc_acpi.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_ioctl.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_sbus.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_target.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_target.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_tpublic.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispmbox.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispreg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/mii.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/fc_log.h#5 delete .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_debug.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#45 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/if_plip.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_rue.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_udav.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci_pci.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohcivar.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umct.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_quirks.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#48 integrate .. //depot/projects/trustedbsd/base/sys/dev/vge/if_vge.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vfsops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#27 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.h#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_ufs.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.h#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.h#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/geode.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#35 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#56 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#46 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#60 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#47 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/tsc.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/xbox.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia32/ia32_trap.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#58 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/mca.c#8 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/mp_machdep.c#26 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#52 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kse.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#50 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_sleepqueue.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_domain.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#53 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#72 integrate .. //depot/projects/trustedbsd/base/sys/modules/arcnet/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/dummynet/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/firewire/firewire/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/firewire/fwe/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/firewire/sbp/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/firewire/sbp_targ/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_vlan/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/netgraph/atm/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/bluetooth/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/bt3c/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/h4/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/ubt/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/nfs4client/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/nfsclient/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/modules/twa/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gre.c#24 integrate .. //depot/projects/trustedbsd/base/sys/net/if_media.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_media.h#16 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#32 integrate .. //depot/projects/trustedbsd/base/sys/net/radix.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211.c#14 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#17 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_var.h#15 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/netflow/ng_netflow.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_eiface.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ksocket.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#37 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#36 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.h#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw.h#24 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#47 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp.h#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#59 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_sack.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#47 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#37 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#19 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#22 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#32 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_intel.c#21 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_pcn.c#27 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#45 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sf.c#27 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#46 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sk.c#35 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#34 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#35 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_wb.c#27 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#43 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap.c#22 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/db_trace.c#16 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/eeprom.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#21 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#48 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tick.c#16 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#33 integrate .. //depot/projects/trustedbsd/base/sys/sys/ipmi.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#45 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#52 integrate .. //depot/projects/trustedbsd/base/sys/sys/pcpu.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#72 integrate .. //depot/projects/trustedbsd/base/sys/sys/sleepqueue.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#27 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#37 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#24 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#42 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#57 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#40 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/init-i-P.t#1 branch .. //depot/projects/trustedbsd/base/usr.bin/column/column.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/mbuf.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/systat/vmstat.c#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/vmstat/vmstat.8#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/wall/wall.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/who/who.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#47 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidcontrol/sdp.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/kbd.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hcsecd/hcsecd.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/config.5#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/moused/moused.c#17 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/version/perform.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/powerd/powerd.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/devices.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/network.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/tcpip.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#68 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.534 2006/01/02 17:52:16 dfr Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -1079,11 +1079,14 @@ .for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor # Remove catpages without corresponding manpages. @3<&0; \ @@ -1100,7 +1103,9 @@ check-old-files: @echo ">>> Checking for old files" .for file in ${OLD_FILES} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1116,32 +1121,49 @@ @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor delete-old-dirs: @echo ">>> Removing old directories" .for dir in ${OLD_DIRS} # Don't fail if an old directory isn't empty. - @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true) + @if [ -d "${DESTDIR}/${dir}" ]; then \ + rmdir -v "${DESTDIR}/${dir}" || true; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor @echo ">>> Old directories removed" check-old-dirs: @echo ">>> Checking for old directories" .for dir in ${OLD_DIRS} - @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" + @if [ -d "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir}"; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor delete-old: delete-old-files delete-old-dirs ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.27 2006/02/04 08:07:00 avatar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.28 2006/02/18 16:35:57 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -82,6 +82,10 @@ OLD_FILES+=bin/vinum OLD_FILES+=sbin/vinum OLD_FILES+=usr/share/man/man8/vinum.8.gz +# 200411XX: libxpg4 removal +OLD_FILES+=usr/lib/libxpg4.a +OLD_FILES+=usr/lib/libxpg4.so +OLD_FILES+=usr/lib/libxpg4_p.a # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz @@ -89,7 +93,7 @@ OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery OLD_FILES+=usr/lib/libisc.a -OLD_FILEs+=usr/lib/libisc.so +OLD_FILES+=usr/lib/libisc.so OLD_FILES+=usr/lib/libisc_p.a OLD_FILES+=usr/libexec/named-xfer OLD_FILES+=usr/sbin/named.restart @@ -563,7 +567,6 @@ # 200201XX OLD_FILES+=usr/sbin/linux # 2001XXXX -OLD_FILES+=etc/security OLD_FILES+=usr/bin/joy OLD_FILES+=usr/sbin/ibcs2 OLD_FILES+=usr/sbin/svr4 @@ -2759,6 +2762,8 @@ OLD_LIBS+=usr/lib/snmp_pf.so.2 # 2005XXXX: not ready for primetime yet OLD_LIBS+=usr/lib/libautofs.so.1 +# 200411XX: libxpg4 removal +OLD_LIBS+=usr/lib/libxpg4.so.3 # 200410XX: libm compatibility fix OLD_LIBS+=lib/libm.so.2 # 20041001: version bump ==== //depot/projects/trustedbsd/base/UPDATING#62 (text+ko) ==== @@ -94,6 +94,15 @@ Its /etc/rc.conf.d configuration file has been `ppp' from the beginning, and hence there is no need to touch it. +20051014: + Now most modules get their build-time options from the kernel + configuration file. A few modules still have fixed options + due to their non-conformant implementation, but they will be + corrected eventually. You may need to review the options of + the modules in use, explicitly specify the non-default options + in the kernel configuration file, and rebuild the kernel and + modules afterwards. + 20051001: kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8) to turn polling(4) on your interfaces. @@ -501,4 +510,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.438 2006/02/01 13:04:52 yar Exp $ +$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ ==== //depot/projects/trustedbsd/base/bin/csh/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.37 2005/08/03 09:22:03 phk Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.38 2006/02/19 06:40:29 ume Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -70,12 +70,30 @@ NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15 NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15 +.if defined(NO_NLS_CATALOGS) || defined(RESCUE) +CFLAGS+= -DNO_NLS_CATALOGS +.else +CFLAGS+= -DHAVE_ICONV +SRCS+= iconv_stub.c +# Folloing links can be installed from ports/shells/tcsh_nls: +# NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 +# NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8 +# NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8 +# NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8 +# NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8 +# NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 +# NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8 +# NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8 +# NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8 +# NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8 +.endif + NLSNAME= tcsh .for catalog in ${CATALOGS} NLS+= ${catalog:C/.*://} NLSSRCDIR_${catalog:C/.*://}= ${TCSHDIR}/nls/${catalog:C/:.*//} -NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo set[0-9]* +NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo charset set[0-9]* .endfor csh.1: tcsh.man ==== //depot/projects/trustedbsd/base/bin/csh/config.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config.h,v 1.12 2005/05/04 20:21:57 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.13 2006/02/19 06:40:29 ume Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -205,3 +205,7 @@ #include "config_p.h" #include "config_f.h" + +#ifndef NO_NLS_CATALOGS +#define NLS_CATALOGS +#endif ==== //depot/projects/trustedbsd/base/bin/ln/ln.1#10 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.30 2005/01/16 16:41:57 ru Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $ .\" -.Dd December 30, 1993 +.Dd February 14, 2006 .Dt LN 1 .Os .Sh NAME @@ -41,11 +41,11 @@ .Nd make links .Sh SYNOPSIS .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file .Op Ar target_file .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file ... .Ar target_dir .Nm link @@ -76,6 +76,24 @@ option overrides any previous .Fl i options.) +.It Fl F +If the target file already exists and is a directory, then remove it +so that the link may occur. +The +.Fl F +option should be used with either +.Fl f +or +.Fl i +options. +If none is specified, +.Fl f +is implied. +The +.Fl F +option is a no-op unless +.Fl s +option is specified. .It Fl h If the .Ar target_file @@ -179,6 +197,12 @@ They are provided solely for compatibility with other .Nm implementations. +.Pp +The +.Fl F +option is +.Fx +extention and should not be used in portable scripts. .Sh SEE ALSO .Xr link 2 , .Xr lstat 2 , ==== //depot/projects/trustedbsd/base/bin/ln/ln.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.33 2005/02/09 17:37:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $"); #include #include @@ -53,6 +53,7 @@ #include int fflag; /* Unlink existing files. */ +int Fflag; /* Remove empty directories also. */ int hflag; /* Check new name for symlink first. */ int iflag; /* Interactive mode. */ int sflag; /* Symbolic, not hard, link. */ @@ -91,8 +92,11 @@ exit(linkit(argv[0], argv[1], 0)); } - while ((ch = getopt(argc, argv, "fhinsv")) != -1) + while ((ch = getopt(argc, argv, "Ffhinsv")) != -1) switch (ch) { + case 'F': + Fflag = 1; + break; case 'f': fflag = 1; iflag = 0; @@ -121,6 +125,10 @@ linkf = sflag ? symlink : link; linkch = sflag ? '-' : '='; + if (sflag == 0) + Fflag = 0; + if (Fflag == 1 && iflag == 0) + fflag = 1; switch(argc) { case 0: @@ -200,7 +208,12 @@ * and interactively if -i was specified. */ if (fflag && exists) { - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -216,7 +229,12 @@ return (1); } - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -236,8 +254,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ln [-fhinsv] source_file [target_file]", - " ln [-fhinsv] source_file ... target_dir", + "usage: ln [-Ffhinsv] source_file [target_file]", + " ln [-Ffhinsv] source_file ... target_dir", " link source_file target_file"); exit(1); } ==== //depot/projects/trustedbsd/base/bin/ps/print.c#19 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.93 2004/07/20 05:52:00 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $"); #include #include @@ -366,6 +366,8 @@ if (strncmp(ttname, "tty", 3) == 0 || strncmp(ttname, "cua", 3) == 0) ttname += 3; + if (strncmp(ttname, "pts/", 4) == 0) + ttname += 4; (void)printf("%*.*s%c", v->width - 1, v->width - 1, ttname, k->ki_p->ki_kiflag & KI_CTTY ? ' ' : '-'); } ==== //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#4 (text+ko) ==== @@ -11,6 +11,7 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module + 3 BEGEMOT-IP snmpd mibII module 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) ==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#10 (text+ko) ==== @@ -105,6 +105,18 @@ /* list of all New if registrations */ static struct newifreg_list newifreg_list = TAILQ_HEAD_INITIALIZER(newifreg_list); +/* baud rate of fastest interface */ +uint64_t mibif_maxspeed; + +/* user-forced update interval */ +u_int mibif_force_hc_update_interval; + +/* current update interval */ +u_int mibif_hc_update_interval; + +/* HC update timer handle */ +static void *hc_update_timer; + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; @@ -280,16 +292,15 @@ (struct snmp_value *)NULL); } -/* - * Fetch new MIB data. +/** + * Fetch the GENERIC IFMIB and update the HC counters */ -int -mib_fetch_ifmib(struct mibif *ifp) +static int +fetch_generic_mib(struct mibif *ifp, const struct ifmibdata *old) { int name[6]; size_t len; - void *newmib; - struct ifmibdata oldmib = ifp->mib; + struct mibif_private *p = ifp->private; name[0] = CTL_NET; name[1] = PF_LINK; @@ -306,26 +317,144 @@ return (-1); } - if (ifp->trap_enable) { - if (!(oldmib.ifmd_flags & IFF_UP)) { - if (ifp->mib.ifmd_flags & IFF_UP) - link_trap(ifp, 1); + /* + * Assume that one of the two following compounds is optimized away + */ + if (ULONG_MAX >= 0xffffffffffffffffULL) { + p->hc_inoctets = ifp->mib.ifmd_data.ifi_ibytes; + p->hc_outoctets = ifp->mib.ifmd_data.ifi_obytes; + p->hc_omcasts = ifp->mib.ifmd_data.ifi_omcasts; + p->hc_opackets = ifp->mib.ifmd_data.ifi_opackets; + p->hc_imcasts = ifp->mib.ifmd_data.ifi_imcasts; + p->hc_ipackets = ifp->mib.ifmd_data.ifi_ipackets; + + } else if (ULONG_MAX >= 0xffffffff) { + +#define UPDATE(HC, MIB) \ + if (old->ifmd_data.MIB > ifp->mib.ifmd_data.MIB) \ + p->HC += (0x100000000ULL + \ + ifp->mib.ifmd_data.MIB) - \ + old->ifmd_data.MIB; \ + else \ + p->HC += ifp->mib.ifmd_data.MIB - \ + old->ifmd_data.MIB; + + UPDATE(hc_inoctets, ifi_ibytes) + UPDATE(hc_outoctets, ifi_obytes) + UPDATE(hc_omcasts, ifi_omcasts) + UPDATE(hc_opackets, ifi_opackets) + UPDATE(hc_imcasts, ifi_imcasts) + UPDATE(hc_ipackets, ifi_ipackets) + +#undef UPDATE + } else + abort(); + return (0); +} + +/** + * Update the 64-bit interface counters + */ +static void +update_hc_counters(void *arg __unused) +{ + struct mibif *ifp; + struct ifmibdata oldmib; + + TAILQ_FOREACH(ifp, &mibif_list, link) { + oldmib = ifp->mib; + (void)fetch_generic_mib(ifp, &oldmib); + } +} + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 21 15:32:00 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F380D16A428 for ; Tue, 21 Feb 2006 15:31:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C00343D45 for ; Tue, 21 Feb 2006 15:31:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0BDFA46BF5 for ; Tue, 21 Feb 2006 10:31:43 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 19EBF57427; Tue, 21 Feb 2006 15:31:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 10F0216A423; Tue, 21 Feb 2006 15:31: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 C4BC316A420 for ; Tue, 21 Feb 2006 15:31:57 +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 6C62443D48 for ; Tue, 21 Feb 2006 15:31:57 +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 k1LFVv93042241 for ; Tue, 21 Feb 2006 15:31:57 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LFVvme042238 for perforce@freebsd.org; Tue, 21 Feb 2006 15:31:57 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 15:31:57 GMT Message-Id: <200602211531.k1LFVvme042238@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 92128 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2006 15:32:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=92128 Change 92128 by csjp@csjp_xor on 2006/02/21 15:31:43 Do not ignore the return value of au_write. This function can fail so we should make sure it doesn't, but if it does, do the right thing. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#14 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#14 (text+ko) ==== @@ -110,13 +110,21 @@ syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if ((tok = au_to_return32(0, 0)) == NULL) { syslog(LOG_AUTH | LOG_ERR, "au_to_return32 failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if (au_close(aufd, 1, AUE_login) == -1) { syslog(LOG_AUTH | LOG_ERR, "audit record not committed"); @@ -176,21 +184,33 @@ errx(1, "Permission denied"); } } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } /* Include the error message. */ if ((tok = au_to_text(errmsg)) == NULL) { syslog(LOG_AUTH | LOG_ERR, "au_to_text failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if ((tok = au_to_return32(1, errno)) == NULL) { syslog(LOG_AUTH | LOG_ERR, "login: Audit Error: au_to_return32() failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if (au_close(aufd, 1, AUE_login) == -1) { syslog(LOG_AUTH | LOG_ERR, @@ -240,14 +260,22 @@ "login: Audit Error: au_to_subject32() failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if ((tok = au_to_return32(0, 0)) == NULL) { syslog(LOG_AUTH | LOG_ERR, "login: Audit Error: au_to_return32() failed"); errx(1, "Permission denied"); } - au_write(aufd, tok); + if (au_write(aufd, tok) < 0) { + syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + strerror(errno)); + errx(1, "Permission denied"); + } if (au_close(aufd, 1, AUE_logout) == -1) { syslog(LOG_AUTH | LOG_ERR, "Audit Record was not committed."); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 21 18:18:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A53B16A420 for ; Tue, 21 Feb 2006 18:18:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3E7F43D46 for ; Tue, 21 Feb 2006 18:18:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id AC64646B85 for ; Tue, 21 Feb 2006 13:18:16 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 18B425B3C2; Tue, 21 Feb 2006 18:16:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CDFA16A423; Tue, 21 Feb 2006 18:16: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 C5A2916A420 for ; Tue, 21 Feb 2006 18:16:30 +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 4713D43D49 for ; Tue, 21 Feb 2006 18:16:30 +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 k1LIGUCA056423 for ; Tue, 21 Feb 2006 18:16:30 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LIGT30056420 for perforce@freebsd.org; Tue, 21 Feb 2006 18:16:29 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 18:16:29 GMT Message-Id: <200602211816.k1LIGT30056420@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 92132 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2006 18:18:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=92132 Change 92132 by csjp@csjp_xor on 2006/02/21 18:15:32 Keep audit error syslog messages using a consistent format, prefix all error messages with "audit", remove redundant data which will show up in the syslog messages. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#15 (text+ko) ==== @@ -74,7 +74,7 @@ if (errno == ENOSYS) return; syslog(LOG_AUTH | LOG_ERR, - "Could not determine audit condition: %s", + "audit: could not determine audit condition: %s", strerror(errno)); errx(1, "Permission denied"); } @@ -84,7 +84,7 @@ /* Compute and set the user's preselection mask. */ if (au_user_mask(pwd->pw_name, &aumask) == -1) { syslog(LOG_AUTH | LOG_ERR, - "Could not set audit mask: %s", strerror(errno)); + "audit: could not set audit mask: %s", strerror(errno)); errx(1, "Permission denied"); } @@ -94,40 +94,41 @@ bcopy(&tid, &auinfo.ai_termid, sizeof(auinfo.ai_termid)); bcopy(&aumask, &auinfo.ai_mask, sizeof(auinfo.ai_mask)); if (setaudit(&auinfo) != 0) { - syslog(LOG_AUTH | LOG_ERR, "setaudit failed: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: setaudit failed: %s", strerror(errno)); errx(1, "Permission denied"); } if ((aufd = au_open()) == -1) { - syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", strerror(errno)); errx(1,"Permission denied"); } if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, pid, &tid)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_to_subject32 failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if ((tok = au_to_return32(0, 0)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, "au_to_return32 failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_to_return32 failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if (au_close(aufd, 1, AUE_login) == -1) { - syslog(LOG_AUTH | LOG_ERR, "audit record not committed"); + syslog(LOG_AUTH | LOG_ERR, + "audit: audit record not committed"); errx(1, "Permission denied"); } } @@ -151,7 +152,7 @@ if (errno == ENOSYS) return; syslog(LOG_AUTH | LOG_ERR, - "could not determine audit condition: %s", + "audit: could not determine audit condition: %s", strerror(errno)); errx(1, "Permission denied"); } @@ -159,7 +160,7 @@ return; if ((aufd = au_open()) == -1) { - syslog(LOG_AUTH | LOG_ERR, "au_open failed: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", strerror(errno)); errx(1, "Permission denied"); } @@ -171,7 +172,8 @@ */ if ((tok = au_to_subject32(-1, geteuid(), getegid(), -1, -1, pid, -1, &tid)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + syslog(LOG_AUTH | LOG_ERR, + "audit: au_to_subject32 failed"); errx(1, "Permission denied"); } } else { @@ -180,41 +182,42 @@ gid = pwd->pw_gid; if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, pid, &tid)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, "au_to_subject32 failed"); + syslog(LOG_AUTH | LOG_ERR, + "audit: au_to_subject32 failed"); errx(1, "Permission denied"); } } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } /* Include the error message. */ if ((tok = au_to_text(errmsg)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, "au_to_text failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_to_text failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if ((tok = au_to_return32(1, errno)) == NULL) { syslog(LOG_AUTH | LOG_ERR, - "login: Audit Error: au_to_return32() failed"); + "audit: au_to_return32() failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if (au_close(aufd, 1, AUE_login) == -1) { syslog(LOG_AUTH | LOG_ERR, - "login: Audit Error: au_close() was not committed"); + "audit: au_close() was not committed"); errx(1, "Permission denied"); } } @@ -240,7 +243,7 @@ if (errno == ENOSYS) return; syslog(LOG_AUTH | LOG_ERR, - "login: Could not determine audit condition: %s", + "audit: could not determine audit condition: %s", strerror(errno)); errx(1, "Permission denied"); } @@ -248,37 +251,34 @@ return; if ((aufd = au_open()) == -1) { - syslog(LOG_AUTH | LOG_ERR, - "login: Audit Error: au_open() failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_open() failed"); errx(1, "Permission denied"); } /* The subject that is created (euid, egid of the current process). */ if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, pid, &tid)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, - "login: Audit Error: au_to_subject32() failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_to_subject32() failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if ((tok = au_to_return32(0, 0)) == NULL) { - syslog(LOG_AUTH | LOG_ERR, - "login: Audit Error: au_to_return32() failed"); + syslog(LOG_AUTH | LOG_ERR, "audit: au_to_return32() failed"); errx(1, "Permission denied"); } if (au_write(aufd, tok) < 0) { - syslog(LOG_AUTH | LOG_ERR, "au_write faied: %s", + syslog(LOG_AUTH | LOG_ERR, "audit: au_write faied: %s", strerror(errno)); errx(1, "Permission denied"); } if (au_close(aufd, 1, AUE_logout) == -1) { - syslog(LOG_AUTH | LOG_ERR, "Audit Record was not committed."); + syslog(LOG_AUTH | LOG_ERR, "audit: record was not committed."); errx(1, "Permission denied"); } } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 21 20:33:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BC9416A422 for ; Tue, 21 Feb 2006 20:33:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6981943D5E for ; Tue, 21 Feb 2006 20:33:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D01AA46B84 for ; Tue, 21 Feb 2006 15:32:45 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 201F95C1F8; Tue, 21 Feb 2006 20:33:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 16A3516A423; Tue, 21 Feb 2006 20:33: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 C829716A422 for ; Tue, 21 Feb 2006 20:32: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 6DAEE43DAB for ; Tue, 21 Feb 2006 20:32:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1LKWhZX063065 for ; Tue, 21 Feb 2006 20:32:43 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 k1LKWL02063061 for perforce@freebsd.org; Tue, 21 Feb 2006 20:32:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 21 Feb 2006 20:32:21 GMT Message-Id: <200602212032.k1LKWL02063061@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 92142 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2006 20:33:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=92142 Change 92142 by rwatson@rwatson_zoo on 2006/02/21 20:32:17 Integrate TrustedBSD audit3 branch from TrustedBSD base: - snmp updates - OpenBSM update to 1.0a4. - NO_AUDIT - atheros driver, 802.11 updates - Normal plethora of driver tweaks, meta-data additions, bug fixes, etc. - Accounting fixup. - Audit arguments to signal, process system calls. - Page size jumbo mbuf clusters. - Various audit bug fixes. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile.inc1#7 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#4 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#8 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/config.h#4 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/iconv.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/iconv_stub.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ln/ln.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/ln/ln.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/ps/print.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/oid-list#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_tree.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/snmp_mibII.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/export.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/snmpmod.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_user#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/C/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/et/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/finnish/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/french/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/german/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/greek/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/italian/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ja/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/pl/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/russian/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/spanish/charset#1 branch .. //depot/projects/trustedbsd/audit3/contrib/tcsh/nls/ukrainian/charset#1 branch .. //depot/projects/trustedbsd/audit3/etc/Makefile#10 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#10 integrate .. //depot/projects/trustedbsd/audit3/etc/hosts.allow#3 integrate .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/440.status-mailq#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#10 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/SERVERS#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/abi#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/archdep#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/localpkg#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/named#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/netif#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pccard#3 delete .. //depot/projects/trustedbsd/audit3/etc/rc.d/root#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.subr#6 integrate .. //depot/projects/trustedbsd/audit3/etc/snmpd.config#3 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#10 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/dialog/dialog.1#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/dialog/dialog.c#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/grep/search.c#6 integrate .. //depot/projects/trustedbsd/audit3/include/proc_service.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_cpio.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/grantpt.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/recv.2#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/ipsec_set_policy.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/ipsec_strerror.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libmemstat/memstat_uma.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_kern.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_init.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_once.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_private.h#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_suspend_np.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libthread_db/libpthread_db.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libthread_db/libthr_db.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/kld.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libutil/kld.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libutil/libutil.h#4 integrate .. //depot/projects/trustedbsd/audit3/release/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate .. //depot/projects/trustedbsd/audit3/release/doc/share/misc/dev.archlist.txt#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/gbde/gbde.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/gbde/gbde.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geli.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/mca/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/mca/mca.8#1 branch .. //depot/projects/trustedbsd/audit3/sbin/mdconfig/mdconfig.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/mdmfs/mdmfs.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/mdmfs/mdmfs.c#5 integrate .. //depot/projects/trustedbsd/audit3/secure/usr.sbin/sshd/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#10 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/agp.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ata.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ataraid.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/atkbd.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ipmi.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ipsec.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/lp.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/acpi_ibm.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.sparc64/eeprom.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/myri10ge.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_one2many.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ohci.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/syscons.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/twa.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uart.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/vga.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/group.5#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/acl.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/buf.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/memguard.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/mtx_pool.9#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/rman.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/vm_page_wakeup.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/ja_JP.SJIS.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/ja_JP.eucJP.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/msgdef/am_ET.UTF-8.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/msgdef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_syscall.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91st.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/arm/at91/files.at91#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/files.at91rm92#2 delete .. //depot/projects/trustedbsd/audit3/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.at91#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.at91rm92#2 delete .. //depot/projects/trustedbsd/audit3/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/KB920X#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#17 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#8 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.post.mk#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#8 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/README#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_osdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_osdep.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/version.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/asr/asr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-raid.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athioctl.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cs/if_csvar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_cbus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_target.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/mii.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/fc_log.h#4 delete .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_debug.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/nge/if_nge.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/if_ral.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/re/if_re.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_rue.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohci_pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohcivar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/umass.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/umct.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uplcom.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_subr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_slice.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_slice.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_ufs.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/geode.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/xbox.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia32/ia32_trap.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/mca.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_clock.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_kse.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mbuf.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_proc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_resource.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_synch.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sysctl.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_tc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_domain.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/arcnet/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/dummynet/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/firewire/firewire/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/firewire/fwe/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/firewire/sbp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/firewire/sbp_targ/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_vlan/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/atm/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/bluetooth/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/bt3c/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/h4/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/ubt/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/nfs4client/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/nfsclient/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/twa/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_gre.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_media.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_media.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/radix.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/netflow/ng_netflow.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_eiface.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_ksocket.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_dummynet.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_input.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_sack.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/nd6.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_intel.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_pcn.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_rl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_sf.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_sis.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_sk.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_ste.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_vr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_wb.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_xl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/db_trace.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/eeprom.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/tick.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/ipmi.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/sys/mbuf.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/param.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/pcpu.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/systm.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/uma_core.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/init-i-P.t#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/column/column.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/mbuf.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/systat/vmstat.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/vmstat/vmstat.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/wall/wall.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/who/who.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#14 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/arp/arp.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidcontrol/sdp.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/kbd.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/hcsecd/hcsecd.8#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/config.5#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/moused/moused.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/version/perform.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/powerd/powerd.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/devices.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/network.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/tcpip.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.534 2006/01/02 17:52:16 dfr Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -1079,11 +1079,14 @@ .for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor # Remove catpages without corresponding manpages. @3<&0; \ @@ -1100,7 +1103,9 @@ check-old-files: @echo ">>> Checking for old files" .for file in ${OLD_FILES} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1116,32 +1121,49 @@ @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor delete-old-dirs: @echo ">>> Removing old directories" .for dir in ${OLD_DIRS} # Don't fail if an old directory isn't empty. - @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true) + @if [ -d "${DESTDIR}/${dir}" ]; then \ + rmdir -v "${DESTDIR}/${dir}" || true; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor @echo ">>> Old directories removed" check-old-dirs: @echo ">>> Checking for old directories" .for dir in ${OLD_DIRS} - @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" + @if [ -d "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir}"; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor delete-old: delete-old-files delete-old-dirs ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.27 2006/02/04 08:07:00 avatar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.28 2006/02/18 16:35:57 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -82,6 +82,10 @@ OLD_FILES+=bin/vinum OLD_FILES+=sbin/vinum OLD_FILES+=usr/share/man/man8/vinum.8.gz +# 200411XX: libxpg4 removal +OLD_FILES+=usr/lib/libxpg4.a +OLD_FILES+=usr/lib/libxpg4.so +OLD_FILES+=usr/lib/libxpg4_p.a # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz @@ -89,7 +93,7 @@ OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery OLD_FILES+=usr/lib/libisc.a -OLD_FILEs+=usr/lib/libisc.so +OLD_FILES+=usr/lib/libisc.so OLD_FILES+=usr/lib/libisc_p.a OLD_FILES+=usr/libexec/named-xfer OLD_FILES+=usr/sbin/named.restart @@ -563,7 +567,6 @@ # 200201XX OLD_FILES+=usr/sbin/linux # 2001XXXX -OLD_FILES+=etc/security OLD_FILES+=usr/bin/joy OLD_FILES+=usr/sbin/ibcs2 OLD_FILES+=usr/sbin/svr4 @@ -2759,6 +2762,8 @@ OLD_LIBS+=usr/lib/snmp_pf.so.2 # 2005XXXX: not ready for primetime yet OLD_LIBS+=usr/lib/libautofs.so.1 +# 200411XX: libxpg4 removal +OLD_LIBS+=usr/lib/libxpg4.so.3 # 200410XX: libm compatibility fix OLD_LIBS+=lib/libm.so.2 # 20041001: version bump ==== //depot/projects/trustedbsd/audit3/UPDATING#8 (text+ko) ==== @@ -94,6 +94,15 @@ Its /etc/rc.conf.d configuration file has been `ppp' from the beginning, and hence there is no need to touch it. +20051014: + Now most modules get their build-time options from the kernel + configuration file. A few modules still have fixed options + due to their non-conformant implementation, but they will be + corrected eventually. You may need to review the options of + the modules in use, explicitly specify the non-default options + in the kernel configuration file, and rebuild the kernel and + modules afterwards. + 20051001: kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8) to turn polling(4) on your interfaces. @@ -501,4 +510,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.438 2006/02/01 13:04:52 yar Exp $ +$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ ==== //depot/projects/trustedbsd/audit3/bin/csh/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.37 2005/08/03 09:22:03 phk Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.38 2006/02/19 06:40:29 ume Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -70,12 +70,30 @@ NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15 NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15 +.if defined(NO_NLS_CATALOGS) || defined(RESCUE) +CFLAGS+= -DNO_NLS_CATALOGS +.else +CFLAGS+= -DHAVE_ICONV +SRCS+= iconv_stub.c +# Folloing links can be installed from ports/shells/tcsh_nls: +# NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 +# NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8 +# NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8 +# NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8 +# NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8 +# NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 +# NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8 +# NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8 +# NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8 +# NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8 +.endif + NLSNAME= tcsh .for catalog in ${CATALOGS} NLS+= ${catalog:C/.*://} NLSSRCDIR_${catalog:C/.*://}= ${TCSHDIR}/nls/${catalog:C/:.*//} -NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo set[0-9]* +NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo charset set[0-9]* .endfor csh.1: tcsh.man ==== //depot/projects/trustedbsd/audit3/bin/csh/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config.h,v 1.12 2005/05/04 20:21:57 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.13 2006/02/19 06:40:29 ume Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -205,3 +205,7 @@ #include "config_p.h" #include "config_f.h" + +#ifndef NO_NLS_CATALOGS +#define NLS_CATALOGS +#endif ==== //depot/projects/trustedbsd/audit3/bin/ln/ln.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.30 2005/01/16 16:41:57 ru Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $ .\" -.Dd December 30, 1993 +.Dd February 14, 2006 .Dt LN 1 .Os .Sh NAME @@ -41,11 +41,11 @@ .Nd make links .Sh SYNOPSIS .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file .Op Ar target_file .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file ... .Ar target_dir .Nm link @@ -76,6 +76,24 @@ option overrides any previous .Fl i options.) +.It Fl F +If the target file already exists and is a directory, then remove it +so that the link may occur. +The +.Fl F +option should be used with either +.Fl f +or +.Fl i +options. +If none is specified, +.Fl f +is implied. +The +.Fl F +option is a no-op unless +.Fl s +option is specified. .It Fl h If the .Ar target_file @@ -179,6 +197,12 @@ They are provided solely for compatibility with other .Nm implementations. +.Pp +The +.Fl F +option is +.Fx +extention and should not be used in portable scripts. .Sh SEE ALSO .Xr link 2 , .Xr lstat 2 , ==== //depot/projects/trustedbsd/audit3/bin/ln/ln.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.33 2005/02/09 17:37:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $"); #include #include @@ -53,6 +53,7 @@ #include int fflag; /* Unlink existing files. */ +int Fflag; /* Remove empty directories also. */ int hflag; /* Check new name for symlink first. */ int iflag; /* Interactive mode. */ int sflag; /* Symbolic, not hard, link. */ @@ -91,8 +92,11 @@ exit(linkit(argv[0], argv[1], 0)); } - while ((ch = getopt(argc, argv, "fhinsv")) != -1) + while ((ch = getopt(argc, argv, "Ffhinsv")) != -1) switch (ch) { + case 'F': + Fflag = 1; + break; case 'f': fflag = 1; iflag = 0; @@ -121,6 +125,10 @@ linkf = sflag ? symlink : link; linkch = sflag ? '-' : '='; + if (sflag == 0) + Fflag = 0; + if (Fflag == 1 && iflag == 0) + fflag = 1; switch(argc) { case 0: @@ -200,7 +208,12 @@ * and interactively if -i was specified. */ if (fflag && exists) { - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -216,7 +229,12 @@ return (1); } - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -236,8 +254,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ln [-fhinsv] source_file [target_file]", - " ln [-fhinsv] source_file ... target_dir", + "usage: ln [-Ffhinsv] source_file [target_file]", + " ln [-Ffhinsv] source_file ... target_dir", " link source_file target_file"); exit(1); } ==== //depot/projects/trustedbsd/audit3/bin/ps/print.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.93 2004/07/20 05:52:00 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $"); #include #include @@ -366,6 +366,8 @@ if (strncmp(ttname, "tty", 3) == 0 || strncmp(ttname, "cua", 3) == 0) ttname += 3; + if (strncmp(ttname, "pts/", 4) == 0) + ttname += 4; (void)printf("%*.*s%c", v->width - 1, v->width - 1, ttname, k->ki_p->ki_kiflag & KI_CTTY ? ' ' : '-'); } ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/oid-list#2 (text+ko) ==== @@ -11,6 +11,7 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module + 3 BEGEMOT-IP snmpd mibII module 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.c#5 (text+ko) ==== @@ -105,6 +105,18 @@ /* list of all New if registrations */ static struct newifreg_list newifreg_list = TAILQ_HEAD_INITIALIZER(newifreg_list); +/* baud rate of fastest interface */ +uint64_t mibif_maxspeed; + +/* user-forced update interval */ +u_int mibif_force_hc_update_interval; + +/* current update interval */ +u_int mibif_hc_update_interval; + +/* HC update timer handle */ +static void *hc_update_timer; + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; @@ -280,16 +292,15 @@ (struct snmp_value *)NULL); } -/* - * Fetch new MIB data. +/** + * Fetch the GENERIC IFMIB and update the HC counters */ -int -mib_fetch_ifmib(struct mibif *ifp) +static int +fetch_generic_mib(struct mibif *ifp, const struct ifmibdata *old) { int name[6]; size_t len; - void *newmib; - struct ifmibdata oldmib = ifp->mib; + struct mibif_private *p = ifp->private; name[0] = CTL_NET; name[1] = PF_LINK; @@ -306,26 +317,144 @@ return (-1); } - if (ifp->trap_enable) { - if (!(oldmib.ifmd_flags & IFF_UP)) { - if (ifp->mib.ifmd_flags & IFF_UP) - link_trap(ifp, 1); + /* + * Assume that one of the two following compounds is optimized away + */ + if (ULONG_MAX >= 0xffffffffffffffffULL) { + p->hc_inoctets = ifp->mib.ifmd_data.ifi_ibytes; + p->hc_outoctets = ifp->mib.ifmd_data.ifi_obytes; + p->hc_omcasts = ifp->mib.ifmd_data.ifi_omcasts; + p->hc_opackets = ifp->mib.ifmd_data.ifi_opackets; + p->hc_imcasts = ifp->mib.ifmd_data.ifi_imcasts; + p->hc_ipackets = ifp->mib.ifmd_data.ifi_ipackets; + + } else if (ULONG_MAX >= 0xffffffff) { + +#define UPDATE(HC, MIB) \ + if (old->ifmd_data.MIB > ifp->mib.ifmd_data.MIB) \ + p->HC += (0x100000000ULL + \ + ifp->mib.ifmd_data.MIB) - \ + old->ifmd_data.MIB; \ + else \ + p->HC += ifp->mib.ifmd_data.MIB - \ + old->ifmd_data.MIB; + + UPDATE(hc_inoctets, ifi_ibytes) + UPDATE(hc_outoctets, ifi_obytes) + UPDATE(hc_omcasts, ifi_omcasts) + UPDATE(hc_opackets, ifi_opackets) + UPDATE(hc_imcasts, ifi_imcasts) + UPDATE(hc_ipackets, ifi_ipackets) + +#undef UPDATE + } else + abort(); + return (0); +} + +/** + * Update the 64-bit interface counters + */ +static void +update_hc_counters(void *arg __unused) +{ + struct mibif *ifp; + struct ifmibdata oldmib; + + TAILQ_FOREACH(ifp, &mibif_list, link) { + oldmib = ifp->mib; + (void)fetch_generic_mib(ifp, &oldmib); + } +} + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 21 22:35:17 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E11716A420 for ; Tue, 21 Feb 2006 22:35:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE6B243D55 for ; Tue, 21 Feb 2006 22:35:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 926FC46BBB for ; Tue, 21 Feb 2006 17:34:58 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CD01E555C3; Tue, 21 Feb 2006 22:35:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BAAA316A423; Tue, 21 Feb 2006 22:35: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 7BE6016A420 for ; Tue, 21 Feb 2006 22:35:13 +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 4FB2343D53 for ; Tue, 21 Feb 2006 22:35:13 +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 k1LMZDU4080010 for ; Tue, 21 Feb 2006 22:35:13 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1LMZDBQ080007 for perforce@freebsd.org; Tue, 21 Feb 2006 22:35:13 GMT (envelope-from csjp@freebsd.org) Date: Tue, 21 Feb 2006 22:35:13 GMT Message-Id: <200602212235.k1LMZDBQ080007@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 92149 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2006 22:35:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=92149 Change 92149 by csjp@csjp_xor on 2006/02/21 22:34:55 Further reduce namespace pollution in su(1) by conditionally including audit/bsm includes. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#13 (text+ko) ==== @@ -81,8 +81,10 @@ #include #include +#ifdef USE_BSM_AUDIT #include #include +#endif #include #include @@ -145,7 +147,9 @@ static void usage(void) __dead2; static void export_pam_environment(void); static int ok_to_export(const char *); +#ifdef USE_BSM_AUDIT static void audit_su(au_id_t, int, const char *, ...); +#endif extern char **environ; From owner-trustedbsd-cvs@FreeBSD.ORG Wed Feb 22 02:52:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CDFD16A43A for ; Wed, 22 Feb 2006 02:52:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF02543D45 for ; Wed, 22 Feb 2006 02:52:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 34B3A46BE2 for ; Tue, 21 Feb 2006 21:52:19 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6984C571A0; Wed, 22 Feb 2006 02:52:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 332FE16A424; Wed, 22 Feb 2006 02:52: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 90A2516A422 for ; Wed, 22 Feb 2006 02:52:33 +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 6F12843D45 for ; Wed, 22 Feb 2006 02:52:33 +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 k1M2qXpB098011 for ; Wed, 22 Feb 2006 02:52:33 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1M2qXlM098008 for perforce@freebsd.org; Wed, 22 Feb 2006 02:52:33 GMT (envelope-from wsalamon@computer.org) Date: Wed, 22 Feb 2006 02:52:33 GMT Message-Id: <200602220252.k1M2qXlM098008@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 92172 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Feb 2006 02:52:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=92172 Change 92172 by wsalamon@gretsch on 2006/02/22 02:51:36 Bring the kern_futimes() function in agreement with the current FreeBSD CVS version. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#27 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#27 (text+ko) ==== @@ -2971,11 +2971,10 @@ int error; AUDIT_ARG(fd, fd); + if ((error = getutimes(tptr, tptrseg, ts)) != 0) + return (error); if ((error = getvnode(td->td_proc->p_fd, fd, &fp)) != 0) return (error); - - if ((error = getutimes(tptr, tptrseg, ts)) != 0) - return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); error = setutimes(td, fp->f_vnode, ts, 2, tptr == NULL); VFS_UNLOCK_GIANT(vfslocked); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 08:46:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 299ED16A420 for ; Thu, 23 Feb 2006 08:46:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10E2143D49 for ; Thu, 23 Feb 2006 08:46:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BCD4B46BCB for ; Thu, 23 Feb 2006 03:45:56 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 26AD855AB0; Thu, 23 Feb 2006 08:45:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 10FE816A423; Thu, 23 Feb 2006 08:45: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 AE72616A420 for ; Thu, 23 Feb 2006 08: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 223DD43D70 for ; Thu, 23 Feb 2006 08:45:10 +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 k1N8jAHj032052 for ; Thu, 23 Feb 2006 08:45:10 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 k1N8j9iI032049 for perforce@freebsd.org; Thu, 23 Feb 2006 08:45:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 23 Feb 2006 08:45:09 GMT Message-Id: <200602230845.k1N8j9iI032049@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 92257 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 08:46:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=92257 Change 92257 by rwatson@rwatson_fledge on 2006/02/23 08:44:58 Slight work tweakage. Put OpenBSM 1.0 alpha 4 tarball up for download. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#4 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#4 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#3 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#4 $ @@ -54,12 +54,12 @@ systems, such as Mach task interfaces, sendfile(), and Linux system calls present in the FreeBSD Linux emulation layer.

      -

      OpenBSM includes system include files appropriate for inclusion in - an operating system implementation of Audit, libbsm, an - implementation of the BSM library interfaces for generating, parsing, - and managing audit records, auditreduce and praudit, audit reduction - and printing tools, API documentation, and sample /etc configuration - files. +

      The OpenBSM distribution includes system include files appropriate + for inclusion in an operating system implementation of Audit, libbsm, + an implementation of the BSM library interfaces for generating, + parsing, and managing audit records, auditreduce and praudit, audit + reduction and printing tools, API documentation, and sample /etc + configuration files. Works in progress include extensions to the libbsm API to support easier audit trail analysis, including a pattern matching library.

      @@ -76,6 +76,11 @@ Apple under a BSD license. The Darwin BSM implementation was created by McAfee Research under contract to Apple Computer, and has since been extended by the volunteer TrustedBSD team.

      + +

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

    From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 18:59:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC12316A420 for ; Thu, 23 Feb 2006 18:59:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F0D943D45 for ; Thu, 23 Feb 2006 18:59:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4760546BE2 for ; Thu, 23 Feb 2006 13:59:33 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 35A8B55CB6; Thu, 23 Feb 2006 18:59:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 260C216A423; Thu, 23 Feb 2006 18:59:49 +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 D8A4716A420 for ; Thu, 23 Feb 2006 18:59:48 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F1EC43D55 for ; Thu, 23 Feb 2006 18:59:48 +0000 (GMT) (envelope-from millert@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 k1NIxm5c014119 for ; Thu, 23 Feb 2006 18:59:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NIxmcY014116 for perforce@freebsd.org; Thu, 23 Feb 2006 18:59:48 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 18:59:48 GMT Message-Id: <200602231859.k1NIxmcY014116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92279 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 18:59:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=92279 Change 92279 by millert@millert_g4tower on 2006/02/23 18:59:05 Remove security.h in the clean pass too Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/libmac/Makefile#4 (text+ko) ==== @@ -26,12 +26,12 @@ $(DSTROOT)/usr/share/man/man3/ clean: - rm -f lib$(LIB).a $(OBJS) security.c + rm -f lib$(LIB).a $(OBJS) security.[ch] lib$(LIB).a:: $(OBJS) rm -f lib$(LIB).a $(AR) lib$(LIB).a `lorder $(OBJS) | tsort -q` $(RANLIB) lib$(LIB).a -security.c: $(MIGSOURCE)/security.defs +security.c security.h: $(MIGSOURCE)/security.defs mig $(CFLAGS) -user $@ -header security.h -server /dev/null -sheader /dev/null $(MIGSOURCE)/security.defs From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:03:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ADEF216A423 for ; Thu, 23 Feb 2006 19:03:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7BB143D53 for ; Thu, 23 Feb 2006 19:03:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8F07D46B2E for ; Thu, 23 Feb 2006 14:03:38 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8EF115693F; Thu, 23 Feb 2006 19:03:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FDFD16A424; Thu, 23 Feb 2006 19:03: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 432EA16A420 for ; Thu, 23 Feb 2006 19:03:54 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 065F643D4C for ; Thu, 23 Feb 2006 19:03:54 +0000 (GMT) (envelope-from millert@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 k1NJ3rAH014293 for ; Thu, 23 Feb 2006 19:03:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJ3rU0014290 for perforce@freebsd.org; Thu, 23 Feb 2006 19:03:53 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:03:53 GMT Message-Id: <200602231903.k1NJ3rU0014290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92280 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:03:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=92280 Change 92280 by millert@millert_g4tower on 2006/02/23 19:02:58 Fix long-standing panic. io_free() calls mac_destroy_port_label() on a potentially-uninitialized port label. To fix, be sure to always intialized a port's label after its creation by io_alloc(). The best place for this is right after the ipc_port_t is bzero()d. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#8 (text+ko) ==== @@ -336,6 +336,9 @@ ipc_port_t port = (ipc_port_t)object; bzero((char *)port, sizeof(*port)); +#ifdef MAC + mac_init_port_label(&port->ip_label); +#endif } else if (otype == IOT_PORT_SET) { ipc_pset_t pset = (ipc_pset_t)object; @@ -404,6 +407,9 @@ ipc_port_t port = (ipc_port_t)object; bzero((char *)port, sizeof(*port)); +#ifdef MAC + mac_init_port_label(&port->ip_label); +#endif } else if (otype == IOT_PORT_SET) { ipc_pset_t pset = (ipc_pset_t)object; @@ -999,7 +1005,8 @@ * User allocated label handles can never be modified. */ -struct label *io_getlabel (ipc_object_t objp) +struct label *io_getlabel( + ipc_object_t objp) { ipc_port_t port = (ipc_port_t) objp; @@ -1030,10 +1037,8 @@ #endif /* MACH_ASSERT */ #ifdef MAC - /* XXX: This was never getting called before, - and calling it now causes problems. */ - - mac_destroy_port_label (&port->ip_label); + /* Port label should have been initialized after creation. */ + mac_destroy_port_label(&port->ip_label); #endif } zfree(ipc_object_zones[otype], (vm_offset_t) object); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:14:14 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E42016A420 for ; Thu, 23 Feb 2006 19:14:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C6F843D49 for ; Thu, 23 Feb 2006 19:14:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id ADDAF46BAE for ; Thu, 23 Feb 2006 14:13:55 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D4B4B56AF7; Thu, 23 Feb 2006 19:14:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C61A716A423; Thu, 23 Feb 2006 19:14: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 6A32216A420 for ; Thu, 23 Feb 2006 19:14:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1E7B43D4C for ; Thu, 23 Feb 2006 19:14:06 +0000 (GMT) (envelope-from millert@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 k1NJE6Dj014779 for ; Thu, 23 Feb 2006 19:14:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJE6eb014776 for perforce@freebsd.org; Thu, 23 Feb 2006 19:14:06 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:14:06 GMT Message-Id: <200602231914.k1NJE6eb014776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92281 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:14:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=92281 Change 92281 by millert@millert_g4tower on 2006/02/23 19:13:15 Style fixes Add labelh_new_user() function that allocates a label handle and a normal ipc port in the specified task's address space. The specified label is inserted into the label handle and a send/receive right for the label handle's port is inserted into the task's space. The port name is passed back in the namep parameter. Unlike labelh_new() the specified task now holds the receive right for the port which means that when the task dies (or calls mach_port_destroy()), the port and label handle will be garbage collected. Use labelh_new_user() in mac_label_new(). Use labelh_new() in labelh_duplicate(). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005, 2006 SPARTA, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,105 +31,162 @@ zone_t ipc_labelh_zone; -kern_return_t mac_label_new (ipc_space_t task, mach_port_name_t *name, - vm_offset_t labelstr) +/* + * Create a new label handle in the task described by the specified space. + * The specified label is used in the label handle. The associated port + * name is copied out to namep and the task is granted send and receive rights. + */ +kern_return_t +labelh_new_user(ipc_space_t space, struct label *inl, mach_port_name_t *namep) { - ipc_labelh_t lh; - struct label inl; - ipc_port_t port, sport; - kern_return_t kr; + kern_return_t kr; + ipc_labelh_t lh; + ipc_entry_t entry; + ipc_port_t port; + + if (space == IS_NULL || space->is_task == NULL) + return (KERN_INVALID_TASK); + + /* XXX - perform entrypoint check here */ - if (task == IS_NULL) - return (KERN_INVALID_TASK); + /* + * Note: the calling task will have a receive right for the port. + * This is different from label handles that reference tasks + * where the kernel holds the receive right and the caller only + * gets a send right. + */ + kr = ipc_port_alloc(space, namep, &port); + if (kr != KERN_SUCCESS) + return (kr); + ip_reference(port); /* ipc_port_alloc() does not add a reference */ - mac_init_port_label (&inl); - if (mac_internalize_port_label (&inl, labelstr)) - return KERN_INVALID_ARGUMENT; + /* Convert right to MACH_PORT_TYPE_SEND_RECEIVE */ + port->ip_mscount++; + port->ip_srights++; + is_write_lock(space); + entry = ipc_entry_lookup(space, *namep); + if (entry != IE_NULL) + entry->ie_bits |= MACH_PORT_TYPE_SEND; + is_write_unlock(space); - port = ipc_port_alloc_kernel(); + /* Allocate new label handle, insert port and label. */ + lh = (ipc_labelh_t)zalloc(ipc_labelh_zone); + io_lock_init(lh); + lh->lh_port = port; + lh->lh_label = *inl; + lh->lh_type = 0; + lh->lh_references = 1; - lh = (ipc_labelh_t) zalloc(ipc_labelh_zone); - io_lock_init(lh); - lh->lh_port = port; - lh->lh_type = 0; - lh->lh_references = 1; - lh->lh_label = inl; - ipc_kobject_set(port, (ipc_kobject_t)lh, IKOT_LABELH); + /* Must call ipc_kobject_set() with port unlocked. */ + ip_unlock(lh->lh_port); + ipc_kobject_set(lh->lh_port, (ipc_kobject_t)lh, IKOT_LABELH); - sport = ipc_port_make_send_locked(port); - ip_release(port); - ip_unlock(port); - *name = ipc_port_copyout_send (port,task); - return 0; + return (KERN_SUCCESS); } -/* This function should be used to allocate label handles - that are stored in other kernel objects, such as tasks. - They must be released along with that object. - The caller gets one reference, which can be applied to either the - port or the ipc_label_t structure itself. -*/ -ipc_labelh_t labelh_new () +kern_return_t +mac_label_new(ipc_space_t space, mach_port_name_t *namep, vm_offset_t labelstr) { - ipc_labelh_t lh = (ipc_labelh_t) zalloc(ipc_labelh_zone); - io_lock_init(lh); - lh->lh_port = ipc_port_alloc_kernel(); - lh->lh_type = 0; - lh->lh_references = 1; - ipc_kobject_set(lh->lh_port, (ipc_kobject_t)lh, IKOT_LABELH); - ip_unlock(lh->lh_port); - return lh; + struct label inl; + kern_return_t kr; + + mac_init_port_label(&inl); + if (mac_internalize_port_label(&inl, labelstr)) + return (KERN_INVALID_ARGUMENT); + + kr = labelh_new_user(space, &inl, namep); + if (kr != KERN_SUCCESS) { + mac_destroy_port_label(&inl); + return (kr); + } + + return (KERN_SUCCESS); } -/* call with old locked; returned object is unlocked */ +/* + * This function should be used to allocate label handles + * that are stored in other kernel objects, such as tasks. + * They must be released along with that object. + * The caller gets one reference, which can be applied to either the + * port or the ipc_label_t structure itself. + */ +ipc_labelh_t +labelh_new(void) +{ + ipc_labelh_t lh; + + lh = (ipc_labelh_t)zalloc(ipc_labelh_zone); + io_lock_init(lh); + lh->lh_port = ipc_port_alloc_kernel(); + lh->lh_type = 0; + lh->lh_references = 1; + ip_unlock(lh->lh_port); + + /* Must call ipc_kobject_set() with port unlocked. */ + ipc_kobject_set(lh->lh_port, (ipc_kobject_t)lh, IKOT_LABELH); + + return (lh); +} -ipc_labelh_t labelh_duplicate (ipc_labelh_t old) +/* + * Call with old label handle locked. + * Returned label handle is unlocked. + */ +ipc_labelh_t +labelh_duplicate(ipc_labelh_t old) { - ipc_labelh_t lh = (ipc_labelh_t) zalloc(ipc_labelh_zone); - io_lock_init(lh); - lh->lh_port = ipc_port_alloc_kernel(); - lh->lh_type = 0; - lh->lh_references = 1; - ipc_kobject_set(lh->lh_port, (ipc_kobject_t)lh, IKOT_LABELH); - mac_init_port_label (&lh->lh_label); - mac_copy_port_label (&old->lh_label, &lh->lh_label); - ip_unlock(lh->lh_port); - return lh; + ipc_labelh_t lh; + + lh = labelh_new(); + ip_lock(lh->lh_port); + mac_init_port_label(&lh->lh_label); + mac_copy_port_label(&old->lh_label, &lh->lh_label); + ip_unlock(lh->lh_port); + return (lh); } -/* call with old locked; returns a locked object */ +/* + * Call with old label handle locked. + * Returned label handle is locked. + */ +ipc_labelh_t +labelh_modify(ipc_labelh_t old) +{ + ipc_labelh_t lh; -ipc_labelh_t labelh_modify (ipc_labelh_t old) -{ - if (old->lh_references == 1) - return old; - ipc_labelh_t lh = labelh_duplicate (old); - lh_release(old); - lh_check_unlock (old); - lh_lock (lh); - return lh; + if (old->lh_references == 1) + return (old); + lh = labelh_duplicate(old); + lh_release(old); + lh_check_unlock(old); + lh_lock(lh); + return (lh); } -/* add or drop a reference on a label handle; not locked */ - -ipc_labelh_t labelh_reference (ipc_labelh_t lh) +/* + * Add or drop a reference on an (unlocked) label handle. + */ +ipc_labelh_t +labelh_reference(ipc_labelh_t lh) { - lh_lock(lh); - lh_reference(lh); - lh_unlock(lh); - return lh; + lh_lock(lh); + lh_reference(lh); + lh_unlock(lh); + return (lh); } -void labelh_release(ipc_labelh_t lh) +void +labelh_release(ipc_labelh_t lh) { - lh_lock(lh); - lh_release(lh); - lh_check_unlock(lh); + lh_lock(lh); + lh_release(lh); + lh_check_unlock(lh); } -void lh_free (ipc_labelh_t lh) +void +lh_free(ipc_labelh_t lh) { - ipc_object_release(&lh->lh_port->ip_object); - mac_destroy_port_label (&lh->lh_label); - zfree(ipc_labelh_zone, (vm_offset_t)lh); + ipc_object_release(&lh->lh_port->ip_object); + mac_destroy_port_label(&lh->lh_label); + zfree(ipc_labelh_zone, (vm_offset_t)lh); } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005, 2006 SPARTA, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,16 +44,18 @@ #endif } *ipc_labelh_t; -ipc_labelh_t labelh_duplicate (ipc_labelh_t old); -ipc_labelh_t labelh_modify (ipc_labelh_t old); -void labelh_release (ipc_labelh_t lh); -ipc_labelh_t labelh_reference (ipc_labelh_t lh); -void lh_free (ipc_labelh_t lh); +ipc_labelh_t labelh_duplicate(ipc_labelh_t old); +ipc_labelh_t labelh_modify(ipc_labelh_t old); +ipc_labelh_t labelh_new(void); +kern_return_t labelh_new_user(ipc_space_t, struct label *, mach_port_name_t *); +void labelh_release(ipc_labelh_t lh); +ipc_labelh_t labelh_reference(ipc_labelh_t lh); +void lh_free(ipc_labelh_t lh); -#define lh_reference(lh) ((lh)->lh_references++) +#define lh_reference(lh) ((lh)->lh_references++) #define lh_release(lh) \ MACRO_BEGIN \ - assert ((lh)->lh_references > 0); \ + assert((lh)->lh_references > 0); \ (lh)->lh_references--; \ MACRO_END From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:18:16 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D12C16A420 for ; Thu, 23 Feb 2006 19:18:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D75F43D49 for ; Thu, 23 Feb 2006 19:18:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C0EC346B7C for ; Thu, 23 Feb 2006 14:17:57 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 783AC55C79; Thu, 23 Feb 2006 19:18:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6981616A423; Thu, 23 Feb 2006 19:18: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 2CCED16A420 for ; Thu, 23 Feb 2006 19:18:13 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1ACC43D49 for ; Thu, 23 Feb 2006 19:18:12 +0000 (GMT) (envelope-from millert@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 k1NJICFZ015000 for ; Thu, 23 Feb 2006 19:18:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJICad014997 for perforce@freebsd.org; Thu, 23 Feb 2006 19:18:12 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:18:12 GMT Message-Id: <200602231918.k1NJICad014997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92283 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:18:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92283 Change 92283 by millert@millert_g4tower on 2006/02/23 19:17:28 Use labelh_new_user() in mac_request_label(). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005, 2006 SPARTA, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -223,10 +223,8 @@ { ipc_entry_t subi, obji; ipc_object_t subp, objp; - ipc_labelh_t outlh; - ipc_port_t sport; kern_return_t kr; - struct label *objl, *subl; + struct label *objl, *subl, outl; int rc; if (space == IS_NULL || space->is_task == NULL) @@ -242,8 +240,6 @@ objp = obji->ie_object; subp = subi->ie_object; - outlh = labelh_new(); - ipc_port_multiple_lock(); /* serialize (not necessary for LH, but simpler) */ io_lock(objp); io_lock(subp); @@ -256,26 +252,31 @@ if (subl == NULL) goto errout; - mac_init_port_label(&outlh->lh_label); - rc = mac_request_object_label(subl, objl, serv, &outlh->lh_label); + mac_init_port_label(&outl); + rc = mac_request_object_label(subl, objl, serv, &outl); io_unlocklabel(subp); io_unlock(subp); io_unlocklabel(objp); io_unlock(objp); ipc_port_multiple_unlock(); - ip_lock(outlh->lh_port); - sport = ipc_port_make_send_locked(outlh->lh_port); - ip_release(outlh->lh_port); - ip_unlock(outlh->lh_port); - *outlabel = ipc_port_copyout_send(outlh->lh_port,space); + switch (rc) { + case 0: + kr = labelh_new_user(space, &outl, outlabel); + break; + case 22: + /* EINVAL */ + kr = KERN_INVALID_ARGUMENT; + break; + default: + kr = KERN_NO_ACCESS; + break; + } + + if (kr != KERN_SUCCESS) + mac_destroy_port_label(&outl); - if (rc == /*EINVAL*/ 22) - return KERN_INVALID_ARGUMENT; - else if (rc != 0) - return KERN_NO_ACCESS; - else - return 0; + return kr; errout: io_unlocklabel(subp); @@ -283,6 +284,5 @@ io_unlocklabel(objp); io_unlock(objp); ipc_port_multiple_unlock(); - labelh_release(outlh); return KERN_INVALID_ARGUMENT; } From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:19:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B77F16A420 for ; Thu, 23 Feb 2006 19:19:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40C7143D48 for ; Thu, 23 Feb 2006 19:19:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EEB3B46B7D for ; Thu, 23 Feb 2006 14:18:59 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1813C560E3; Thu, 23 Feb 2006 19:19:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 09B7216A423; Thu, 23 Feb 2006 19:19: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 C2D9116A420 for ; Thu, 23 Feb 2006 19:19:14 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F43C43D46 for ; Thu, 23 Feb 2006 19:19:14 +0000 (GMT) (envelope-from millert@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 k1NJJEaK015026 for ; Thu, 23 Feb 2006 19:19:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJJE7J015023 for perforce@freebsd.org; Thu, 23 Feb 2006 19:19:14 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:19:14 GMT Message-Id: <200602231919.k1NJJE7J015023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92284 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:19:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=92284 Change 92284 by millert@millert_g4tower on 2006/02/23 19:19:13 Convert some if() else to switch(). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#4 (text+ko) ==== @@ -87,12 +87,16 @@ rc = mac_check_service_access(&subjl, &objl, serv, perm); mac_destroy_task_label(&subjl); mac_destroy_task_label(&objl); - if (rc == /*EINVAL*/ 22) + + switch (rc) { + case 0: + return KERN_SUCCESS; + case 22: + /* EINVAL */ return KERN_INVALID_ARGUMENT; - else if (rc != 0) + default: return KERN_NO_ACCESS; - else - return 0; + } } kern_return_t @@ -143,12 +147,15 @@ io_unlock (objp); mac_destroy_task_label(&subjl); - if (rc == /*EINVAL*/ 22) + switch (rc) { + case 0: + return KERN_SUCCESS; + case 22: + /* EINVAL */ return KERN_INVALID_ARGUMENT; - else if (rc != 0) + default: return KERN_NO_ACCESS; - else - return 0; + } } kern_return_t @@ -197,12 +204,15 @@ io_unlock(objp); ipc_port_multiple_unlock(); - if (rc == /*EINVAL*/ 22) + switch (rc) { + case 0: + return KERN_SUCCESS; + case 22: + /* EINVAL */ return KERN_INVALID_ARGUMENT; - else if (rc != 0) + default: return KERN_NO_ACCESS; - else - return 0; + } errout: io_unlocklabel(subp); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:22:21 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E3F916A422 for ; Thu, 23 Feb 2006 19:22:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DBCD43D46 for ; Thu, 23 Feb 2006 19:22:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8C13C46B85 for ; Thu, 23 Feb 2006 14:22:03 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7AC3158EA8; Thu, 23 Feb 2006 19:22:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C3E916A423; Thu, 23 Feb 2006 19:22: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 1858E16A420 for ; Thu, 23 Feb 2006 19:22:19 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D166743D46 for ; Thu, 23 Feb 2006 19:22:18 +0000 (GMT) (envelope-from millert@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 k1NJMIaM015246 for ; Thu, 23 Feb 2006 19:22:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJMIXl015243 for perforce@freebsd.org; Thu, 23 Feb 2006 19:22:18 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:22:18 GMT Message-Id: <200602231922.k1NJMIXl015243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92285 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:22:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=92285 Change 92285 by millert@millert_g4tower on 2006/02/23 19:21:40 Add 2 new methods to the security server: mach_get_task_label() which gets the label handle of a task and mach_get_label() which allocates a new label handle and copies a port's label into it. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#5 (text+ko) ==== @@ -1760,6 +1760,47 @@ return kr; } +/* + * Get a label handle representing the given port's port label. + */ +kern_return_t +mach_get_label( + ipc_space_t space, + mach_port_name_t name, + mach_port_name_t *outlabel) +{ + ipc_entry_t entry; + ipc_port_t port; + struct label outl; + kern_return_t kr; + + if (!MACH_PORT_VALID(name)) + return KERN_INVALID_NAME; + + /* Lookup the port name in the task's space. */ + kr = ipc_right_lookup_write(space, name, &entry); + if (kr != KERN_SUCCESS) + return kr; + + /* Make sure we are not dealing with a label handle. */ + port = (ipc_port_t) entry->ie_object; + ip_lock(port); + is_write_unlock(space); + if (ip_kotype(port) == IKOT_LABELH) { + /* already is a label handle! */ + ip_unlock(port); + return KERN_INVALID_ARGUMENT; + } + + /* Copy the port label and stash it in a new label handle. */ + mac_init_port_label(&outl); + mac_copy_port_label(&port->ip_label, &outl); + kr = labelh_new_user(space, &outl, outlabel); + ip_unlock(port); + + return KERN_SUCCESS; +} + /* also works on label handles */ kern_return_t ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#5 (text+ko) ==== @@ -31,6 +31,32 @@ #include kern_return_t +mach_get_task_label( + task_t t, + mach_port_name_t *outlabel) +{ + ipc_labelh_t lh = t->label; + ipc_space_t space = t->itk_space; + kern_return_t kr; + + ip_lock(lh->lh_port); + lh->lh_port->ip_mscount++; + lh->lh_port->ip_srights++; + ip_reference(lh->lh_port); + ip_unlock(lh->lh_port); + kr = ipc_object_copyout(space, lh->lh_port, + MACH_MSG_TYPE_PORT_SEND, 0, outlabel); + if (kr != KERN_SUCCESS) { + ip_lock(lh->lh_port); + ip_release(lh->lh_port); + ip_check_unlock(lh->lh_port); + *outlabel = MACH_PORT_NULL; + } + + return (KERN_SUCCESS); +} + +kern_return_t mach_get_task_label_text( task_t t, labelstr_t policies, ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#6 (text+ko) ==== @@ -13,6 +13,20 @@ type labelstr_t = c_string[*:512]; /** + @brief Retrieve a task label as a label handle + @param task Target's task port + @param label Returned label handle + + This call retrieves a label handle label for the + specified task, with respect to the specified policies. + + @return Standard MiG return values (0 for success) +*/ + +routine mach_get_task_label(task : task_t; + out label : mach_port_name_t); + +/** @brief Retrieve a task label in textual form @param task Target's task port @param policies Comma-delimited list of policies to query @@ -29,6 +43,26 @@ out label : labelstr_t); /** + @brief Retrieve a port label as a label handle + @param task Issuer's task port + @param port Port to query label from + @param label Returned label handle + + This call retrieves a label handle label for the + specified task, with respect to the specified policies. + + This call retrieves a label handle for the specified port, with + respect to the specified policies. If the port represents a label + handle, KERN_INVALID_ARGUMENT is returned. + + @return Standard MiG return values (0 for success) +*/ + +routine mach_get_label(task : ipc_space_t; + port : mach_port_name_t; + out label : mach_port_name_t); + +/** @brief Retrieve a port label in textual form @param task Issuer's task port @param name Port to query label from From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:23:22 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A61516A420 for ; Thu, 23 Feb 2006 19:23:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2286143D46 for ; Thu, 23 Feb 2006 19:23:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3655E46BF1 for ; Thu, 23 Feb 2006 14:23:05 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2E24057ABD; Thu, 23 Feb 2006 19:23:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FB2C16A423; Thu, 23 Feb 2006 19:23: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 D8A1416A420 for ; Thu, 23 Feb 2006 19:23:20 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F5DA43D46 for ; Thu, 23 Feb 2006 19:23:20 +0000 (GMT) (envelope-from millert@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 k1NJNKs9015294 for ; Thu, 23 Feb 2006 19:23:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJNK7R015291 for perforce@freebsd.org; Thu, 23 Feb 2006 19:23:20 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:23:20 GMT Message-Id: <200602231923.k1NJNK7R015291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92286 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:23:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=92286 Change 92286 by millert@millert_g4tower on 2006/02/23 19:22:55 Simple label handle exerciser. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/examples/labelh/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/examples/labelh/labelh_test.c#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:34:45 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA97716A420 for ; Thu, 23 Feb 2006 19:34:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18A2143D45 for ; Thu, 23 Feb 2006 19:34:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9A45846BD6 for ; Thu, 23 Feb 2006 14:34:27 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5EC6256E33; Thu, 23 Feb 2006 19:33:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 503FA16A423; Thu, 23 Feb 2006 19:33: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 F376516A420 for ; Thu, 23 Feb 2006 19:33:34 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEAFB43D5E for ; Thu, 23 Feb 2006 19:33:33 +0000 (GMT) (envelope-from millert@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 k1NJXXA9015798 for ; Thu, 23 Feb 2006 19:33:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJXXJx015792 for perforce@freebsd.org; Thu, 23 Feb 2006 19:33:33 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:33:33 GMT Message-Id: <200602231933.k1NJXXJx015792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92288 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:34:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=92288 Change 92288 by millert@millert_g4tower on 2006/02/23 19:33:16 Update errata list Affected files ... .. //depot/projects/trustedbsd/sedarwin7/ERRATA#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/ERRATA#3 (text+ko) ==== @@ -1,8 +1,8 @@ -Port of TrustedBSD MAC Framework to Darwin 10.3.3 +Port of TrustedBSD MAC Framework to Darwin 10.3.8 -McAfee Research -15204 Omega Drive, Suite 300 -Rockville, MD 20850 +SPARTA, Inc. +7075 Samuel Morse Drive +Columbia, MD 21046-3401 The following known issues are present in this release: @@ -28,15 +28,24 @@ provides /dev/fd entries on darwin instead of implementing this within devfs. - 66: Panic with a zalloc: the ipctrace seems to be leaking memory with - port labels and the system will panic after a running for a while. - 76: If a filesystem makes symbolic links from a partition that is using extended attributes into a file system that is not using extended attributes, the system will eventually deadlock. + 89: SEDarwin policy rejecting access to /dev/null when it should + not. Is the general_file_write_access macro not being applied + to users? + 91: Users who create and attach new disk images cannot then access them. + 93: After reboot, the first time a user logs in, after entering correct + user name and password an alert pops up that says: + You cannot continue logging in at this time. There is a + problem that prevents you from logging in at this time. + Please contact your system administrator for help. + After clicking OK the MAC login plug-in box comes up and the + user may login normally. + 98: HFS+ ignores mac_associate_vnode_extattr() failure. HFS+ currently ignores failures in mac_associate_vnode_extattr(), so a failure to load critical extended attributes by a policy might @@ -72,7 +81,16 @@ VOP_IOCTL vector. A MAC Framework access control check needs to be inserted here. -147: Panic with a bad v_usecount for a vnode during vnreclaim(). This - occurs under a heavy load of combined auditing and file - operations. The stack trace always reflects a problem in the - lstat() system call. It's possible that this is a vendor defect. +238: Currently the port label of a label handle is unused. This + could (and probably should) be used to implement access control + (label visibility). The port label would start out with the + same value as the object label but we should provide methods + to get/set this label. Security server methods that return a + label handle or text label can use the port label for access + control. + +239: The SLOT() macro may return NULL in the SEDarwin policy. This + causes a panic in sebsd_externalize_cred_label() when the port + that holds the label has already been destroyed. There appears + to be a missing lock or out of order operation since we should + not be trying to externalized a dead port. From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:36:00 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDC6516A422 for ; Thu, 23 Feb 2006 19:36:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDFC743D7D for ; Thu, 23 Feb 2006 19:35:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9A85C46BF1 for ; Thu, 23 Feb 2006 14:35:29 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 78CAF64165; Thu, 23 Feb 2006 19:35:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A20216A423; Thu, 23 Feb 2006 19:35: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 1563C16A422 for ; Thu, 23 Feb 2006 19:35:43 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D15143D79 for ; Thu, 23 Feb 2006 19:35:36 +0000 (GMT) (envelope-from millert@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 k1NJZa1V015957 for ; Thu, 23 Feb 2006 19:35:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJZaH4015954 for perforce@freebsd.org; Thu, 23 Feb 2006 19:35:36 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:35:36 GMT Message-Id: <200602231935.k1NJZaH4015954@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92289 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:36:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=92289 Change 92289 by millert@millert_g4tower on 2006/02/23 19:34:48 Don't overwrite /etc/xinetd.d/ssh Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/OpenSSH/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/OpenSSH/Makefile#4 (text+ko) ==== @@ -62,8 +62,8 @@ $(_v) rmdir $(DSTROOT)/etc install-startup-item: - $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/private/etc/xinetd.d - $(_v) $(INSTALL_FILE) -c ssh-via-xinetd $(DSTROOT)/private/etc/xinetd.d/ssh + #$(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/private/etc/xinetd.d + #$(_v) $(INSTALL_FILE) -c ssh-via-xinetd $(DSTROOT)/private/etc/xinetd.d/ssh $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/usr/libexec $(_v) $(INSTALL_FILE) -m 555 -c sshd-keygen-wrapper $(DSTROOT)/usr/libexec/sshd-keygen-wrapper From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:41:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E291016A422 for ; Thu, 23 Feb 2006 19:41:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F7E643D4C for ; Thu, 23 Feb 2006 19:41:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 15B0146BF1 for ; Thu, 23 Feb 2006 14:41:31 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 276AA5577E; Thu, 23 Feb 2006 19:41:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 18D0E16A423; Thu, 23 Feb 2006 19:41:46 +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 B641416A420 for ; Thu, 23 Feb 2006 19:41:45 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F98143D4C for ; Thu, 23 Feb 2006 19:41:45 +0000 (GMT) (envelope-from millert@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 k1NJfjtZ016237 for ; Thu, 23 Feb 2006 19:41:45 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJfjFc016234 for perforce@freebsd.org; Thu, 23 Feb 2006 19:41:45 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:41:45 GMT Message-Id: <200602231941.k1NJfjFc016234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92291 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:41:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=92291 Change 92291 by millert@millert_g4tower on 2006/02/23 19:41:12 Remove the VOP_READDIRATTR() workaround and just disable VOP_READDIRATTR() support in HFS altogether. Instantiating all the vnodes for a directory negates any performance gain VOP_READDIRATTR() gives us so we are better off without it. Obtained from DSEP. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/hfs/hfs_attrlist.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/hfs/hfs_attrlist.c#3 (text+ko) ==== @@ -20,7 +20,7 @@ * @APPLE_LICENSE_HEADER_END@ */ /* - * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce * support for mandatory and extensible security protections. This notice * is included in support of clause 2.2 (b) of the Apple Public License, * Version 2.0. @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -662,7 +661,6 @@ struct cat_desc prevdesc; char * prevnamebuf = NULL; struct cat_entrylist *ce_list = NULL; - int no_vnode_count = 0; dir_entries = dcp->c_entries; if (dcp->c_attr.ca_fileid == kHFSRootFolderID && hfsmp->jnl) { @@ -671,6 +669,11 @@ *(ap->a_actualcount) = 0; *(ap->a_eofflag) = 0; + +#ifdef MAC + printf("WARNING: hfs_vnop_readdirattr is not supported with a MAC-enabled kernel\n"); + return (ENOTSUP); +#endif if (ap->a_cookies != NULL) { printf("readdirattr: no cookies!\n"); @@ -771,8 +774,6 @@ struct cat_attr * cattrp; struct cat_fork c_datafork = {0}; struct cat_fork c_rsrcfork = {0}; - struct cat_attr cattrtmp; - int mperm; cdescp = &ce_list->entry[i].ce_desc; cattrp = &ce_list->entry[i].ce_attr; @@ -783,34 +784,8 @@ /* * Get in memory cnode data (if any). */ - mperm = 0; -#ifdef MAC - /*- - * Normally, HFS+ will not generate catalog entries - * when performing VOP_READDIRATTR() so as to avoid - * the overhead. However, we perform MAC checks - * using vnode labels, so we must force vnodes to be - * instantiated. - * - * XXXMAC: We should probably generate an assertion - * failure if we're unable to instantiate a vnode - * for an entry. - */ - if (1) { - error = hfs_getcnode(hfsmp, cattrp->ca_fileid, NULL, 0, NULL, NULL, &vp); - if (error) { - printf("hfs_readdirattr(): warning got %d\n", error); - cp = hfs_chashget(dcp->c_dev, cattrp->ca_fileid, 0, &vp, &rvp); - } else { - mperm = mac_check_vnode_stat(current_proc()->p_ucred, ap->a_cred, vp); - - cp = vp->v_data; - rvp = NULL; - } -#else if (!(ap->a_options & FSOPT_NOINMEMUPDATE)) { cp = hfs_chashget(dcp->c_dev, cattrp->ca_fileid, 0, &vp, &rvp); -#endif if (cp != NULL) { /* Only use cnode's decriptor for non-hardlinks */ if (!(cp->c_flag & C_HARDLINK)) @@ -826,27 +801,6 @@ } } } - /*- - * XXXMAC: In order to return the right number of - * entries in the catalog buffer, we fill in a - * dummy entry in the stack for files that the - * caller is not allowed to retrieve attributes for. - * If we don't return the right number of entries, - * applications (such as Finder) behave badly. - * - * XXXMAC: We leave all fields zero'd except the - * minimum necessary to make Finder behave - * correctly, which includes the fileid, mode, - * and a link count. - */ - if (mperm) { - bzero (&cattrtmp, sizeof (struct cat_attr)); - cattrtmp.ca_fileid = cattrp->ca_fileid; - cattrtmp.ca_mode = cattrp->ca_mode & ~07777; - cattrtmp.ca_nlink = 1; - cattrp = &cattrtmp; - } - *((u_long *)attrptr)++ = 0; /* move it past length */ attrblk.ab_attrlist = alist; attrblk.ab_attrbufpp = &attrptr; @@ -860,8 +814,6 @@ currattrbufsize = ((char *)varptr - (char *)attrbufptr); /* All done with cnode. */ - if (vp == NULL && rvp == NULL) - no_vnode_count++; if (vp) { vput(vp); vp = NULL; @@ -943,9 +895,6 @@ if (prevnamebuf) FREE(prevnamebuf, M_TEMP); - if (no_vnode_count != 0) - printf("hfs_readdirattr: no_vnode_count of %d\n", no_vnode_count); - return (error); } @@ -1074,36 +1023,6 @@ } /* - * XXXMAC: Utility function to determine what access rights the subject - * has to a vnode, as expressed in UNIX file access permissions. Test - * each of read, write, and execute using discretionary and mandatatory - * checks. Note that this function reveals information about access - * protections that stat() is normally not permitted to reveal about a - * file if the access check for stat() fails. We may need to revisit - * this if there is a requirement for hiding protection information for - * objects that can be named but not inspected. - */ -#ifdef MAC -static int -access_all(struct vnode *vp, struct proc *p) -{ - int r; - - r = 0; - if (VOP_ACCESS(vp, VREAD, p->p_ucred, p) == 0 && - mac_check_vnode_access(p->p_ucred, vp, VREAD) == 0) - r |= R_OK; - if (VOP_ACCESS(vp, VWRITE, p->p_ucred, p) == 0 && - mac_check_vnode_access(p->p_ucred, vp, VWRITE) == 0) - r |= W_OK; - if (VOP_ACCESS (vp, VEXEC, p->p_ucred, p) == 0 && - mac_check_vnode_access(p->p_ucred, vp, VEXEC) == 0) - r |= X_OK; - return r; -} -#endif - -/* * Pack common volume attributes. */ static void @@ -1229,17 +1148,8 @@ } if (ATTR_CMN_USERACCESS & attr) { *((u_long *)attrbufptr)++ = -#ifdef MAC - /* - * If we could retrieve a vnode, calculate the permission - * summary based on DAC and MAC checks. - * XXXMAC: Need to handle (vp == NULL) better here, - * probably via an assertion failure. - */ - vp != NULL ? access_all(vp, current_proc()) : -#endif - DerivePermissionSummary(cp->c_uid, cp->c_gid, cp->c_mode, - VTOVFS(vp), current_proc()->p_ucred, current_proc()); + DerivePermissionSummary(cp->c_uid, cp->c_gid, cp->c_mode, + VTOVFS(vp), current_proc()->p_ucred, current_proc()); } *abp->ab_attrbufpp = attrbufptr; @@ -1388,7 +1298,13 @@ VOL_CAP_INT_SEARCHFS | VOL_CAP_INT_ATTRLIST | VOL_CAP_INT_NFSEXPORT | +/* + * We will not support this operation due to complexity and the + * run-time costs of accessing vnode labels. + */ +#ifndef MAC VOL_CAP_INT_READDIRATTR | +#endif VOL_CAP_INT_EXCHANGEDATA | VOL_CAP_INT_ALLOCATE | VOL_CAP_INT_VOL_RENAME | @@ -1413,7 +1329,13 @@ VOL_CAP_INT_SEARCHFS | VOL_CAP_INT_ATTRLIST | VOL_CAP_INT_NFSEXPORT | +/* + * We will not support this operation due to complexity and the + * run-time costs of accessing vnode labels. + */ +#ifndef MAC VOL_CAP_INT_READDIRATTR | +#endif VOL_CAP_INT_EXCHANGEDATA | VOL_CAP_INT_COPYFILE | VOL_CAP_INT_ALLOCATE | @@ -1577,18 +1499,9 @@ } if (ATTR_CMN_USERACCESS & attr) { *((u_long *)attrbufptr)++ = -#ifdef MAC - /* - * If we could retrieve a vnode, calculate the permission - * summary based on DAC and MAC checks. - * XXXMAC: Need to handle (vp == NULL) better here, - * probably via an assertion failure. - */ - vp != NULL ? access_all(vp, current_proc()) : -#endif - DerivePermissionSummary(cap->ca_uid, cap->ca_gid, - cap->ca_mode, mp, current_proc()->p_ucred, - current_proc()); + DerivePermissionSummary(cap->ca_uid, cap->ca_gid, + cap->ca_mode, mp, current_proc()->p_ucred, + current_proc()); } *abp->ab_attrbufpp = attrbufptr; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:43:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09B4516A420 for ; Thu, 23 Feb 2006 19:43:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76FBC43D49 for ; Thu, 23 Feb 2006 19:43:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5A40A46BEA for ; Thu, 23 Feb 2006 14:43:34 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5650255592; Thu, 23 Feb 2006 19:43:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4120A16A424; Thu, 23 Feb 2006 19:43:49 +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 E0F5F16A420 for ; Thu, 23 Feb 2006 19:43:48 +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 6828D43D46 for ; Thu, 23 Feb 2006 19:43:48 +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 k1NJhmAA016393 for ; Thu, 23 Feb 2006 19:43:48 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 k1NJhmwg016390 for perforce@freebsd.org; Thu, 23 Feb 2006 19:43:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 23 Feb 2006 19:43:48 GMT Message-Id: <200602231943.k1NJhmwg016390@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 92292 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:43:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92292 Change 92292 by rwatson@rwatson_fledge on 2006/02/23 19:43:01 Add trustedbsd-audit mailing list references on the two audit-related web pages. Affected files ... .. //depot/projects/trustedbsd/www/audit.page#2 edit .. //depot/projects/trustedbsd/www/openbsm.page#5 edit Differences ... ==== //depot/projects/trustedbsd/www/audit.page#2 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/audit.page#1 $ + $P4: //depot/projects/trustedbsd/www/audit.page#2 $ @@ -71,6 +71,10 @@ Apple's Mac OS X, Solaris, and Linux, and permits the writing of portable audit-related applications.

    +

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

    +

    The TrustedBSD Project greatfully acknowledges Apple Computer, Inc., for its generous donation of the Darwin audit implementation under a BSD license.

    ==== //depot/projects/trustedbsd/www/openbsm.page#5 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#4 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#5 $ @@ -71,6 +71,10 @@ as integration of audit into the FreeBSD CVS tree is largely complete.

    +

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

    +

    OpenBSM is derived from the BSM audit implementation found in Apple's open source Darwin operating system, generously released by Apple under a BSD license. The Darwin BSM implementation was From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:44:00 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2291E16A420 for ; Thu, 23 Feb 2006 19:44:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96F0943D46 for ; Thu, 23 Feb 2006 19:43:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id AFD0A46BFE for ; Thu, 23 Feb 2006 14:43:42 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id F256458BFC; Thu, 23 Feb 2006 19:43:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A72EE16A427; Thu, 23 Feb 2006 19:43:49 +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 260DD16A422 for ; Thu, 23 Feb 2006 19:43:49 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B713243D4C for ; Thu, 23 Feb 2006 19:43:48 +0000 (GMT) (envelope-from millert@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 k1NJhmjt016399 for ; Thu, 23 Feb 2006 19:43:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJhm5m016396 for perforce@freebsd.org; Thu, 23 Feb 2006 19:43:48 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 19:43:48 GMT Message-Id: <200602231943.k1NJhm5m016396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92293 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:44:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=92293 Change 92293 by millert@millert_g4tower on 2006/02/23 19:43:34 Revert to vendor source. MACH_PORT_TYPE_LABELH and MACH_PORT_RIGHT_LABELH are relics of the old label handle implementation. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/port.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/port.h#3 (text+ko) ==== @@ -48,12 +48,6 @@ * the rights to redistribute these changes. */ /* - * NOTICE: This file was modified by McAfee Research in 2004 to introduce - * support for mandatory and extensible security protections. This notice - * is included in support of clause 2.2 (b) of the Apple Public License, - * Version 2.0. - */ -/* */ /* * File: mach/port.h @@ -198,8 +192,7 @@ #define MACH_PORT_RIGHT_SEND_ONCE ((mach_port_right_t) 2) #define MACH_PORT_RIGHT_PORT_SET ((mach_port_right_t) 3) #define MACH_PORT_RIGHT_DEAD_NAME ((mach_port_right_t) 4) -#define MACH_PORT_RIGHT_LABELH ((mach_port_right_t) 5) -#define MACH_PORT_RIGHT_NUMBER ((mach_port_right_t) 6) +#define MACH_PORT_RIGHT_NUMBER ((mach_port_right_t) 5) typedef natural_t mach_port_type_t; typedef mach_port_type_t *mach_port_type_array_t; @@ -213,7 +206,6 @@ #define MACH_PORT_TYPE_SEND_ONCE MACH_PORT_TYPE(MACH_PORT_RIGHT_SEND_ONCE) #define MACH_PORT_TYPE_PORT_SET MACH_PORT_TYPE(MACH_PORT_RIGHT_PORT_SET) #define MACH_PORT_TYPE_DEAD_NAME MACH_PORT_TYPE(MACH_PORT_RIGHT_DEAD_NAME) -#define MACH_PORT_TYPE_LABELH MACH_PORT_TYPE(MACH_PORT_RIGHT_LABELH) /* Convenient combinations. */ From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 19:49:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA17316A420 for ; Thu, 23 Feb 2006 19:49:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 152A143D45 for ; Thu, 23 Feb 2006 19:49:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1CF2A46B9D for ; Thu, 23 Feb 2006 14:49:42 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2059C55AEE; Thu, 23 Feb 2006 19:49:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 117BA16A423; Thu, 23 Feb 2006 19:49: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 C821816A420 for ; Thu, 23 Feb 2006 19:49:56 +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 8EF4D43D45 for ; Thu, 23 Feb 2006 19:49: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 k1NJnuTM016640 for ; Thu, 23 Feb 2006 19:49: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 k1NJnuAW016637 for perforce@freebsd.org; Thu, 23 Feb 2006 19:49:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 23 Feb 2006 19:49:56 GMT Message-Id: <200602231949.k1NJnuAW016637@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 92294 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 19:49:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=92294 Change 92294 by rwatson@rwatson_fledge on 2006/02/23 19:49:07 Mention OpenBSM release on news page. Affected files ... .. //depot/projects/trustedbsd/www/news.page#5 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#5 (text+ko) ==== @@ -35,7 +35,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#4 $ + $P4: //depot/projects/trustedbsd/www/news.page#5 $ @@ -47,6 +47,14 @@ Project.

    +
    February 23, 2006 OpenBSM 1.0 alpha 4 release
    + +

    Robert Watson announces the availability of the OpenBSM 1.0 + alpha 4 release on the OpenBSM web + page. This is the OpenBSM version currently integrated into the + FreeBSD 7.x audit implementation, and is being made available as + a tarball to make it more accessable to non-FreeBSD users.

    +
    February 7, 2006 TrustedBSD mailing lists moving to FreeBSD mailman server
    From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 20:10:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E4B116A4C4 for ; Thu, 23 Feb 2006 20:10:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C324443D45 for ; Thu, 23 Feb 2006 20:10:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D544B46C09 for ; Thu, 23 Feb 2006 15:10:06 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C8CEB559C6; Thu, 23 Feb 2006 20:10:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B916C16A424; Thu, 23 Feb 2006 20:10:22 +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 636EF16A420 for ; Thu, 23 Feb 2006 20:10:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1930243D45 for ; Thu, 23 Feb 2006 20:10:22 +0000 (GMT) (envelope-from millert@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 k1NKAMbZ017490 for ; Thu, 23 Feb 2006 20:10:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NKALJQ017487 for perforce@freebsd.org; Thu, 23 Feb 2006 20:10:21 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 20:10:21 GMT Message-Id: <200602232010.k1NKALJQ017487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92296 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 20:10:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=92296 Change 92296 by millert@millert_g4tower on 2006/02/23 20:09:32 Rename sebsd_loadpolicy -> loadpolicy Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.8#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.c#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/sebsd_loadpolicy.8#4 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/sebsd_loadpolicy.c#4 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 20:10:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A560B16A420 for ; Thu, 23 Feb 2006 20:10:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23AEA43D45 for ; Thu, 23 Feb 2006 20:10:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 396DA46C0E for ; Thu, 23 Feb 2006 15:10:08 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E5D9B5788C; Thu, 23 Feb 2006 20:10:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 09ED816A426; Thu, 23 Feb 2006 20:10: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 9E44C16A422 for ; Thu, 23 Feb 2006 20:10:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 675B543D45 for ; Thu, 23 Feb 2006 20:10:22 +0000 (GMT) (envelope-from millert@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 k1NKAMVO017496 for ; Thu, 23 Feb 2006 20:10:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NKAMDP017493 for perforce@freebsd.org; Thu, 23 Feb 2006 20:10:22 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 20:10:22 GMT Message-Id: <200602232010.k1NKAMDP017493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92297 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 20:10:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=92297 Change 92297 by millert@millert_g4tower on 2006/02/23 20:10:02 Update for loadpolicy name change. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.8#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/Makefile#5 (text+ko) ==== @@ -1,9 +1,9 @@ include ../../../Makeconfig -PROG= sebsd_loadpolicy -MAN8= sebsd_loadpolicy.8 +PROG= loadpolicy +MAN8= loadpolicy.8 -OBJS= sebsd_loadpolicy.o +OBJS= loadpolicy.o CFLAGS+= -Wall -I$(SOURCE_ROOT)/sedarwin ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.8#2 (text+ko) ==== @@ -31,19 +31,19 @@ .\" .\" $FreeBSD: $ .Dd December 28, 2005 -.Dt SEBSD_LOADPOLICY 8 +.Dt LOADPOLICY 8 .Os .Sh NAME -.Nm sebsd_loadpolicy -.Nd Re-load the sebsd policy +.Nm loadpolicy +.Nd Re-load the SEDarwin policy .Sh SYNOPSIS -.Nm sebsd_loadpolicy +.Nm loadpolicy .Op Fl m Ar migscsfile .Ar policy_file .Sh DESCRIPTION The -.Nm sebsd_loadpolicy -utility loads a new security policy for the SEBSD module. +.Nm loadpolicy +utility loads a new security policy for the SEDarwin module. The new policy file is specified in .Ar policy_file . .Pp ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.c#2 (text+ko) ==== @@ -71,8 +71,6 @@ void usage(void) { - extern char *__progname; - - fprintf(stderr, "usage: %s [-m migscs_file] policy_file\n", __progname); + fprintf(stderr, "usage: loadpolicy [-m migscs_file] policy_file\n"); exit(1); } From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 20:11:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F87516A420 for ; Thu, 23 Feb 2006 20:11:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4D0C43D45 for ; Thu, 23 Feb 2006 20:11:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 667D046C09 for ; Thu, 23 Feb 2006 15:11:09 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B89E1562E8; Thu, 23 Feb 2006 20:11:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A9F8B16A423; Thu, 23 Feb 2006 20:11: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 6F6CC16A420 for ; Thu, 23 Feb 2006 20:11:24 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25DC743D46 for ; Thu, 23 Feb 2006 20:11:24 +0000 (GMT) (envelope-from millert@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 k1NKBOro017527 for ; Thu, 23 Feb 2006 20:11:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NKBNMD017524 for perforce@freebsd.org; Thu, 23 Feb 2006 20:11:23 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 20:11:23 GMT Message-Id: <200602232011.k1NKBNMD017524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92298 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 20:11:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=92298 Change 92298 by millert@millert_g4tower on 2006/02/23 20:11:06 Rename sebsd_newrole -> newrole Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.1#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.c#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/sebsd_newrole.1#4 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/sebsd_newrole.c#3 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 20:12:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22E1116A420 for ; Thu, 23 Feb 2006 20:12:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92DED43D45 for ; Thu, 23 Feb 2006 20:12:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7970046C06 for ; Thu, 23 Feb 2006 15:12:10 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8488356364; Thu, 23 Feb 2006 20:12:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7661516A423; Thu, 23 Feb 2006 20:12: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 38F9F16A420 for ; Thu, 23 Feb 2006 20:12:26 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD05343D45 for ; Thu, 23 Feb 2006 20:12:25 +0000 (GMT) (envelope-from millert@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 k1NKCPpC017670 for ; Thu, 23 Feb 2006 20:12:25 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NKCPAv017667 for perforce@freebsd.org; Thu, 23 Feb 2006 20:12:25 GMT (envelope-from millert@freebsd.org) Date: Thu, 23 Feb 2006 20:12:25 GMT Message-Id: <200602232012.k1NKCPAv017667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92299 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 20:12:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92299 Change 92299 by millert@millert_g4tower on 2006/02/23 20:11:32 Update to reflect newrole name change. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.1#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/Makefile#4 (text+ko) ==== @@ -1,9 +1,9 @@ include ../../../Makeconfig -PROG= sebsd_newrole -MAN1= sebsd_newrole.1 +PROG= newrole +MAN1= newrole.1 -OBJS= sebsd_newrole.o +OBJS= newrole.o CFLAGS+= $(DARWIN_HDRS) CFLAGS+= -I$(SOURCE_ROOT)/sedarwin ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.1#2 (text+ko) ==== @@ -30,18 +30,18 @@ .\" .\" $FreeBSD: $ .Dd August 27, 2003 -.Dt SEBSD_NEWROLE 1 +.Dt NEWROLE 1 .Os .Sh NAME -.Nm sebsd_newrole +.Nm newrole .Nd run a shell with a new role .Sh SYNOPSIS -.Nm sebsd_newrole +.Nm newrole .Ar ... .Sh DESCRIPTION The -.Nm sebsd_newrole +.Nm newrole utility runs a new shell in a new security context. The new context is derived from the old context in which -.Ar sebsd_newrole +.Ar newrole is originally executed. ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #include #include -#define SEBSD_SERVICE_NAME "sebsd_newrole" +#define SERVICE_NAME "newrole" extern char **environ; @@ -68,7 +68,7 @@ NULL }; - error = pam_start(SEBSD_SERVICE_NAME, pw->pw_name, &pam_conversation, + error = pam_start(SERVICE_NAME, pw->pw_name, &pam_conversation, &pam_handle); if (error != PAM_SUCCESS) { fprintf(stderr, "Error, failed to initialize PAM\n"); @@ -102,8 +102,8 @@ mac_t execlabel; if (!sebsd_enabled()) { - fprintf(stderr, "Sorry, sebsd_newrole may only be used when " - "the SEBSD security module is loaded\n"); + fprintf(stderr, "Sorry, newrole may only be used when " + "the SEDarwin security module is loaded\n"); exit(1); } @@ -231,6 +231,6 @@ usage(void) { - fprintf(stderr, "usage: sebsd_newrole -r role [ -t type ] [ args ]\n"); + fprintf(stderr, "usage: newrole -r role [ -t type ] [ args ]\n"); exit(1); } From owner-trustedbsd-cvs@FreeBSD.ORG Thu Feb 23 22:20:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3652716A420 for ; Thu, 23 Feb 2006 22:20:48 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA45543D46 for ; Thu, 23 Feb 2006 22:20:47 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id F383746B14 for ; Thu, 23 Feb 2006 17:20:30 -0500 (EST) Date: Thu, 23 Feb 2006 22:24:43 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: trustedbsd-cvs@TrustedBSD.org Message-ID: <20060223222413.L33959@fledge.watson.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Subject: TrustedBSD mailing list server update X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2006 22:20:48 -0000 Per earlier e-mail, the TrustedBSD Project is now using the FreeBSD Project's mailman server to host its mailing lists, which provides a web interface for subscription management, archives, etc. As of now, to manage your mailing list subscription for this mailing list, view mailing list archives, etc, you should go to the following URL: http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs Robert N M Watson From owner-trustedbsd-cvs@FreeBSD.ORG Fri Feb 24 22:41:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A6C316A422 for ; Fri, 24 Feb 2006 22:41:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B0F443D4C for ; Fri, 24 Feb 2006 22:41:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B4CE746B4C for ; Fri, 24 Feb 2006 17:41:25 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BDAADD01B8; Fri, 24 Feb 2006 22:33:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2982516A42B; Fri, 24 Feb 2006 22:33:46 +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 DE1EC16A426 for ; Fri, 24 Feb 2006 22:33:45 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9128643D45 for ; Fri, 24 Feb 2006 22:33:45 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1OMXjid034402 for ; Fri, 24 Feb 2006 22:33:45 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OMXjX8034399 for perforce@freebsd.org; Fri, 24 Feb 2006 22:33:45 GMT (envelope-from millert@freebsd.org) Date: Fri, 24 Feb 2006 22:33:45 GMT Message-Id: <200602242233.k1OMXjX8034399@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92358 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Feb 2006 22:41:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92358 Change 92358 by millert@millert_g4tower on 2006/02/24 22:32:55 Revert debugging code from last change here that was unintentionally submitted. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#33 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#33 (text+ko) ==== @@ -116,8 +116,6 @@ int sebsd_verbose = 0; -static struct label *last_dead_cred_label, *last_dead_task_label, *last_dead_port_label; // XXX - testing - static int slot = 1; /* TBD, dynamic */ #define SLOT(l) ((void *)LABEL_TO_SLOT((l), slot).l_ptr) @@ -485,24 +483,6 @@ static void sebsd_destroy_cred_label(struct label *label) { - // printk("sebsd_destroy_cred_label(%p)\n", &LABEL_TO_SLOT((label), slot)); - last_dead_cred_label = label; - sebsd_free (SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_destroy_task_label(struct label *label) -{ - last_dead_task_label = label; - sebsd_free (SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_destroy_port_label(struct label *label) -{ - last_dead_port_label = label; sebsd_free (SLOT(label)); SLOT(label) = NULL; } @@ -2363,13 +2343,7 @@ { struct task_security_struct *task; - /* XXX - SLOT should not return NULL but there is a signal race */ - /* XXX - this may be fixed... */ - if ((task = SLOT(label)) == NULL) { - printk("sebsd_externalize_cred_label: SLOT returned NULL!\n"); - printk("label: %p, last_task: %p, last_cred: %p, last_port: %p\n", label, last_dead_task_label, last_dead_cred_label, last_dead_port_label); // XXX - return (ESRCH); - } + task = SLOT(label); return (sebsd_externalize_sid(task->sid, element_name, sb)); } @@ -2665,8 +2639,8 @@ .mpo_destroy = sebsd_destroy, .mpo_destroy_cred_label = sebsd_destroy_cred_label, - .mpo_destroy_task_label = sebsd_destroy_task_label, - .mpo_destroy_port_label = sebsd_destroy_port_label, + .mpo_destroy_task_label = sebsd_destroy_cred_label, + .mpo_destroy_port_label = sebsd_destroy_cred_label, .mpo_destroy_vnode_label = sebsd_destroy_vnode_label, .mpo_destroy_devfsdirent_label = sebsd_destroy_vnode_label, From owner-trustedbsd-cvs@FreeBSD.ORG Sat Feb 25 00:09:41 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CBB516A426 for ; Sat, 25 Feb 2006 00:09:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBACB43D45 for ; Sat, 25 Feb 2006 00:09:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5047846B9D for ; Fri, 24 Feb 2006 19:09:23 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6BE63554E1; Sat, 25 Feb 2006 00:09:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A35C16A423; Sat, 25 Feb 2006 00:09:38 +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 E82D716A420 for ; Sat, 25 Feb 2006 00:09: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 94B6943D45 for ; Sat, 25 Feb 2006 00:09:37 +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 k1P09bPr041460 for ; Sat, 25 Feb 2006 00:09:37 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 k1P09b8f041457 for perforce@freebsd.org; Sat, 25 Feb 2006 00:09:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 25 Feb 2006 00:09:37 GMT Message-Id: <200602250009.k1P09b8f041457@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 92364 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Feb 2006 00:09:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=92364 Change 92364 by rwatson@rwatson_peppercorn on 2006/02/25 00:08:51 Use -Lpath rather than -L path since this is happier on Darwin. Submitted by: Martin Fong Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#5 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#5 edit .. //depot/projects/trustedbsd/openbsm/tools/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#3 $ # -CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. +CFLAGS+= -I- -I ../.. -I ../../libbsm -L../../libbsm -I. PROG= audit MAN= audit.8 DPADD= /usr/lib/libbsm.a ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#3 $ # -CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. +CFLAGS+= -I- -I ../.. -I ../../libbsm -L../../libbsm -I. PROG= auditd SRCS= audit_warn.c auditd.c MAN= auditd.8 ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#5 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#5 $ # -CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. +CFLAGS+= -I- -I ../.. -I ../../libbsm -L../../libbsm -I. PROG= auditreduce MAN= auditreduce.1 DPADD= /usr/lib/libbsm.a ==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#5 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#5 $ # -CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. +CFLAGS+= -I- -I ../.. -I ../../libbsm -L../../libbsm -I. PROG= praudit MAN= praudit.1 DPADD= /usr/lib/libbsm.a ==== //depot/projects/trustedbsd/openbsm/tools/Makefile#4 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile#4 $ # -CFLAGS+= -I- -I .. -I ../libbsm -L ../libbsm -I. +CFLAGS+= -I- -I .. -I ../libbsm -L../libbsm -I. PROG= audump NO_MAN= DPADD= /usr/lib/libbsm.a From owner-trustedbsd-cvs@FreeBSD.ORG Sat Feb 25 00:12:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1917F16A420 for ; Sat, 25 Feb 2006 00:12:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E48643D45 for ; Sat, 25 Feb 2006 00:12:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3D6A846B24 for ; Fri, 24 Feb 2006 19:12:26 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A5EA6559D7; Sat, 25 Feb 2006 00:12:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9354016A423; Sat, 25 Feb 2006 00:12:42 +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 566E716A420 for ; Sat, 25 Feb 2006 00:12:42 +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 20C5543D46 for ; Sat, 25 Feb 2006 00:12: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 k1P0Cghx041726 for ; Sat, 25 Feb 2006 00:12: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 k1P0CgNJ041723 for perforce@freebsd.org; Sat, 25 Feb 2006 00:12:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 25 Feb 2006 00:12:42 GMT Message-Id: <200602250012.k1P0CgNJ041723@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 92365 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Feb 2006 00:12:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92365 Change 92365 by rwatson@rwatson_peppercorn on 2006/02/25 00:12:28 On systems without LOG_SECURITY defined, use LOG_AUTH. Reported by: Martin Fong Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 $ */ #include @@ -795,7 +795,11 @@ } } +#ifdef LOG_SECURITY openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); +#else + openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); +#endif syslog(LOG_INFO, "starting...\n"); if (debug == 0 && daemon(0, 0) == -1) { From owner-trustedbsd-cvs@FreeBSD.ORG Sat Feb 25 03:24:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 840AE16A422 for ; Sat, 25 Feb 2006 03:24:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E37E543D45 for ; Sat, 25 Feb 2006 03:24:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8A80A46C22 for ; Fri, 24 Feb 2006 22:24:40 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AE44755C5C; Sat, 25 Feb 2006 03:24:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A40FB16A423; Sat, 25 Feb 2006 03:24: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 4213A16A422 for ; Sat, 25 Feb 2006 03:24:55 +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 DE79F43D46 for ; Sat, 25 Feb 2006 03:24:54 +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 k1P3OsTc056037 for ; Sat, 25 Feb 2006 03:24:54 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1P3OsKe056034 for perforce@freebsd.org; Sat, 25 Feb 2006 03:24:54 GMT (envelope-from wsalamon@computer.org) Date: Sat, 25 Feb 2006 03:24:54 GMT Message-Id: <200602250324.k1P3OsKe056034@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 92369 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Feb 2006 03:24:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=92369 Change 92369 by wsalamon@gretsch on 2006/02/25 03:23:59 Cleanups done in preparation for merge into FreeBSD CVS: - Remove unecessary linefeeds - Audit the vnode only when the vnode lock and reference are held - Move some vnode auditing into the actual system call, out of the kern_xxx function in order to avoid duplicated auditing of the vnode: once during namei lookup and once in the kern_xxx function Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#28 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#28 (text+ko) ==== @@ -194,8 +194,7 @@ if (jailed(td->td_ucred) && !prison_quotas) return (EPERM); mtx_lock(&Giant); - NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, td); if ((error = namei(&nd)) != 0) { mtx_unlock(&Giant); return (error); @@ -329,16 +328,16 @@ if (error) return (error); vp = fp->f_vnode; +#ifdef AUDIT + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + AUDIT_ARG(vnode, vp, ARG_VNODE1); + VOP_UNLOCK(vp, 0, td); +#endif mp = vp->v_mount; fdrop(fp, td); if (vp->v_iflag & VI_DOOMED) return (EBADF); mtx_lock(&Giant); -#ifdef AUDIT - vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); - VOP_UNLOCK(fp->f_vnode, 0, td); -#endif #ifdef MAC error = mac_check_mount_stat(td->td_ucred, mp); if (error) { @@ -2375,7 +2374,6 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, vp, ARG_VNODE1); VATTR_NULL(&vattr); vattr.va_flags = flags; #ifdef MAC @@ -2476,6 +2474,11 @@ if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); +#ifdef AUDIT + vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); + AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + VOP_UNLOCK(fp->f_vnode, 0, td); +#endif error = setfflags(td, fp->f_vnode, uap->flags); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -2611,7 +2614,11 @@ if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); +#ifdef AUDIT + vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + VOP_UNLOCK(fp->f_vnode, 0, td); +#endif error = setfmode(td, fp->f_vnode, uap->mode); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -2636,7 +2643,6 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, vp, ARG_VNODE1); VATTR_NULL(&vattr); vattr.va_uid = uid; vattr.va_gid = gid; @@ -2765,6 +2771,11 @@ if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); +#ifdef AUDIT + vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); + AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + VOP_UNLOCK(fp->f_vnode, 0, td); +#endif error = setfown(td, fp->f_vnode, uap->uid, uap->gid); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -2825,7 +2836,6 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, vp, ARG_VNODE1); setbirthtime = 0; if (numtimes < 3 && VOP_GETATTR(vp, &vattr, td->td_ucred, td) == 0 && timespeccmp(&ts[1], &vattr.va_birthtime, < )) @@ -2883,8 +2893,7 @@ if ((error = getutimes(tptr, tptrseg, ts)) != 0) return (error); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -2928,8 +2937,7 @@ if ((error = getutimes(tptr, tptrseg, ts)) != 0) return (error); - NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -2976,6 +2984,11 @@ if ((error = getvnode(td->td_proc->p_fd, fd, &fp)) != 0) return (error); vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount); +#ifdef AUDIT + vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); + AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + VOP_UNLOCK(fp->f_vnode, 0, td); +#endif error = setutimes(td, fp->f_vnode, ts, 2, tptr == NULL); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); @@ -3017,8 +3030,7 @@ if (length < 0) return(EINVAL); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - td); + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -3090,7 +3102,7 @@ goto drop; VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + AUDIT_ARG(vnode, vp, ARG_VNODE1); if (vp->v_type == VDIR) error = EISDIR; #ifdef MAC @@ -3195,10 +3207,10 @@ return (error); vp = fp->f_vnode; vfslocked = VFS_LOCK_GIANT(vp->v_mount); - AUDIT_ARG(vnode, vp, ARG_VNODE1); if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) goto drop; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + AUDIT_ARG(vnode, vp, ARG_VNODE1); if (vp->v_object != NULL) { VM_OBJECT_LOCK(vp->v_object); vm_object_page_clean(vp->v_object, 0, 0, 0); @@ -3712,7 +3724,6 @@ AUDIT_ARG(fd, uap->fd); if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0) return (error); - if ((fp->f_flag & FREAD) == 0) { fdrop(fp, td); return (EBADF); @@ -3734,7 +3745,7 @@ auio.uio_resid = uap->count; /* vn_lock(vp, LK_SHARED | LK_RETRY, td); */ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); + AUDIT_ARG(vnode, vp, ARG_VNODE1); loff = auio.uio_offset = fp->f_offset; #ifdef MAC error = mac_check_vnode_readdir(td->td_ucred, vp); From owner-trustedbsd-cvs@FreeBSD.ORG Sat Feb 25 06:11:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EDCBC16A424 for ; Sat, 25 Feb 2006 06:11:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4907543D46 for ; Sat, 25 Feb 2006 06:11:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 435F946BF4 for ; Sat, 25 Feb 2006 01:11:39 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 887AA57EAF; Sat, 25 Feb 2006 06:11:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8265B16A422; Sat, 25 Feb 2006 06:11: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 232E216A423 for ; Sat, 25 Feb 2006 06:11:55 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: from ems01.seccuris.com (ems01.seccuris.com [204.112.0.35]) by mx1.FreeBSD.org (Postfix) with SMTP id 3CC7043D46 for ; Sat, 25 Feb 2006 06:11:54 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: (qmail 4907 invoked by uid 0); 25 Feb 2006 06:18:53 -0000 Received: from unknown (HELO ?192.168.1.100?) (unknown) by unknown with SMTP; 25 Feb 2006 06:18:53 -0000 Message-ID: <43FFF528.7070100@FreeBSD.org> Date: Sat, 25 Feb 2006 00:11:52 -0600 From: "Christian S.J. Peron" User-Agent: Mozilla Thunderbird 1.0.7 (Macintosh/20050923) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Robert Watson References: <200602250012.k1P0CgNJ041723@repoman.freebsd.org> In-Reply-To: <200602250012.k1P0CgNJ041723@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 92365 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Feb 2006 06:11:58 -0000 Robert Watson wrote: >http://perforce.freebsd.org/chv.cgi?CH=92365 > >Change 92365 by rwatson@rwatson_peppercorn on 2006/02/25 00:12:28 > > On systems without LOG_SECURITY defined, use LOG_AUTH. > > Reported by: Martin Fong > >Affected files ... > >.. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 edit > >Differences ... > >==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 (text+ko) ==== > >@@ -30,7 +30,7 @@ > * > * @APPLE_BSD_LICENSE_HEADER_END@ > * >- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#12 $ >+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 $ > */ > > #include >@@ -795,7 +795,11 @@ > } > } > >+#ifdef LOG_SECURITY > openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); >+#else >+ openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); >+#endif > syslog(LOG_INFO, "starting...\n"); > > if (debug == 0 && daemon(0, 0) == -1) { > > > > In userspace, we are using LOG_AUTH | LOG_ERR to report audit failures, at least for login(1) and su(1). Might be a good idea to be consistent, anyway. -- Christian S.J. Peron csjp@FreeBSD.ORG FreeBSD Committer FreeBSD Security Team From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 26 02:46:09 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E3AD216A420 for ; Sun, 26 Feb 2006 02:46:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E2F943D45 for ; Sun, 26 Feb 2006 02:46:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7E28446C12 for ; Sat, 25 Feb 2006 21:45:50 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 81CB456455; Sun, 26 Feb 2006 02:46:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 71A0D16A423; Sun, 26 Feb 2006 02:46: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 17D3B16A420 for ; Sun, 26 Feb 2006 02:46:06 +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 D06BD43D45 for ; Sun, 26 Feb 2006 02:46:05 +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 k1Q2k5tQ056869 for ; Sun, 26 Feb 2006 02:46:05 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 k1Q2k5Rs056866 for perforce@freebsd.org; Sun, 26 Feb 2006 02:46:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Feb 2006 02:46:05 GMT Message-Id: <200602260246.k1Q2k5Rs056866@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 92403 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2006 02:46:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=92403 Change 92403 by rwatson@rwatson_peppercorn on 2006/02/26 02:45:18 First beginning cut at support for gnu-autoconfig, gnu-automake, gnu-libtool as a way to build OpenBSM, which should facilitate getting it building on systems with incomplete or no support for BSD make and the BSD make file infrastructure. Most things appear to work, although I don't yet have man symlinks working, and none of the source is currently using configured results (such as using the configure test for sys/endian.h to decide whether or not to include compat/endian.h), which will follow. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/autogen.sh#1 add .. //depot/projects/trustedbsd/openbsm/bin/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/configure.ac#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/man/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/tools/Makefile.am#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 26 02:53:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A73116A420 for ; Sun, 26 Feb 2006 02:53:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D70B43D46 for ; Sun, 26 Feb 2006 02:53:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B98E246C12 for ; Sat, 25 Feb 2006 21:52:59 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A2F54554E0; Sun, 26 Feb 2006 02:53:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9409216A423; Sun, 26 Feb 2006 02:53: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 35C1916A420 for ; Sun, 26 Feb 2006 02:53: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 F230843D46 for ; Sun, 26 Feb 2006 02:53:14 +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 k1Q2rEgw057297 for ; Sun, 26 Feb 2006 02:53:14 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 k1Q2rE89057294 for perforce@freebsd.org; Sun, 26 Feb 2006 02:53:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Feb 2006 02:53:14 GMT Message-Id: <200602260253.k1Q2rE89057294@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 92404 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2006 02:53:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=92404 Change 92404 by rwatson@rwatson_peppercorn on 2006/02/26 02:52:27 Escape $P4$ in configure.ac to prevent symbols from interfering with shell interpreters. These symbols were only present after the first checkin due to $P4$ expansion. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure.ac#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure.ac#2 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION($P4: //depot/projects/trustedbsd/openbsm/configure.ac#1 $) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#2 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config.h]) From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 26 11:26:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E58EF16A420 for ; Sun, 26 Feb 2006 11:26:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6669943D46 for ; Sun, 26 Feb 2006 11:26:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 629A346C25 for ; Sun, 26 Feb 2006 06:26:01 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 522D256C4D; Sun, 26 Feb 2006 11:26:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E3B716A423; Sun, 26 Feb 2006 11:26: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 1187716A420 for ; Sun, 26 Feb 2006 11:26:18 +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 D062C43D49 for ; Sun, 26 Feb 2006 11:26: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 k1QBQH2H091816 for ; Sun, 26 Feb 2006 11:26: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 k1QBQHan091813 for perforce@freebsd.org; Sun, 26 Feb 2006 11:26:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Feb 2006 11:26:17 GMT Message-Id: <200602261126.k1QBQHan091813@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 92413 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2006 11:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=92413 Change 92413 by rwatson@rwatson_peppercorn on 2006/02/26 11:25:48 Declare package name and version to automake. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure.ac#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure.ac#3 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#2 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#3 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config.h]) @@ -13,7 +13,7 @@ AC_PROG_INSTALL AC_PROG_LIBTOOL -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) # Checks for libraries. # FIXME: Replace `main' with a function in `-lbsm': From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 26 11:36:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58F0416A420 for ; Sun, 26 Feb 2006 11:36:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC01243D4C for ; Sun, 26 Feb 2006 11:36:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A646446C28 for ; Sun, 26 Feb 2006 06:36:15 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 42AF356FC2; Sun, 26 Feb 2006 11:36:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D24516A423; Sun, 26 Feb 2006 11:36: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 D887116A420 for ; Sun, 26 Feb 2006 11:36:31 +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 A1F0A43D49 for ; Sun, 26 Feb 2006 11:36:31 +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 k1QBaVSx092291 for ; Sun, 26 Feb 2006 11:36:31 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 k1QBaVfP092288 for perforce@freebsd.org; Sun, 26 Feb 2006 11:36:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Feb 2006 11:36:31 GMT Message-Id: <200602261136.k1QBaVfP092288@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 92414 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2006 11:36:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=92414 Change 92414 by rwatson@rwatson_peppercorn on 2006/02/26 11:35:59 Move config.h to config/. Add autoconf/automake generated files. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.guess#1 add .. //depot/projects/trustedbsd/openbsm/config/config.h.in#1 add .. //depot/projects/trustedbsd/openbsm/config/config.sub#1 add .. //depot/projects/trustedbsd/openbsm/config/depcomp#1 add .. //depot/projects/trustedbsd/openbsm/config/install-sh#1 add .. //depot/projects/trustedbsd/openbsm/config/ltmain.sh#1 add .. //depot/projects/trustedbsd/openbsm/config/missing#1 add .. //depot/projects/trustedbsd/openbsm/configure#1 add .. //depot/projects/trustedbsd/openbsm/configure.ac#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure.ac#4 (text+ko) ==== @@ -3,10 +3,10 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#3 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#4 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) -AC_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADER([config/config.h]) # Checks for programs. AC_PROG_CC From owner-trustedbsd-cvs@FreeBSD.ORG Sun Feb 26 11:37:35 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A2A216A420 for ; Sun, 26 Feb 2006 11:37:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F396343D45 for ; Sun, 26 Feb 2006 11:37:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1CF8146C12 for ; Sun, 26 Feb 2006 06:37:17 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 26B045B61E; Sun, 26 Feb 2006 11:37:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1345016A423; Sun, 26 Feb 2006 11:37: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 ADC6616A420 for ; Sun, 26 Feb 2006 11:37:33 +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 6494B43D46 for ; Sun, 26 Feb 2006 11:37: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 k1QBbXIv092440 for ; Sun, 26 Feb 2006 11:37: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 k1QBbXve092437 for perforce@freebsd.org; Sun, 26 Feb 2006 11:37:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Feb 2006 11:37:33 GMT Message-Id: <200602261137.k1QBbXve092437@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 92415 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2006 11:37:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=92415 Change 92415 by rwatson@rwatson_peppercorn on 2006/02/26 11:36:49 One more autoconf/automake-generated file. Affected files ... .. //depot/projects/trustedbsd/openbsm/aclocal.m4#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 00:05:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66D1816A420 for ; Mon, 27 Feb 2006 00:05:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACD9943D5A for ; Mon, 27 Feb 2006 00:05:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3C0B546C09 for ; Sun, 26 Feb 2006 19:05:05 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1AD7F5590D; Mon, 27 Feb 2006 00:05:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DEE416A423; Mon, 27 Feb 2006 00:05: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 C18EE16A420 for ; Mon, 27 Feb 2006 00:05:20 +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 5778F43D73 for ; Mon, 27 Feb 2006 00:05: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 k1R05HqV046663 for ; Mon, 27 Feb 2006 00:05: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 k1R05Hlv046660 for perforce@freebsd.org; Mon, 27 Feb 2006 00:05:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 00:05:17 GMT Message-Id: <200602270005.k1R05Hlv046660@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 92441 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 00:05:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=92441 Change 92441 by rwatson@rwatson_peppercorn on 2006/02/27 00:04:58 automake-generated makefiles templates. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/man/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 00:52:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F15D516A420 for ; Mon, 27 Feb 2006 00:52:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B25943D45 for ; Mon, 27 Feb 2006 00:51:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A1E6246C4C for ; Sun, 26 Feb 2006 19:51:38 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id ECD0356655; Mon, 27 Feb 2006 00:51:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DF1E116A423; Mon, 27 Feb 2006 00:51:46 +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 8972F16A420 for ; Mon, 27 Feb 2006 00:51:46 +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 1BD1A43D55 for ; Mon, 27 Feb 2006 00:51:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1R0pgWV056202 for ; Mon, 27 Feb 2006 00:51: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 k1R0pgg9056199 for perforce@freebsd.org; Mon, 27 Feb 2006 00:51:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 00:51:42 GMT Message-Id: <200602270051.k1R0pgg9056199@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 92445 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 00:52:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=92445 Change 92445 by rwatson@rwatson_peppercorn on 2006/02/27 00:51:08 chmod +x. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#2 (xtext/text+ko) ==== From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 01:24:17 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AB7C16A420 for ; Mon, 27 Feb 2006 01:24:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0C3543D6A for ; Mon, 27 Feb 2006 01:24:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C6A7946C1E for ; Sun, 26 Feb 2006 20:23:42 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 74CAD5892F; Mon, 27 Feb 2006 01:23:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 645C416A423; Mon, 27 Feb 2006 01:23: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 16BFD16A420 for ; Mon, 27 Feb 2006 01:23:23 +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 B6A7543D48 for ; Mon, 27 Feb 2006 01:23:22 +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 k1R1NMvC058315 for ; Mon, 27 Feb 2006 01:23:22 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 k1R1NMts058312 for perforce@freebsd.org; Mon, 27 Feb 2006 01:23:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 01:23:22 GMT Message-Id: <200602270123.k1R1NMts058312@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 92448 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 01:24:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=92448 Change 92448 by rwatson@rwatson_peppercorn on 2006/02/27 01:22:22 Set AM_MAINTAINER_MODE in order to avoid problems with time stamps. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/aclocal.m4#2 edit .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/configure#3 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/man/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -115,6 +115,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -190,7 +193,7 @@ .SUFFIXES: am--refresh: @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -217,9 +220,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config/config.h: config/stamp-h1 @@ -231,7 +234,7 @@ config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status @rm -f config/stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config/config.h -$(top_srcdir)/config/config.h.in: $(am__configure_deps) +$(top_srcdir)/config/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f config/stamp-h1 touch $@ ==== //depot/projects/trustedbsd/openbsm/aclocal.m4#2 (text+ko) ==== @@ -6653,6 +6653,35 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -99,6 +99,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -165,7 +168,7 @@ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -190,9 +193,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#2 $ # srcdir = @srcdir@ @@ -114,6 +114,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -179,7 +182,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -204,9 +207,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#2 $ # srcdir = @srcdir@ @@ -114,6 +114,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -179,7 +182,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -204,9 +207,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#2 $ # srcdir = @srcdir@ @@ -114,6 +114,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -179,7 +182,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -204,9 +207,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) ==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#2 $ # srcdir = @srcdir@ @@ -114,6 +114,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -179,7 +182,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -204,9 +207,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) ==== //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#2 $ # srcdir = @srcdir@ @@ -103,6 +103,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -172,7 +175,7 @@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -197,9 +200,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: ==== //depot/projects/trustedbsd/openbsm/configure#3 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#3 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#4 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -466,7 +466,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LIBOBJS LTLIBOBJ S' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fast depCXX_TRUE am__fastdepCXX_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1028,6 +1028,8 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] @@ -1539,6 +1541,30 @@ ac_config_headers="$ac_config_headers config/config.h" +echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi; + echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 + + +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + # Checks for programs. ac_ext=c @@ -3156,7 +3182,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3159 "configure"' > conftest.$ac_ext + echo '#line 3185 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4626,7 +4652,7 @@ # Provide some information about the compiler. -echo "$as_me:4629:" \ +echo "$as_me:4655:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5724,11 +5750,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5727: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5753: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5731: \$? = $ac_status" >&5 + echo "$as_me:5757: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -5986,11 +6012,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5989: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6015: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5993: \$? = $ac_status" >&5 + echo "$as_me:6019: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6048,11 +6074,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6051: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6077: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6055: \$? = $ac_status" >&5 + echo "$as_me:6081: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8296,7 +8322,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10678: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10656: \$? = $ac_status" >&5 + echo "$as_me:10682: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10711,11 +10737,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10714: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10740: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10718: \$? = $ac_status" >&5 + echo "$as_me:10744: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12088,7 +12114,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13100: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13078: \$? = $ac_status" >&5 + echo "$as_me:13104: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13133,11 +13159,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13136: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13162: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13140: \$? = $ac_status" >&5 + echo "$as_me:13166: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15263,11 +15289,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15266: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15292: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15270: \$? = $ac_status" >&5 + echo "$as_me:15296: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15525,11 +15551,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15528: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15554: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15532: \$? = $ac_status" >&5 + echo "$as_me:15558: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15587,11 +15613,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15590: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15616: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15594: \$? = $ac_status" >&5 + echo "$as_me:15620: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17835,7 +17861,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 +echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -23156,6 +23189,9 @@ s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t +s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t +s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t +s,@MAINT@,$MAINT,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t ==== //depot/projects/trustedbsd/openbsm/configure.ac#5 (text+ko) ==== @@ -3,10 +3,11 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#4 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#5 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) +AM_MAINTAINER_MODE # Checks for programs. AC_PROG_CC ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#2 $ # srcdir = @srcdir@ @@ -121,6 +121,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -208,7 +211,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -233,9 +236,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) ==== //depot/projects/trustedbsd/openbsm/man/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -95,6 +95,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -172,7 +175,7 @@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -197,9 +200,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: ==== //depot/projects/trustedbsd/openbsm/tools/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#2 $ # srcdir = @srcdir@ @@ -111,6 +111,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -175,7 +178,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -200,9 +203,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 01:41:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6899516A420 for ; Mon, 27 Feb 2006 01:41:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A963F43D48 for ; Mon, 27 Feb 2006 01:41:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 59ADE46C26 for ; Sun, 26 Feb 2006 20:41:30 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 830B35542B; Mon, 27 Feb 2006 01:41:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 513D916A423; Mon, 27 Feb 2006 01:41:46 +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 ABE6916A420 for ; Mon, 27 Feb 2006 01:41: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 5C52D43D45 for ; Mon, 27 Feb 2006 01:41:45 +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 k1R1fjIC058963 for ; Mon, 27 Feb 2006 01:41:45 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 k1R1fjSb058960 for perforce@freebsd.org; Mon, 27 Feb 2006 01:41:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 01:41:45 GMT Message-Id: <200602270141.k1R1fjSb058960@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 92449 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 01:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=92449 Change 92449 by rwatson@rwatson_peppercorn on 2006/02/27 01:41:38 Linux has a queue.h without some of our spiffiness, we need to ship a more recent BSD version in the compat section. Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/queue.h#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 01:43:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90C8516A438 for ; Mon, 27 Feb 2006 01:43:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F18E343D48 for ; Mon, 27 Feb 2006 01:43:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D7D7246C1E for ; Sun, 26 Feb 2006 20:43:31 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1E2F355403; Mon, 27 Feb 2006 01:43:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E13116A423; Mon, 27 Feb 2006 01:43:49 +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 9302D16A420 for ; Mon, 27 Feb 2006 01:43:48 +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 5780643D48 for ; Mon, 27 Feb 2006 01:43:48 +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 k1R1hmEu059096 for ; Mon, 27 Feb 2006 01:43:48 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 k1R1hm2l059093 for perforce@freebsd.org; Mon, 27 Feb 2006 01:43:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 01:43:48 GMT Message-Id: <200602270143.k1R1hm2l059093@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 92450 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 01:43:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=92450 Change 92450 by rwatson@rwatson_peppercorn on 2006/02/27 01:43:22 A bit of localization: don't confuse matters by having a literal $FreeBSD$ in the source, or CVS will get upset later when we import it into FreeBSD. Do add a $P4$. Remove stuff specific to the FreeBSD kernel. Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/queue.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/compat/queue.h#2 (text+ko) ==== @@ -27,7 +27,9 @@ * SUCH DAMAGE. * * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: src/sys/sys/queue.h,v 1.63 2005/11/23 04:02:27 emaste Exp $ + * + * Derived from FreeBSD src/sys/sys/queue.h:1.63. + * $P4: //depot/projects/trustedbsd/openbsm/compat/queue.h#2 $ */ #ifndef _SYS_QUEUE_H_ @@ -537,50 +539,4 @@ QMD_TRACE_ELEM(&(elm)->field); \ } while (0) - -#ifdef _KERNEL - -/* - * XXX insque() and remque() are an old way of handling certain queues. - * They bogusly assumes that all queue heads look alike. - */ - -struct quehead { - struct quehead *qh_link; - struct quehead *qh_rlink; -}; - -#ifdef __CC_SUPPORTS___INLINE - -static __inline void -insque(void *a, void *b) -{ - struct quehead *element = (struct quehead *)a, - *head = (struct quehead *)b; - - element->qh_link = head->qh_link; - element->qh_rlink = head; - head->qh_link = element; - element->qh_link->qh_rlink = element; -} - -static __inline void -remque(void *a) -{ - struct quehead *element = (struct quehead *)a; - - element->qh_link->qh_rlink = element->qh_rlink; - element->qh_rlink->qh_link = element->qh_link; - element->qh_rlink = 0; -} - -#else /* !__CC_SUPPORTS___INLINE */ - -void insque(void *a, void *b); -void remque(void *a); - -#endif /* __CC_SUPPORTS___INLINE */ - -#endif /* _KERNEL */ - #endif /* !_SYS_QUEUE_H_ */ From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 01:44:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D72B816A420 for ; Mon, 27 Feb 2006 01:44:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 580C243D49 for ; Mon, 27 Feb 2006 01:44:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3670F46C27 for ; Sun, 26 Feb 2006 20:44:34 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6E38C55720; Mon, 27 Feb 2006 01:44:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E47616A423; Mon, 27 Feb 2006 01:44: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 062DC16A420 for ; Mon, 27 Feb 2006 01:44:51 +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 2176643D58 for ; Mon, 27 Feb 2006 01:44:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1R1ingN059136 for ; Mon, 27 Feb 2006 01:44:49 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 k1R1ink0059133 for perforce@freebsd.org; Mon, 27 Feb 2006 01:44:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 01:44:49 GMT Message-Id: <200602270144.k1R1ink0059133@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 92451 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 01:44:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92451 Change 92451 by rwatson@rwatson_peppercorn on 2006/02/27 01:43:52 This is compat/queue.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/queue.h#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/compat/queue.h#3 (text+ko) ==== @@ -29,11 +29,11 @@ * @(#)queue.h 8.5 (Berkeley) 8/20/94 * * Derived from FreeBSD src/sys/sys/queue.h:1.63. - * $P4: //depot/projects/trustedbsd/openbsm/compat/queue.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/queue.h#3 $ */ -#ifndef _SYS_QUEUE_H_ -#define _SYS_QUEUE_H_ +#ifndef _COMPAT_QUEUE_H_ +#define _COMPAT_QUEUE_H_ #include @@ -539,4 +539,4 @@ QMD_TRACE_ELEM(&(elm)->field); \ } while (0) -#endif /* !_SYS_QUEUE_H_ */ +#endif /* !_COMPAT_QUEUE_H_ */ From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 13:28:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C969616A420 for ; Mon, 27 Feb 2006 13:28:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E8B043D46 for ; Mon, 27 Feb 2006 13:28:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 05C7446B98 for ; Mon, 27 Feb 2006 08:28:18 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4291B55519; Mon, 27 Feb 2006 13:28:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EA9416A423; Mon, 27 Feb 2006 13:28: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 E208816A420 for ; Mon, 27 Feb 2006 13:28: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 97F6C43D46 for ; Mon, 27 Feb 2006 13:28: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 k1RDSYlU011637 for ; Mon, 27 Feb 2006 13:28: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 k1RDSYuq011634 for perforce@freebsd.org; Mon, 27 Feb 2006 13:28:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 13:28:34 GMT Message-Id: <200602271328.k1RDSYuq011634@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 92461 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 13:28:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=92461 Change 92461 by rwatson@rwatson_fledge on 2006/02/27 13:27:59 Rename CHANGELOG to HISTORY, as the change log format isn't quite the standard, and it is perhaps better understood as a version history than a change log. Affected files ... .. //depot/projects/trustedbsd/openbsm/CHANGELOG#13 delete .. //depot/projects/trustedbsd/openbsm/HISTORY#1 branch Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 13:40:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ABE0B16A422 for ; Mon, 27 Feb 2006 13:40:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CB0C43D64 for ; Mon, 27 Feb 2006 13:40:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2D92846BB5 for ; Mon, 27 Feb 2006 08:40:29 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BDEB456D37; Mon, 27 Feb 2006 13:40:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A925616A423; Mon, 27 Feb 2006 13:40: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 2EFD716A420; Mon, 27 Feb 2006 13:40:06 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD31143D45; Mon, 27 Feb 2006 13:40:05 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 2279246B09; Mon, 27 Feb 2006 08:39:47 -0500 (EST) Date: Mon, 27 Feb 2006 13:44:20 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: "Christian S.J. Peron" In-Reply-To: <43FFF528.7070100@FreeBSD.org> Message-ID: <20060227133628.W52695@fledge.watson.org> References: <200602250012.k1P0CgNJ041723@repoman.freebsd.org> <43FFF528.7070100@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 92365 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 13:40:57 -0000 On Sat, 25 Feb 2006, Christian S.J. Peron wrote: >> @@ -795,7 +795,11 @@ >> } >> } >> >> +#ifdef LOG_SECURITY >> openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); >> +#else >> + openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); >> +#endif >> syslog(LOG_INFO, "starting...\n"); >> >> if (debug == 0 && daemon(0, 0) == -1) { > > In userspace, we are using LOG_AUTH | LOG_ERR to report audit failures, at > least for login(1) and su(1). Might be a good idea to be consistent, anyway. My general feeling has been that audit-related log material shouldn't go into publically readable logs. LOG_SECURITY works well for this on FreeBSD; however, LOG_AUTHPRIV is probably the better place for the log messages to go so that they don't enter a world-readable log file on other systems? This looks like it will work on Linux and Darwin. On Solaris, there's a LOG_AUDIT, which has the same underlying numeric value as LOG_SECURITY on FreeBSD. Robert N M Watson From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 16:47:26 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E2EC116A420 for ; Mon, 27 Feb 2006 16:47:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60B0C43D45 for ; Mon, 27 Feb 2006 16:47:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2B4BB46BAB for ; Mon, 27 Feb 2006 11:47:06 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0B83655C19; Mon, 27 Feb 2006 16:47:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EAF7D16A423; Mon, 27 Feb 2006 16:47:22 +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 947C616A420 for ; Mon, 27 Feb 2006 16:47:22 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: from ems01.seccuris.com (ems01.seccuris.com [204.112.0.35]) by mx1.FreeBSD.org (Postfix) with SMTP id C428B43D45 for ; Mon, 27 Feb 2006 16:47:21 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: (qmail 97360 invoked by uid 0); 27 Feb 2006 16:54:20 -0000 Received: from unknown (HELO ?192.168.11.101?) (unknown) by unknown with SMTP; 27 Feb 2006 16:54:20 -0000 Message-ID: <44032D19.3090201@FreeBSD.org> Date: Mon, 27 Feb 2006 10:47:21 -0600 From: "Christian S.J. Peron" User-Agent: Mozilla Thunderbird 1.0.7 (Macintosh/20050923) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Robert Watson References: <200602250012.k1P0CgNJ041723@repoman.freebsd.org> <43FFF528.7070100@FreeBSD.org> <20060227133628.W52695@fledge.watson.org> In-Reply-To: <20060227133628.W52695@fledge.watson.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 92365 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 16:47:26 -0000 Robert Watson wrote: > > On Sat, 25 Feb 2006, Christian S.J. Peron wrote: > >>> @@ -795,7 +795,11 @@ >>> } >>> } >>> >>> +#ifdef LOG_SECURITY >>> openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); >>> +#else >>> + openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); >>> +#endif >>> syslog(LOG_INFO, "starting...\n"); >>> >>> if (debug == 0 && daemon(0, 0) == -1) { >> >> >> In userspace, we are using LOG_AUTH | LOG_ERR to report audit >> failures, at least for login(1) and su(1). Might be a good idea to be >> consistent, anyway. > > > My general feeling has been that audit-related log material shouldn't > go into publically readable logs. LOG_SECURITY works well for this on > FreeBSD; however, LOG_AUTHPRIV is probably the better place for the > log messages to go so that they don't enter a world-readable log file > on other systems? This looks like it will work on Linux and Darwin. > On Solaris, there's a LOG_AUDIT, which has the same underlying numeric > value as LOG_SECURITY on FreeBSD. > > Robert N M Watson > > I would agree here. I just consulted RFC 3164 to see if there is anything that they are designating for security related messages and here is what I found: Numerical Facility Code 0 kernel messages 1 user-level messages 2 mail system 3 system daemons 4 security/authorization messages (note 1) 5 messages generated internally by syslogd 6 line printer subsystem 7 network news subsystem 8 UUCP subsystem 9 clock daemon (note 2) 10 security/authorization messages (note 1) 11 FTP daemon 12 NTP subsystem 13 log audit (note 1) 14 log alert (note 1) 15 clock daemon (note 2) 16 local use 0 (local0) 17 local use 1 (local1) 18 local use 2 (local2) 19 local use 3 (local3) 20 local use 4 (local4) 21 local use 5 (local5) 22 local use 6 (local6) 23 local use 7 (local7) Note 1 - Various operating systems have been found to utilize Facilities 4, 10, 13 and 14 for security/authorization, audit, and alert messages which seem to be similar. -- Christian S.J. Peron csjp@FreeBSD.ORG FreeBSD Committer FreeBSD Security Team From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 17:33:35 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B64616A422 for ; Mon, 27 Feb 2006 17:33:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB8C943D45 for ; Mon, 27 Feb 2006 17:33:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 432E046B94 for ; Mon, 27 Feb 2006 12:33:16 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A63BE55B4C; Mon, 27 Feb 2006 17:33:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C6E416A423; Mon, 27 Feb 2006 17:33:33 +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 62B2816A420 for ; Mon, 27 Feb 2006 17:33:33 +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 2CDB243D45 for ; Mon, 27 Feb 2006 17:33: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 k1RHXXMs030104 for ; Mon, 27 Feb 2006 17:33: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 k1RHXWKA030101 for perforce@freebsd.org; Mon, 27 Feb 2006 17:33:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 17:33:32 GMT Message-Id: <200602271733.k1RHXWKA030101@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 92470 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 17:33:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=92470 Change 92470 by rwatson@rwatson_fledge on 2006/02/27 17:33:13 Remove BSD makefiles, since autoconf/automake now work. We will continue to use FreeBSD BSD make infrastructure in the integrated audit support. Note: The one BSD makefile feature I've been unable to reproduce with automake is man page links. The automake manual doesn't mention anything along these lines, so it may require some automake hackery. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile#3 delete .. //depot/projects/trustedbsd/openbsm/bin/Makefile#5 delete .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#4 delete .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#4 delete .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#6 delete .. //depot/projects/trustedbsd/openbsm/bsm/Makefile#8 delete .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#14 delete .. //depot/projects/trustedbsd/openbsm/man/Makefile#8 delete .. //depot/projects/trustedbsd/openbsm/tools/Makefile#5 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 18:49:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 203DB16A420 for ; Mon, 27 Feb 2006 18:49:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8214143D64 for ; Mon, 27 Feb 2006 18:49:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 63F9E46BAF for ; Mon, 27 Feb 2006 13:49:17 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 570E45BA6B; Mon, 27 Feb 2006 18:49:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EF2716A425; Mon, 27 Feb 2006 18:49: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 EE0C416A422 for ; Mon, 27 Feb 2006 18:49:12 +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 A32BB43D55 for ; Mon, 27 Feb 2006 18:49:05 +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 k1RIn5TU032932 for ; Mon, 27 Feb 2006 18:49:05 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 k1RIn5hb032929 for perforce@freebsd.org; Mon, 27 Feb 2006 18:49:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 18:49:05 GMT Message-Id: <200602271849.k1RIn5hb032929@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 92473 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 18:49:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92473 Change 92473 by rwatson@rwatson_fledge on 2006/02/27 18:48:09 Move contents of struct au_token from audit.h to audit_internal.h: this is internal to the libbsm implementation. Leave token_t in the public header since it is a defined part of the interface. Move contents of struct au_record and definition of au_record_t into audit_internal.h for similar reasons. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 $ */ #ifndef _BSM_AUDIT_H @@ -240,25 +240,11 @@ }; typedef struct auditpinfo_addr auditpinfo_addr_t; -/* Token and record structures. */ - -struct au_token { - u_char *t_data; - size_t len; - TAILQ_ENTRY(au_token) tokens; -}; +/* + * Contents of token_t are opaque outside of libbsm. + */ typedef struct au_token token_t; -struct au_record { - char used; /* Record currently in use? */ - int desc; /* Descriptor for record. */ - TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ - u_char *data; - size_t len; - LIST_ENTRY(au_record) au_rec_q; -}; -typedef struct au_record au_record_t; - /* * Kernel audit queue control parameters. */ @@ -310,6 +296,9 @@ }; typedef struct au_evclass_map au_evclass_map_t; +/* + * Audit system calls. + */ #if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 $ */ #ifndef _LIBBSM_INTERNAL_H @@ -47,6 +47,22 @@ * broken with future releases of OpenBSM, which may delete, modify, or * otherwise break these interfaces or the assumptions they rely on. */ +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; + +struct au_record { + char used; /* Record currently in use? */ + int desc; /* Descriptor for record. */ + TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ + u_char *data; + size_t len; + LIST_ENTRY(au_record) au_rec_q; +}; +typedef struct au_record au_record_t; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 18:52:21 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 07C6316A420 for ; Mon, 27 Feb 2006 18:52:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96A4743D46 for ; Mon, 27 Feb 2006 18:52:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 21EDC46BAF for ; Mon, 27 Feb 2006 13:51:54 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 24C9556B27; Mon, 27 Feb 2006 18:52:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1158F16A423; Mon, 27 Feb 2006 18:52: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 B251F16A420 for ; Mon, 27 Feb 2006 18:52:10 +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 17D5D43D53 for ; Mon, 27 Feb 2006 18:52:10 +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 k1RIq9qi033137 for ; Mon, 27 Feb 2006 18:52:09 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 k1RIq9LT033134 for perforce@freebsd.org; Mon, 27 Feb 2006 18:52:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 18:52:09 GMT Message-Id: <200602271852.k1RIq9LT033134@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 92474 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 18:52:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=92474 Change 92474 by rwatson@rwatson_fledge on 2006/02/27 18:51:46 Add time.h so that Linux systems can find the definition of clock_t. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#17 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#17 $ */ #ifndef _LIBBSM_H_ @@ -45,6 +45,7 @@ #include #include /* Required for audit.h. */ +#include /* Required for clock_t on Linux. */ #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 18:54:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 879D316A420 for ; Mon, 27 Feb 2006 18:54:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8F7C43D76 for ; Mon, 27 Feb 2006 18:54:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 36DF946B85 for ; Mon, 27 Feb 2006 13:53:58 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2ACFE55C5E; Mon, 27 Feb 2006 18:54:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 17B7F16A423; Mon, 27 Feb 2006 18:54: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 B724E16A422 for ; Mon, 27 Feb 2006 18:54:14 +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 1112643D46 for ; Mon, 27 Feb 2006 18:54:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1RIsCLb033214 for ; Mon, 27 Feb 2006 18:54:12 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 k1RIsCSm033211 for perforce@freebsd.org; Mon, 27 Feb 2006 18:54:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 18:54:12 GMT Message-Id: <200602271854.k1RIsCSm033211@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 92475 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 18:54:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=92475 Change 92475 by rwatson@rwatson_fledge on 2006/02/27 18:53:56 Synchronize include guards with include file name. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#9 (text+ko) ==== @@ -34,11 +34,11 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#9 $ */ -#ifndef _LIBBSM_INTERNAL_H -#define _LIBBSM_INTERNAL_H +#ifndef _AUDIT_INTERNAL_H +#define _AUDIT_INTERNAL_H /* * audit_internal.h contains private interfaces that are shared by user space @@ -112,4 +112,4 @@ #define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size) -#endif /* !_LIBBSM_INTERNAL_H_ */ +#endif /* !_AUDIT_INTERNAL_H_ */ From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 18:56:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86CF216A420 for ; Mon, 27 Feb 2006 18:56:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0A5843D88 for ; Mon, 27 Feb 2006 18:55:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6A21F46BE8 for ; Mon, 27 Feb 2006 13:55:07 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CD044581BA; Mon, 27 Feb 2006 18:55:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B9EAC16A423; Mon, 27 Feb 2006 18:55: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 91EED16A420 for ; Mon, 27 Feb 2006 18:55:24 +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 02F9943D49 for ; Mon, 27 Feb 2006 18:55:14 +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 k1RItEOe033285 for ; Mon, 27 Feb 2006 18:55:14 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 k1RItEpC033282 for perforce@freebsd.org; Mon, 27 Feb 2006 18:55:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 18:55:14 GMT Message-Id: <200602271855.k1RItEpC033282@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 92476 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 18:56:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=92476 Change 92476 by rwatson@rwatson_fledge on 2006/02/27 18:55:03 queue macros now required only for access to internal audit data structures, rather than public ones. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#10 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#10 (text+ko) ==== @@ -34,12 +34,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#10 $ */ #ifndef _AUDIT_INTERNAL_H #define _AUDIT_INTERNAL_H +#include + /* * audit_internal.h contains private interfaces that are shared by user space * and the kernel for the purposes of assembling audit records. Applications ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#18 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#18 $ */ #ifndef _LIBBSM_H_ @@ -42,7 +42,6 @@ #include #include -#include #include /* Required for audit.h. */ #include /* Required for clock_t on Linux. */ From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 19:03:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9DE3C16A422 for ; Mon, 27 Feb 2006 19:03:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18ABC43D46 for ; Mon, 27 Feb 2006 19:03:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6C2B346B85 for ; Mon, 27 Feb 2006 14:03:08 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C59BA55499; Mon, 27 Feb 2006 19:03:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AF04916A424; Mon, 27 Feb 2006 19:03: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 58F8E16A420 for ; Mon, 27 Feb 2006 19:03: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 1EE8643D4C for ; Mon, 27 Feb 2006 19:03:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1RJ3PV6034115 for ; Mon, 27 Feb 2006 19:03:25 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 k1RJ3OJ3034112 for perforce@freebsd.org; Mon, 27 Feb 2006 19:03:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 19:03:24 GMT Message-Id: <200602271903.k1RJ3OJ3034112@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 92477 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 19:03:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=92477 Change 92477 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/27 19:02:36 Some tweakage of include file use. This needs to be more autoconf'd as we aren't currently doing feature tests for endian.h vs machine/endian.h use. We do do this for sys/endian.h though. Likewise, we need proper feature tests to decide whether to use the native queue.h or the compat/queue.h in OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 edit .. //depot/projects/trustedbsd/openbsm/compat/endian.h#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 (text+ko) ==== @@ -34,13 +34,17 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 $ */ #ifndef _AUDIT_INTERNAL_H #define _AUDIT_INTERNAL_H +#ifdef __linux__ +#include +#else #include +#endif /* * audit_internal.h contains private interfaces that are shared by user space ==== //depot/projects/trustedbsd/openbsm/compat/endian.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#6 $ */ #ifndef _COMPAT_ENDIAN_H_ @@ -34,7 +34,11 @@ /* * Pick up value of BYTE_ORDER/_BYTE_ORDER if not yet included. */ +#ifdef __linux__ +#include +#else #include +#endif /* * Some systems will have the uint/int types defined here already, others ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 (text+ko) ==== @@ -30,11 +30,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 $ */ #include -#include #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 (text+ko) ==== @@ -31,15 +31,15 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 $ */ #include -#ifdef __APPLE__ +#ifdef HAVE_SYS_ENDIAN_H +#include +#else #include -#else /* !__APPLE__ */ -#include -#endif /* __APPLE__*/ +#endif #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 (text+ko) ==== @@ -30,15 +30,15 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#34 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 $ */ #include -#ifdef __APPLE__ +#ifdef HAVE_SYS_ENDIAN_H +#include +#else #include -#else /* !__APPLE__ */ -#include -#endif /* __APPLE__*/ +#endif #include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 22:18:11 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 13F5E16A420 for ; Mon, 27 Feb 2006 22:18:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1005743D55 for ; Mon, 27 Feb 2006 22:18:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B07FA46C1F for ; Mon, 27 Feb 2006 17:17:47 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C5BCB564DB; Mon, 27 Feb 2006 22:17:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B720116A423; Mon, 27 Feb 2006 22: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 6FFB816A420 for ; Mon, 27 Feb 2006 22: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 C8E2F43D49 for ; Mon, 27 Feb 2006 22: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 k1RMHgY7052146 for ; Mon, 27 Feb 2006 22: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 k1RMHM0l051927 for perforce@freebsd.org; Mon, 27 Feb 2006 22:17:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 22:17:22 GMT Message-Id: <200602272217.k1RMHM0l051927@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 92486 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 22:18:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=92486 Change 92486 by rwatson@rwatson_peppercorn on 2006/02/27 22:16:57 Integrate trustedbsd MAC branch from TrustedBSD base; see change set @92126 for merge details. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#62 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#4 integrate .. //depot/projects/trustedbsd/mac/UPDATING#52 integrate .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/bin/csh/config.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/csh/iconv.h#1 branch .. //depot/projects/trustedbsd/mac/bin/csh/iconv_stub.c#1 branch .. //depot/projects/trustedbsd/mac/bin/ln/ln.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#25 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/CHANGELOG#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_user#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/et/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/finnish/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/french/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/german/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/greek/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/italian/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ja/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/spanish/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/charset#1 branch .. //depot/projects/trustedbsd/mac/etc/Makefile#47 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#45 integrate .. //depot/projects/trustedbsd/mac/etc/hosts.allow#5 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/440.status-mailq#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc#30 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#30 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/SERVERS#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/abi#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/archdep#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/localpkg#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/named#13 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/netif#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pccard#7 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/root#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#22 integrate .. //depot/projects/trustedbsd/mac/etc/snmpd.config#3 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#40 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/dialog.1#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/dialog.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/search.c#7 integrate .. //depot/projects/trustedbsd/mac/include/proc_service.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_cpio.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/grantpt.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/recv.2#10 integrate .. //depot/projects/trustedbsd/mac/lib/libipsec/ipsec_set_policy.3#9 integrate .. //depot/projects/trustedbsd/mac/lib/libipsec/ipsec_strerror.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libmemstat/memstat_uma.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#23 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_init.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_once.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_private.h#14 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_suspend_np.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libpthread_db.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libthr_db.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/kld.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libutil/kld.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libutil/libutil.h#8 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#67 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#56 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#83 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#9 integrate .. //depot/projects/trustedbsd/mac/sbin/gbde/gbde.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/gbde/gbde.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/eli/geli.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#32 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifieee80211.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#36 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#30 integrate .. //depot/projects/trustedbsd/mac/sbin/mca/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mca/mca.8#1 branch .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.c#19 integrate .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.8#16 integrate .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#17 integrate .. //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#36 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#57 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/agp.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ata.4#17 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ataraid.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/atkbd.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ipmi.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ipsec.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/lp.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_ibm.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.sparc64/eeprom.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/myri10ge.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ng_one2many.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ohci.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/syscons.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/twa.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uart.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vga.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/group.5#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#35 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#44 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/acl.9#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/buf.9#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/memguard.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/mtx_pool.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/rman.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/vm_page_wakeup.9#3 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/ja_JP.SJIS.src#4 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/ja_JP.eucJP.src#3 integrate .. //depot/projects/trustedbsd/mac/share/msgdef/am_ET.UTF-8.src#2 integrate .. //depot/projects/trustedbsd/mac/share/msgdef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mp_machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/tsc.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/ia32/ia32_syscall.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91st.c#2 delete .. //depot/projects/trustedbsd/mac/sys/arm/at91/files.at91#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/files.at91rm92#2 delete .. //depot/projects/trustedbsd/mac/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/std.at91#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/std.at91rm92#2 delete .. //depot/projects/trustedbsd/mac/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/KB920X#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#124 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.amd64#21 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#51 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#40 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#34 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/README#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/ah.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_osdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_osdep.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/version.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_throttle.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/asr/asr.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athioctl.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cs/if_csvar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_cbus.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_osdep.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_ioctl.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_pci.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_sbus.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_target.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_target.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_tpublic.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispmbox.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispreg.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispvar.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mii/mii.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/fc_log.h#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_debug.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_pci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/if_plip.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/re/if_re.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/ich.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_axe.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_rue.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_udav.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci_pci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohcivar.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umct.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uplcom.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_quirks.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_subr.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vge/if_vge.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_slice.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_slice.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/geom/label/g_label.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/label/g_label_ufs.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/geode.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/identcpu.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#45 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/tsc.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/xbox.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia32/ia32_trap.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mca.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mp_machdep.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_clock.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_kse.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_resource.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thr.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_sleepqueue.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_process.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#70 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#85 integrate .. //depot/projects/trustedbsd/mac/sys/modules/arcnet/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/dummynet/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/firewire/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/fwe/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/sbp/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/sbp_targ/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_vlan/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/atm/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/bluetooth/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/bt3c/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/h4/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/ubt/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/nfs4client/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/nfsclient/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/modules/twa/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gre.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_media.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_media.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/net/radix.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_ioctl.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_output.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_var.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/netflow/ng_netflow.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_eiface.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ksocket.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#61 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_sack.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#56 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#27 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_intel.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_pcn.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sf.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_wb.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/trap.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/db_trace.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/eeprom.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#18 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/tick.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ipmi.h#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#47 integrate .. //depot/projects/trustedbsd/mac/sys/sys/param.h#45 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pcpu.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#67 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysctl.h#25 integrate .. //depot/projects/trustedbsd/mac/sys/sys/systm.h#33 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_quota.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#33 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom_eli/init-i-P.t#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/column/column.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/netstat/mbuf.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/vmstat.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/vmstat/vmstat.8#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/wall/wall.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/who/who.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#45 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/arp/arp.c#17 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidcontrol/sdp.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/kbd.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcsecd/hcsecd.8#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/config/config.5#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/moused/moused.c#16 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/version/perform.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/powerd/powerd.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/devices.c#19 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/network.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/tcpip.c#11 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#4 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#62 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.534 2006/01/02 17:52:16 dfr Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -1079,11 +1079,14 @@ .for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor # Remove catpages without corresponding manpages. @3<&0; \ @@ -1100,7 +1103,9 @@ check-old-files: @echo ">>> Checking for old files" .for file in ${OLD_FILES} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1116,32 +1121,49 @@ @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor delete-old-dirs: @echo ">>> Removing old directories" .for dir in ${OLD_DIRS} # Don't fail if an old directory isn't empty. - @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true) + @if [ -d "${DESTDIR}/${dir}" ]; then \ + rmdir -v "${DESTDIR}/${dir}" || true; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor @echo ">>> Old directories removed" check-old-dirs: @echo ">>> Checking for old directories" .for dir in ${OLD_DIRS} - @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" + @if [ -d "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir}"; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor delete-old: delete-old-files delete-old-dirs ==== //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.27 2006/02/04 08:07:00 avatar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.28 2006/02/18 16:35:57 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -82,6 +82,10 @@ OLD_FILES+=bin/vinum OLD_FILES+=sbin/vinum OLD_FILES+=usr/share/man/man8/vinum.8.gz +# 200411XX: libxpg4 removal +OLD_FILES+=usr/lib/libxpg4.a +OLD_FILES+=usr/lib/libxpg4.so +OLD_FILES+=usr/lib/libxpg4_p.a # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz @@ -89,7 +93,7 @@ OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery OLD_FILES+=usr/lib/libisc.a -OLD_FILEs+=usr/lib/libisc.so +OLD_FILES+=usr/lib/libisc.so OLD_FILES+=usr/lib/libisc_p.a OLD_FILES+=usr/libexec/named-xfer OLD_FILES+=usr/sbin/named.restart @@ -563,7 +567,6 @@ # 200201XX OLD_FILES+=usr/sbin/linux # 2001XXXX -OLD_FILES+=etc/security OLD_FILES+=usr/bin/joy OLD_FILES+=usr/sbin/ibcs2 OLD_FILES+=usr/sbin/svr4 @@ -2759,6 +2762,8 @@ OLD_LIBS+=usr/lib/snmp_pf.so.2 # 2005XXXX: not ready for primetime yet OLD_LIBS+=usr/lib/libautofs.so.1 +# 200411XX: libxpg4 removal +OLD_LIBS+=usr/lib/libxpg4.so.3 # 200410XX: libm compatibility fix OLD_LIBS+=lib/libm.so.2 # 20041001: version bump ==== //depot/projects/trustedbsd/mac/UPDATING#52 (text+ko) ==== @@ -94,6 +94,15 @@ Its /etc/rc.conf.d configuration file has been `ppp' from the beginning, and hence there is no need to touch it. +20051014: + Now most modules get their build-time options from the kernel + configuration file. A few modules still have fixed options + due to their non-conformant implementation, but they will be + corrected eventually. You may need to review the options of + the modules in use, explicitly specify the non-default options + in the kernel configuration file, and rebuild the kernel and + modules afterwards. + 20051001: kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8) to turn polling(4) on your interfaces. @@ -501,4 +510,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.438 2006/02/01 13:04:52 yar Exp $ +$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ ==== //depot/projects/trustedbsd/mac/bin/csh/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.37 2005/08/03 09:22:03 phk Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.38 2006/02/19 06:40:29 ume Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -70,12 +70,30 @@ NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15 NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15 +.if defined(NO_NLS_CATALOGS) || defined(RESCUE) +CFLAGS+= -DNO_NLS_CATALOGS +.else +CFLAGS+= -DHAVE_ICONV +SRCS+= iconv_stub.c +# Folloing links can be installed from ports/shells/tcsh_nls: +# NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 +# NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8 +# NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8 +# NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8 +# NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8 +# NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 +# NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8 +# NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8 +# NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8 +# NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8 +.endif + NLSNAME= tcsh .for catalog in ${CATALOGS} NLS+= ${catalog:C/.*://} NLSSRCDIR_${catalog:C/.*://}= ${TCSHDIR}/nls/${catalog:C/:.*//} -NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo set[0-9]* +NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo charset set[0-9]* .endfor csh.1: tcsh.man ==== //depot/projects/trustedbsd/mac/bin/csh/config.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config.h,v 1.12 2005/05/04 20:21:57 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.13 2006/02/19 06:40:29 ume Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -205,3 +205,7 @@ #include "config_p.h" #include "config_f.h" + +#ifndef NO_NLS_CATALOGS +#define NLS_CATALOGS +#endif ==== //depot/projects/trustedbsd/mac/bin/ln/ln.1#10 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.30 2005/01/16 16:41:57 ru Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $ .\" -.Dd December 30, 1993 +.Dd February 14, 2006 .Dt LN 1 .Os .Sh NAME @@ -41,11 +41,11 @@ .Nd make links .Sh SYNOPSIS .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file .Op Ar target_file .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file ... .Ar target_dir .Nm link @@ -76,6 +76,24 @@ option overrides any previous .Fl i options.) +.It Fl F +If the target file already exists and is a directory, then remove it +so that the link may occur. +The +.Fl F +option should be used with either +.Fl f +or +.Fl i +options. +If none is specified, +.Fl f +is implied. +The +.Fl F +option is a no-op unless +.Fl s +option is specified. .It Fl h If the .Ar target_file @@ -179,6 +197,12 @@ They are provided solely for compatibility with other .Nm implementations. +.Pp +The +.Fl F +option is +.Fx +extention and should not be used in portable scripts. .Sh SEE ALSO .Xr link 2 , .Xr lstat 2 , ==== //depot/projects/trustedbsd/mac/bin/ln/ln.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.33 2005/02/09 17:37:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $"); #include #include @@ -53,6 +53,7 @@ #include int fflag; /* Unlink existing files. */ +int Fflag; /* Remove empty directories also. */ int hflag; /* Check new name for symlink first. */ int iflag; /* Interactive mode. */ int sflag; /* Symbolic, not hard, link. */ @@ -91,8 +92,11 @@ exit(linkit(argv[0], argv[1], 0)); } - while ((ch = getopt(argc, argv, "fhinsv")) != -1) + while ((ch = getopt(argc, argv, "Ffhinsv")) != -1) switch (ch) { + case 'F': + Fflag = 1; + break; case 'f': fflag = 1; iflag = 0; @@ -121,6 +125,10 @@ linkf = sflag ? symlink : link; linkch = sflag ? '-' : '='; + if (sflag == 0) + Fflag = 0; + if (Fflag == 1 && iflag == 0) + fflag = 1; switch(argc) { case 0: @@ -200,7 +208,12 @@ * and interactively if -i was specified. */ if (fflag && exists) { - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -216,7 +229,12 @@ return (1); } - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -236,8 +254,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ln [-fhinsv] source_file [target_file]", - " ln [-fhinsv] source_file ... target_dir", + "usage: ln [-Ffhinsv] source_file [target_file]", + " ln [-Ffhinsv] source_file ... target_dir", " link source_file target_file"); exit(1); } ==== //depot/projects/trustedbsd/mac/bin/ps/print.c#25 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.93 2004/07/20 05:52:00 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $"); #include #include @@ -366,6 +366,8 @@ if (strncmp(ttname, "tty", 3) == 0 || strncmp(ttname, "cua", 3) == 0) ttname += 3; + if (strncmp(ttname, "pts/", 4) == 0) + ttname += 4; (void)printf("%*.*s%c", v->width - 1, v->width - 1, ttname, k->ki_p->ki_kiflag & KI_CTTY ? ' ' : '-'); } ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#4 (text+ko) ==== @@ -11,6 +11,7 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module + 3 BEGEMOT-IP snmpd mibII module 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#9 (text+ko) ==== @@ -105,6 +105,18 @@ /* list of all New if registrations */ static struct newifreg_list newifreg_list = TAILQ_HEAD_INITIALIZER(newifreg_list); +/* baud rate of fastest interface */ +uint64_t mibif_maxspeed; + +/* user-forced update interval */ +u_int mibif_force_hc_update_interval; + +/* current update interval */ +u_int mibif_hc_update_interval; + +/* HC update timer handle */ +static void *hc_update_timer; + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; @@ -280,16 +292,15 @@ (struct snmp_value *)NULL); } -/* - * Fetch new MIB data. +/** + * Fetch the GENERIC IFMIB and update the HC counters */ -int -mib_fetch_ifmib(struct mibif *ifp) +static int +fetch_generic_mib(struct mibif *ifp, const struct ifmibdata *old) { int name[6]; size_t len; - void *newmib; - struct ifmibdata oldmib = ifp->mib; + struct mibif_private *p = ifp->private; name[0] = CTL_NET; name[1] = PF_LINK; @@ -306,26 +317,144 @@ return (-1); } - if (ifp->trap_enable) { - if (!(oldmib.ifmd_flags & IFF_UP)) { - if (ifp->mib.ifmd_flags & IFF_UP) - link_trap(ifp, 1); + /* + * Assume that one of the two following compounds is optimized away + */ + if (ULONG_MAX >= 0xffffffffffffffffULL) { + p->hc_inoctets = ifp->mib.ifmd_data.ifi_ibytes; + p->hc_outoctets = ifp->mib.ifmd_data.ifi_obytes; + p->hc_omcasts = ifp->mib.ifmd_data.ifi_omcasts; + p->hc_opackets = ifp->mib.ifmd_data.ifi_opackets; + p->hc_imcasts = ifp->mib.ifmd_data.ifi_imcasts; + p->hc_ipackets = ifp->mib.ifmd_data.ifi_ipackets; + + } else if (ULONG_MAX >= 0xffffffff) { + +#define UPDATE(HC, MIB) \ + if (old->ifmd_data.MIB > ifp->mib.ifmd_data.MIB) \ + p->HC += (0x100000000ULL + \ + ifp->mib.ifmd_data.MIB) - \ + old->ifmd_data.MIB; \ + else \ + p->HC += ifp->mib.ifmd_data.MIB - \ + old->ifmd_data.MIB; + + UPDATE(hc_inoctets, ifi_ibytes) + UPDATE(hc_outoctets, ifi_obytes) + UPDATE(hc_omcasts, ifi_omcasts) + UPDATE(hc_opackets, ifi_opackets) + UPDATE(hc_imcasts, ifi_imcasts) + UPDATE(hc_ipackets, ifi_ipackets) + +#undef UPDATE + } else + abort(); + return (0); +} + +/** + * Update the 64-bit interface counters + */ +static void +update_hc_counters(void *arg __unused) +{ + struct mibif *ifp; + struct ifmibdata oldmib; + + TAILQ_FOREACH(ifp, &mibif_list, link) { + oldmib = ifp->mib; + (void)fetch_generic_mib(ifp, &oldmib); + } +} + +/** + * Recompute the poll timer for the HC counters + */ +void +mibif_reset_hc_timer(void) +{ + u_int ticks; + + if ((ticks = mibif_force_hc_update_interval) == 0) { + if (mibif_maxspeed <= 10000000) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 22:26:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0598416A420 for ; Mon, 27 Feb 2006 22:26:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5966F43D4C for ; Mon, 27 Feb 2006 22:25:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id DEB6946B28 for ; Mon, 27 Feb 2006 17:25:38 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D32A19237E; Mon, 27 Feb 2006 22:22:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C1F3E16A423; Mon, 27 Feb 2006 22:22:05 +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 8345D16A420 for ; Mon, 27 Feb 2006 22:22:05 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39DB943D46 for ; Mon, 27 Feb 2006 22:22:05 +0000 (GMT) (envelope-from brueffer@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 k1RMM5Ab054250 for ; Mon, 27 Feb 2006 22:22:05 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1RMM4b2054244 for perforce@freebsd.org; Mon, 27 Feb 2006 22:22:04 GMT (envelope-from brueffer@freebsd.org) Date: Mon, 27 Feb 2006 22:22:04 GMT Message-Id: <200602272222.k1RMM4b2054244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 92487 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 22:26:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92487 Change 92487 by brueffer@brueffer_serenity on 2006/02/27 22:21:04 Fix a c/p error. Pointy hat to: brueffer Affected files ... .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/trap.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/trap.c#7 (text+ko) ==== @@ -596,7 +596,7 @@ AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(code, td); + AUDIT_SYSCALL_EXIT(error, td); CTR5(KTR_SYSC, "syscall: p=%p error=%d %s return %#lx %#lx ", p, error, syscallnames[code], td->td_retval[0], From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 23:11:11 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9FB4916A42C for ; Mon, 27 Feb 2006 23:11:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61ECB43D49 for ; Mon, 27 Feb 2006 23:11:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BDC5946BD5 for ; Mon, 27 Feb 2006 18:10:51 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 43A9B5540E; Mon, 27 Feb 2006 23:11:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3280C16A423; Mon, 27 Feb 2006 23:11:09 +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 CB3E516A422 for ; Mon, 27 Feb 2006 23:11:08 +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 6BEDF43D48 for ; Mon, 27 Feb 2006 23:11:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1RNB8qo059763 for ; Mon, 27 Feb 2006 23:11:08 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 k1RNB8sk059760 for perforce@freebsd.org; Mon, 27 Feb 2006 23:11:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 23:11:08 GMT Message-Id: <200602272311.k1RNB8sk059760@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 92490 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 23:11:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=92490 Change 92490 by rwatson@rwatson_peppercorn on 2006/02/27 23:10:19 Look for the include files we're interested in changing behavior based on, not the ones autoscan finds by default. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#2 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#2 (text+ko) ==== @@ -3,9 +3,6 @@ /* Define to 1 if you have the `alarm' function. */ #undef HAVE_ALARM -/* Define to 1 if you have the header file. */ -#undef HAVE_ARPA_INET_H - /* Define to 1 if you have the `bzero' function. */ #undef HAVE_BZERO @@ -15,8 +12,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_ENDIAN_H /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK @@ -36,9 +33,6 @@ /* Define to 1 if you have the `bsm' library (-lbsm). */ #undef HAVE_LIBBSM -/* Define to 1 if you have the header file. */ -#undef HAVE_LIMITS_H - /* Define to 1 if you have the header file. */ #undef HAVE_MACH_MACH_H @@ -52,9 +46,6 @@ /* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IN_H - /* Define to 1 if `stat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_STAT_EMPTY_STRING_BUG @@ -95,18 +86,9 @@ /* Define to 1 if `st_rdev' is member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_RDEV -/* Define to 1 if you have the header file. */ -#undef HAVE_SYSLOG_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_ENDIAN_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H ==== //depot/projects/trustedbsd/openbsm/configure.ac#6 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#5 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#6 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -23,7 +23,7 @@ # Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h mach/mach.h netinet/in.h stdint.h stdlib.h string.h sys/param.h sys/socket.h sys/time.h sys/endian.h syslog.h unistd.h]) +AC_CHECK_HEADERS([endian.h mach/mach.h sys/endian.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 23:19:35 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C54C916A424 for ; Mon, 27 Feb 2006 23:19:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D21FB43D46 for ; Mon, 27 Feb 2006 23:19:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7693346B4F for ; Mon, 27 Feb 2006 18:19:09 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9102B564A8; Mon, 27 Feb 2006 23:19:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 81A2F16A424; Mon, 27 Feb 2006 23:19: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 416E716A422 for ; Mon, 27 Feb 2006 23:19: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 BF9DB43D46 for ; Mon, 27 Feb 2006 23:19:18 +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 k1RNJIVG060121 for ; Mon, 27 Feb 2006 23:19:18 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 k1RNJI1h060118 for perforce@freebsd.org; Mon, 27 Feb 2006 23:19:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 23:19:18 GMT Message-Id: <200602272319.k1RNJI1h060118@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 92491 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 23:19:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=92491 Change 92491 by rwatson@rwatson_peppercorn on 2006/02/27 23:18:20 Check for machine/endian.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#3 edit .. //depot/projects/trustedbsd/openbsm/configure#4 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#3 (text+ko) ==== @@ -33,6 +33,9 @@ /* Define to 1 if you have the `bsm' library (-lbsm). */ #undef HAVE_LIBBSM +/* Define to 1 if you have the header file. */ +#undef HAVE_MACHINE_ENDIAN_H + /* Define to 1 if you have the header file. */ #undef HAVE_MACH_MACH_H ==== //depot/projects/trustedbsd/openbsm/configure#4 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#4 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#6 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -19940,17 +19940,7 @@ - - - - - - - - - - -for ac_header in arpa/inet.h fcntl.h limits.h mach/mach.h netinet/in.h stdint.h stdlib.h string.h sys/param.h sys/socket.h sys/time.h sys/endian.h syslog.h unistd.h +for ac_header in endian.h mach/mach.h machine/endian.h sys/endian.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then ==== //depot/projects/trustedbsd/openbsm/configure.ac#7 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#6 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#7 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -23,7 +23,7 @@ # Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([endian.h mach/mach.h sys/endian.h]) +AC_CHECK_HEADERS([endian.h mach/mach.h machine/endian.h sys/endian.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 23:39:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 84F6A16A426 for ; Mon, 27 Feb 2006 23:39:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2CE143D46 for ; Mon, 27 Feb 2006 23:39:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 39E0146BC0 for ; Mon, 27 Feb 2006 18:39:30 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B075E56C3A; Mon, 27 Feb 2006 23:39:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E26F16A423; Mon, 27 Feb 2006 23:39:46 +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 47F5916A420 for ; Mon, 27 Feb 2006 23:39:46 +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 0686E43D46 for ; Mon, 27 Feb 2006 23:39:46 +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 k1RNdji3061990 for ; Mon, 27 Feb 2006 23:39:45 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 k1RNdjXi061987 for perforce@freebsd.org; Mon, 27 Feb 2006 23:39:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 23:39:45 GMT Message-Id: <200602272339.k1RNdjXi061987@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 92494 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 23:39:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=92494 Change 92494 by rwatson@rwatson_peppercorn on 2006/02/27 23:38:56 Use configure to decide what endian includes are available, and how to use them. Prefer the local sys/endian.h if we've got one or building without configure (i.e., BSD make in FreeBSD); otherwise use compat/endian.h. To do that, we need the local endian.h, which on some systems is machine/endian.h (Darwin, *BSD), or in plain old endian.h (Linux). Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/endian.h#7 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#31 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#36 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/compat/endian.h#7 (text+ko) ==== @@ -25,22 +25,13 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#6 $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#7 $ */ #ifndef _COMPAT_ENDIAN_H_ #define _COMPAT_ENDIAN_H_ /* - * Pick up value of BYTE_ORDER/_BYTE_ORDER if not yet included. - */ -#ifdef __linux__ -#include -#else -#include -#endif - -/* * Some systems will have the uint/int types defined here already, others * will need stdint.h. */ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#31 (text+ko) ==== @@ -31,15 +31,31 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#31 $ */ #include + +#ifdef HAVE_CONFIG_H +#include #ifdef HAVE_SYS_ENDIAN_H #include -#else +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif +#endif /* !HAVE_SYS_ENDIANG_H */ +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ + #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#36 (text+ko) ==== @@ -30,15 +30,31 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#36 $ */ #include + +#ifdef HAVE_CONFIG_H +#include #ifdef HAVE_SYS_ENDIAN_H #include -#else +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif +#endif /* !HAVE_SYS_ENDIANG_H */ +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ + #include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 00:14:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AB5916A424 for ; Tue, 28 Feb 2006 00:14:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D5DC43D4C for ; Tue, 28 Feb 2006 00:14:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1373546BCE for ; Mon, 27 Feb 2006 19:13:45 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0C54F57612; Tue, 28 Feb 2006 00:13:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E9BDF16A423; Tue, 28 Feb 2006 00:13: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 8E1CA16A422 for ; Tue, 28 Feb 2006 00:13: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 22D8543D48 for ; Tue, 28 Feb 2006 00:13: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 k1S0DvQS063352 for ; Tue, 28 Feb 2006 00:13: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 k1S0DuTg063349 for perforce@freebsd.org; Tue, 28 Feb 2006 00:13:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 00:13:56 GMT Message-Id: <200602280013.k1S0DuTg063349@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 92496 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 00:14:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=92496 Change 92496 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 00:13:46 On Linux, define an empty __unused as it's unclear how to get it to work on Linux. On my local RedHat FC3 box, __attribute__used__ is sometimes defined as __attribute__((__unused__)) and other confusing things that are best avoided. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#12 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#12 $ */ #ifndef _AUDIT_INTERNAL_H @@ -42,6 +42,9 @@ #ifdef __linux__ #include +#ifndef __unused +#define __unused +#endif /* !__unused */ #else #include #endif From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 00:24:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D3E3416A420 for ; Tue, 28 Feb 2006 00:24:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C028E43D69 for ; Tue, 28 Feb 2006 00:24:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B9CEC46BF3 for ; Mon, 27 Feb 2006 19:24:14 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 234DD63A4D; Tue, 28 Feb 2006 00:24:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E5F016A423; Tue, 28 Feb 2006 00:24: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 ACE6D16A420 for ; Tue, 28 Feb 2006 00:24:10 +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 7138843D45 for ; Tue, 28 Feb 2006 00:24:10 +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 k1S0OANv063795 for ; Tue, 28 Feb 2006 00:24:10 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 k1S0OAbG063792 for perforce@freebsd.org; Tue, 28 Feb 2006 00:24:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 00:24:10 GMT Message-Id: <200602280024.k1S0OAbG063792@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 92498 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 00:24:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=92498 Change 92498 by rwatson@rwatson_peppercorn on 2006/02/28 00:23:33 Avoid unsightly and unportable grubbing around in 32-bit fields of struct in6_addr. Linux and Solaris have the same structure fields, but each with their own subtly different naming conventions. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#32 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#32 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#31 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#32 $ */ #include @@ -397,10 +397,7 @@ break; case AU_IPv6: - ipv6.__u6_addr.__u6_addr32[0] = ipaddr[0]; - ipv6.__u6_addr.__u6_addr32[1] = ipaddr[1]; - ipv6.__u6_addr.__u6_addr32[2] = ipaddr[2]; - ipv6.__u6_addr.__u6_addr32[3] = ipaddr[3]; + bcopy(ipaddr, &ipv6, sizeof(ipv6)); fprintf(fp, "%s", inet_ntop(AF_INET6, &ipv6, dst, INET6_ADDRSTRLEN)); break; From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 00:46:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B4D516A420 for ; Tue, 28 Feb 2006 00:46:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4A7243D45 for ; Tue, 28 Feb 2006 00:46:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CD09946B4D for ; Mon, 27 Feb 2006 19:46:23 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 380935B783; Tue, 28 Feb 2006 00:46:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 98AD016A45E; Tue, 28 Feb 2006 00:46: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 46A6416A440 for ; Tue, 28 Feb 2006 00:46: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 0060543D45 for ; Tue, 28 Feb 2006 00:46: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 k1S0kcI1064657 for ; Tue, 28 Feb 2006 00:46: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 k1S0kcSt064653 for perforce@freebsd.org; Tue, 28 Feb 2006 00:46:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 00:46:38 GMT Message-Id: <200602280046.k1S0kcSt064653@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 92501 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 00:46:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=92501 Change 92501 by rwatson@rwatson_peppercorn on 2006/02/28 00:46:14 Test for a fully-featured queue.h, which is not present on all platforms that have queue.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#4 edit .. //depot/projects/trustedbsd/openbsm/configure#5 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#4 (text+ko) ==== @@ -21,6 +21,9 @@ /* Define to 1 if you have the `ftruncate' function. */ #undef HAVE_FTRUNCATE +/* Define if queue.h includes LIST_FIRST */ +#undef HAVE_FULL_QUEUE_H + /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY ==== //depot/projects/trustedbsd/openbsm/configure#5 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#6 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#7 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -22516,6 +22516,70 @@ done +# sys/queue.h exists on most systems, but its capabilities vary a great deal. +# test for LIST_FIRST, which appears to not exist in all of them, and is +# necessary for OpenBSM. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + struct foo { + LIST_ENTRY(foo) foo_entries; + }; + LIST_HEAD(, foo) foo_list; + struct foo *foo; + + foo = LIST_FIRST(&foo_list); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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 + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FULL_QUEUE_H +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile tools/Makefile" ==== //depot/projects/trustedbsd/openbsm/configure.ac#8 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#7 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#8 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -44,6 +44,23 @@ AC_FUNC_STRFTIME AC_CHECK_FUNCS([bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) +# sys/queue.h exists on most systems, but its capabilities vary a great deal. +# test for LIST_FIRST, which appears to not exist in all of them, and is +# necessary for OpenBSM. +AC_TRY_COMPILE([ + #include +], [ + struct foo { + LIST_ENTRY(foo) foo_entries; + }; + LIST_HEAD(, foo) foo_list; + struct foo *foo; + + foo = LIST_FIRST(&foo_list); +], [ +AC_DEFINE(HAVE_FULL_QUEUE_H,, Define if queue.h includes LIST_FIRST) +]) + AC_CONFIG_FILES([Makefile bin/Makefile bin/audit/Makefile From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 00:51:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CF1316A420 for ; Tue, 28 Feb 2006 00:51:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D22943D48 for ; Tue, 28 Feb 2006 00:51:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0C77146B6C for ; Mon, 27 Feb 2006 19:51:30 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7CD545564F; Tue, 28 Feb 2006 00:51:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7092516A423; Tue, 28 Feb 2006 00:51:46 +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 2F40116A420 for ; Tue, 28 Feb 2006 00:51:46 +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 CAB6943D46 for ; Tue, 28 Feb 2006 00:51:45 +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 k1S0pjhB072299 for ; Tue, 28 Feb 2006 00:51:45 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 k1S0pj1H072296 for perforce@freebsd.org; Tue, 28 Feb 2006 00:51:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 00:51:45 GMT Message-Id: <200602280051.k1S0pj1H072296@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 92502 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 00:51:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92502 Change 92502 by rwatson@rwatson_peppercorn on 2006/02/28 00:50:57 Link, not just compile, the LIST_FIRST() test. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#6 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#6 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#7 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#8 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -22544,9 +22544,9 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22560,7 +22560,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22578,7 +22578,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile tools/Makefile" ==== //depot/projects/trustedbsd/openbsm/configure.ac#9 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#8 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#9 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -47,7 +47,7 @@ # sys/queue.h exists on most systems, but its capabilities vary a great deal. # test for LIST_FIRST, which appears to not exist in all of them, and is # necessary for OpenBSM. -AC_TRY_COMPILE([ +AC_TRY_LINK([ #include ], [ struct foo { From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 01:31:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A957016A420 for ; Tue, 28 Feb 2006 01:31:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C301643D7B for ; Tue, 28 Feb 2006 01:31:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 39D3346BBB for ; Mon, 27 Feb 2006 20:31:03 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7E11E63C96; Tue, 28 Feb 2006 01:25:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BFA216A426; Tue, 28 Feb 2006 01:25:42 +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 EF1C816A424 for ; Tue, 28 Feb 2006 01:25:41 +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 AEA6343D4C for ; Tue, 28 Feb 2006 01:25:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1S1PfuV074407 for ; Tue, 28 Feb 2006 01:25:41 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 k1S1Pf7P074404 for perforce@freebsd.org; Tue, 28 Feb 2006 01:25:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:25:41 GMT Message-Id: <200602280125.k1S1Pf7P074404@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 92503 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 01:31:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=92503 Change 92503 by rwatson@rwatson_peppercorn on 2006/02/28 01:24:41 When constructing tokens with IPv6 addresses, copy the entire structure rather than grubbing around inside. This avoids non-portability. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#37 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#37 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#36 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#37 $ */ #include @@ -368,10 +368,7 @@ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); return (t); } @@ -914,10 +911,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); return (t); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 01:32:47 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 688F116A420 for ; Tue, 28 Feb 2006 01:32:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B64143D70 for ; Tue, 28 Feb 2006 01:32:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4483E46BA1 for ; Mon, 27 Feb 2006 20:32:09 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 221725C3C5; Tue, 28 Feb 2006 01:32:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EE6816A420; Tue, 28 Feb 2006 01: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 BCC7716A422 for ; Tue, 28 Feb 2006 01:32: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 C272343D90 for ; Tue, 28 Feb 2006 01:31:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1S1Vodd074736 for ; Tue, 28 Feb 2006 01:31:50 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 k1S1Vn9k074733 for perforce@freebsd.org; Tue, 28 Feb 2006 01:31:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:31:49 GMT Message-Id: <200602280131.k1S1Vn9k074733@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 92505 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 01:32:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92505 Change 92505 by rwatson@rwatson_peppercorn on 2006/02/28 01:31:49 Remove socket token creation, which depends on BSD kernel data structures (and isn't implemented in libbsm anyway). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#39 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#39 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#39 $ */ #include @@ -800,50 +800,6 @@ /* * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * local Internet address 4 bytes - * remote port 2 bytes - * remote Internet address 4 bytes - */ -token_t * -au_to_socket(struct socket *so) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * address type/length 4 bytes - * local Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - * remote port 4 bytes - * address type/length 4 bytes - * remote Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - */ -token_t * -au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -token_t * -au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte * socket family 2 bytes * path 104 bytes */ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 01:32:49 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EDBA616A422 for ; Tue, 28 Feb 2006 01:32:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B32BC43D68 for ; Tue, 28 Feb 2006 01:32:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id DE4DA46BB9 for ; Mon, 27 Feb 2006 20:32:07 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3568359162; Tue, 28 Feb 2006 01:30:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2731916A423; Tue, 28 Feb 2006 01:30: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 D814916A422 for ; Tue, 28 Feb 2006 01:30:51 +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 6F4E543D8F for ; Tue, 28 Feb 2006 01:30:48 +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 k1S1UmRS074699 for ; Tue, 28 Feb 2006 01:30:48 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 k1S1Um81074696 for perforce@freebsd.org; Tue, 28 Feb 2006 01:30:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:30:48 GMT Message-Id: <200602280130.k1S1Um81074696@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 92504 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 01:32:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=92504 Change 92504 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 01:29:46 Use configure results to decide which queue.h to use. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 (text+ko) ==== @@ -34,19 +34,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 $ */ #ifndef _AUDIT_INTERNAL_H #define _AUDIT_INTERNAL_H -#ifdef __linux__ -#include -#ifndef __unused +#if defined(__linux__) && !defined(__unused) #define __unused -#endif /* !__unused */ -#else -#include #endif /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 (text+ko) ==== @@ -30,11 +30,22 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 $ */ #include +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_FULL_QUEUE_H +#include +#else +#include +#endif +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ + #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#32 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 $ */ #include @@ -51,9 +51,15 @@ #endif /* !HAVE_ENDIAN_H */ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif /* !HAVE_SYS_ENDIANG_H */ +#endif /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ #else /* !HAVE_CONFIG_H */ #include +#include #endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 (text+ko) ==== @@ -27,11 +27,21 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 $ */ #include + +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 (text+ko) ==== @@ -26,18 +26,39 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 $ */ /* * Based on sample code from Marc Majka. */ -#include /* strerror() */ -#include /* errno */ +#include + +#ifdef HAVE_CONFIG_H + +#include + +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ + +#else /* !HAVE_CONFIG_H */ + +#include + +#endif /* !HAVE_CONFIG_H */ + +#include #include -#include /* uint32_t */ -#include /* syslog() */ -#include /* syslog() */ + +#include +#include +#include +#include +#include + #ifdef __APPLE__ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 $ */ #include @@ -51,8 +51,14 @@ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include #endif /* !HAVE_SYS_ENDIANG_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ #else /* !HAVE_CONFIG_H */ #include +#include #endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 $ */ #include From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 01:34:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4931616A422 for ; Tue, 28 Feb 2006 01:34:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E83F143D69 for ; Tue, 28 Feb 2006 01:33:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4DA8446BA7 for ; Mon, 27 Feb 2006 20:33:40 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D5AD755B99; Tue, 28 Feb 2006 01:33:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C3CF916A426; Tue, 28 Feb 2006 01:33: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 67DE616A422 for ; Tue, 28 Feb 2006 01:33: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 2D5D443D5D for ; Tue, 28 Feb 2006 01:33: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 k1S1XraV074827 for ; Tue, 28 Feb 2006 01:33: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 k1S1XqMS074824 for perforce@freebsd.org; Tue, 28 Feb 2006 01:33:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:33:52 GMT Message-Id: <200602280133.k1S1XqMS074824@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 92506 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 01:34:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=92506 Change 92506 by rwatson@rwatson_peppercorn on 2006/02/28 01:33:33 Removed BSD Makefile missed in a previous pass. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#6 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 01:43:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB9A616A420 for ; Tue, 28 Feb 2006 01:43:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 154AB43D48 for ; Tue, 28 Feb 2006 01:43:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4F0F446BB9 for ; Mon, 27 Feb 2006 20:42:48 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E500156588; Tue, 28 Feb 2006 01:43:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D5CC316A423; Tue, 28 Feb 2006 01:43:05 +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 442F316A420 for ; Tue, 28 Feb 2006 01:43:05 +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 E6BC443D46 for ; Tue, 28 Feb 2006 01:43:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1S1h4lS075252 for ; Tue, 28 Feb 2006 01:43:04 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 k1S1h4fM075248 for perforce@freebsd.org; Tue, 28 Feb 2006 01:43:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:43:04 GMT Message-Id: <200602280143.k1S1h4fM075248@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 92507 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 01:43:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=92507 Change 92507 by rwatson@rwatson_peppercorn on 2006/02/28 01:42:18 Test for __ variants of struct ipc_perm members, as required on Linux. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#7 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#7 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#8 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#9 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -20478,6 +20478,222 @@ fi +echo "$as_me:$LINENO: checking for struct ipc_perm.__key" >&5 +echo $ECHO_N "checking for struct ipc_perm.__key... $ECHO_C" >&6 +if test "${ac_cv_member_struct_ipc_perm___key+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (ac_aggr.__key) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_member_struct_ipc_perm___key=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (sizeof ac_aggr.__key) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_member_struct_ipc_perm___key=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_member_struct_ipc_perm___key=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___key" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___key" >&6 + +echo "$as_me:$LINENO: checking for struct ipc_perm.__seq" >&5 +echo $ECHO_N "checking for struct ipc_perm.__seq... $ECHO_C" >&6 +if test "${ac_cv_member_struct_ipc_perm___seq+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (ac_aggr.__seq) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_member_struct_ipc_perm___seq=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (sizeof ac_aggr.__seq) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { 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_member_struct_ipc_perm___seq=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_member_struct_ipc_perm___seq=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___seq" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___seq" >&6 + echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then ==== //depot/projects/trustedbsd/openbsm/configure.ac#10 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#9 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#10 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -31,6 +31,12 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_CHECK_MEMBERS([struct stat.st_rdev]) +AC_CHECK_MEMBER([struct ipc_perm.__key],,,[ +#include +]) +AC_CHECK_MEMBER([struct ipc_perm.__seq],,,[ +#include +]) AC_HEADER_TIME AC_STRUCT_TM From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 01:48:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA9D416A427 for ; Tue, 28 Feb 2006 01:48:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3130743D5E for ; Tue, 28 Feb 2006 01:48:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 584DA46BC0 for ; Mon, 27 Feb 2006 20:47:56 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D75A357E42; Tue, 28 Feb 2006 01:48:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C88D116A424; Tue, 28 Feb 2006 01:48: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 E0EA016A422 for ; Tue, 28 Feb 2006 01:48:12 +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 9386C43D5E for ; Tue, 28 Feb 2006 01:48: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 k1S1mBr5075428 for ; Tue, 28 Feb 2006 01:48: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 k1S1mBwF075425 for perforce@freebsd.org; Tue, 28 Feb 2006 01:48:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:48:11 GMT Message-Id: <200602280148.k1S1mBwF075425@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 92508 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 01:48:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=92508 Change 92508 by rwatson@rwatson_peppercorn on 2006/02/28 01:47:21 Attempt 2: don't just test for __seq and __key, also create a define that can be tested for. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#5 edit .. //depot/projects/trustedbsd/openbsm/configure#8 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#5 (text+ko) ==== @@ -33,6 +33,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if ipc_perm.__key instead of key */ +#undef HAVE_IPC_PERM___KEY + +/* Define if ipc_perm.__seq instead of seq */ +#undef HAVE_IPC_PERM___SEQ + /* Define to 1 if you have the `bsm' library (-lbsm). */ #undef HAVE_LIBBSM ==== //depot/projects/trustedbsd/openbsm/configure#8 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#9 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#10 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -20478,6 +20478,7 @@ fi + echo "$as_me:$LINENO: checking for struct ipc_perm.__key" >&5 echo $ECHO_N "checking for struct ipc_perm.__key... $ECHO_C" >&6 if test "${ac_cv_member_struct_ipc_perm___key+set}" = set; then @@ -20586,6 +20587,7 @@ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___key" >&5 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___key" >&6 + echo "$as_me:$LINENO: checking for struct ipc_perm.__seq" >&5 echo $ECHO_N "checking for struct ipc_perm.__seq... $ECHO_C" >&6 if test "${ac_cv_member_struct_ipc_perm___seq+set}" = set; then @@ -20694,6 +20696,7 @@ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___seq" >&5 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___seq" >&6 + echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then ==== //depot/projects/trustedbsd/openbsm/configure.ac#11 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#10 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#11 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -31,12 +31,17 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_CHECK_MEMBERS([struct stat.st_rdev]) + AC_CHECK_MEMBER([struct ipc_perm.__key],,,[ #include -]) +], AC_DEFINE(HAVE_IPC_PERM___KEY,, Define if ipc_perm.__key instead of key) +) + AC_CHECK_MEMBER([struct ipc_perm.__seq],,,[ #include -]) +], AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq) +) + AC_HEADER_TIME AC_STRUCT_TM From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 01:57:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E6F1516A420 for ; Tue, 28 Feb 2006 01:57:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F13C043D53 for ; Tue, 28 Feb 2006 01:57:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5A3A346BC5 for ; Mon, 27 Feb 2006 20:57:07 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D2D1357842; Tue, 28 Feb 2006 01:57:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C522416A423; Tue, 28 Feb 2006 01:57: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 6AECF16A420 for ; Tue, 28 Feb 2006 01:57:24 +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 4D41C43D72 for ; Tue, 28 Feb 2006 01:57:23 +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 k1S1vNl9075808 for ; Tue, 28 Feb 2006 01:57:23 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 k1S1vMY9075805 for perforce@freebsd.org; Tue, 28 Feb 2006 01:57:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:57:22 GMT Message-Id: <200602280157.k1S1vMY9075805@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 92509 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 01:57:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=92509 Change 92509 by rwatson@rwatson_peppercorn on 2006/02/28 01:56:58 Third try: the previous attempt resulted in the undef ending up in config.h, but not the #def. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#9 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#9 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#10 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#11 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -20586,6 +20586,13 @@ fi echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___key" >&5 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___key" >&6 +if test $ac_cv_member_struct_ipc_perm___key = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_IPC_PERM___KEY +_ACEOF + +fi echo "$as_me:$LINENO: checking for struct ipc_perm.__seq" >&5 @@ -20695,6 +20702,13 @@ fi echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___seq" >&5 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___seq" >&6 +if test $ac_cv_member_struct_ipc_perm___seq = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_IPC_PERM___SEQ +_ACEOF + +fi echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 ==== //depot/projects/trustedbsd/openbsm/configure.ac#12 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#11 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#12 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -32,15 +32,17 @@ AC_TYPE_SIZE_T AC_CHECK_MEMBERS([struct stat.st_rdev]) -AC_CHECK_MEMBER([struct ipc_perm.__key],,,[ +AC_CHECK_MEMBER([struct ipc_perm.__key], +[AC_DEFINE(HAVE_IPC_PERM___KEY,, Define if ipc_perm.__key instead of key)], +[],[ #include -], AC_DEFINE(HAVE_IPC_PERM___KEY,, Define if ipc_perm.__key instead of key) -) +]) -AC_CHECK_MEMBER([struct ipc_perm.__seq],,,[ +AC_CHECK_MEMBER([struct ipc_perm.__seq], +[AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq)], +[],[ #include -], AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq) -) +]) AC_HEADER_TIME AC_STRUCT_TM From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 01:59:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B14C316A425 for ; Tue, 28 Feb 2006 01:59:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C28243D46 for ; Tue, 28 Feb 2006 01:59:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 99D9546BB9 for ; Mon, 27 Feb 2006 20:59:09 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1555056E5E; Tue, 28 Feb 2006 01:59:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 054B816A422; Tue, 28 Feb 2006 01:59: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 77B5416A422 for ; Tue, 28 Feb 2006 01:59: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 391A343D46 for ; Tue, 28 Feb 2006 01:59: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 k1S1xQgY075937 for ; Tue, 28 Feb 2006 01:59: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 k1S1xPGR075934 for perforce@freebsd.org; Tue, 28 Feb 2006 01:59:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:59:25 GMT Message-Id: <200602280159.k1S1xPGR075934@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 92510 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 01:59:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92510 Change 92510 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 01:58:50 Use __key and __seq if required (Linux). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#40 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#40 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#39 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#40 $ */ #include @@ -467,9 +467,18 @@ ADD_U_INT16(dptr, perm->mode); ADD_U_INT16(dptr, pad0); + +#ifdef HAVE_IPC_PERM___SEQ + ADD_U_INT16(dptr, perm->__seq); +#else ADD_U_INT16(dptr, perm->seq); +#endif +#ifdef HAVE_IPC_PERM___KEY + ADD_U_INT32(dptr, perm->__key); +#else ADD_U_INT32(dptr, perm->key); +#endif return (t); } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 02:10:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D593816A43D for ; Tue, 28 Feb 2006 02:10:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2F5D43D48 for ; Tue, 28 Feb 2006 02:10:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CD0F946BD7 for ; Mon, 27 Feb 2006 21:10:23 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D7D2555AC2; Tue, 28 Feb 2006 02:10:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CAA2316A423; Tue, 28 Feb 2006 02:10: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 6720D16A420 for ; Tue, 28 Feb 2006 02:10:40 +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 2AF1B43D46 for ; Tue, 28 Feb 2006 02:10:40 +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 k1S2Aebi076422 for ; Tue, 28 Feb 2006 02:10:40 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 k1S2Ad5v076419 for perforce@freebsd.org; Tue, 28 Feb 2006 02:10:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 02:10:39 GMT Message-Id: <200602280210.k1S2Ad5v076419@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 92511 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 02:10:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=92511 Change 92511 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 02:09:56 Use KERN_HOSTID and NODEV if they are defined, don't otherwise. (Linux) Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#17 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#17 $ */ #ifdef __APPLE__ @@ -56,7 +56,11 @@ if (p == NULL) return (kAUBadParamErr); +#ifdef NODEV *p = NODEV; +#else + *p = -1; +#endif /* for /usr/bin/login, try fstat() first */ if (fstat(STDIN_FILENO, &st) != 0) { @@ -78,6 +82,8 @@ int audit_set_terminal_host(uint32_t *m) { + +#ifdef KERN_HOSTID int name[2] = { CTL_KERN, KERN_HOSTID }; size_t len; @@ -90,6 +96,10 @@ return (kAUSysctlErr); } return (kAUNoErr); +#else + *m = -1; + return (kAUNoErr); +#endif } int From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 12:42:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F02F216A420 for ; Tue, 28 Feb 2006 12:42:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F17E43D5F for ; Tue, 28 Feb 2006 12:42:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 548FF46B7F for ; Tue, 28 Feb 2006 07:41:42 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AA8F355621; Tue, 28 Feb 2006 12:41:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 93E9716A424; Tue, 28 Feb 2006 12:41: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 3810316A420 for ; Tue, 28 Feb 2006 12:41: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 EE2DC43D68 for ; Tue, 28 Feb 2006 12:41: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 k1SCftCB019282 for ; Tue, 28 Feb 2006 12:41: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 k1SCftIC019279 for perforce@freebsd.org; Tue, 28 Feb 2006 12:41:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 12:41:55 GMT Message-Id: <200602281241.k1SCftIC019279@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 92523 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 12:42:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=92523 Change 92523 by rwatson@rwatson_peppercorn on 2006/02/28 12:41:03 Test for auditon() system call and provide a compile-time definition if it is available; this will make it possibly to not compile some run-time audit tools (such as audit, auditd) and components of libbsm on systems without the system calls -- otherwise you may get linking errors due to undefined symbols. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#10 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#10 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#11 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#12 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -22814,6 +22814,68 @@ rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +# Systems may not define key audit system calls, in which case libbsm cannot +# depend on them or it will generate link-time or run-time errors. Test for +# just one. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + int err; + + err = auditon(0, NULL, 0); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' + { (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 + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_AUDIT_SYSCALLS +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile tools/Makefile" ==== //depot/projects/trustedbsd/openbsm/configure.ac#13 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#12 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#13 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -74,6 +74,20 @@ AC_DEFINE(HAVE_FULL_QUEUE_H,, Define if queue.h includes LIST_FIRST) ]) +# Systems may not define key audit system calls, in which case libbsm cannot +# depend on them or it will generate link-time or run-time errors. Test for +# just one. +AC_TRY_LINK([ + #include + #include +], [ + int err; + + err = auditon(0, NULL, 0); +], [ +AC_DEFINE(HAVE_AUDIT_SYSCALLS,, Define if audit system calls present) +]) + AC_CONFIG_FILES([Makefile bin/Makefile bin/audit/Makefile From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 13:56:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B1FA16A422 for ; Tue, 28 Feb 2006 13:56:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1ED0343D48 for ; Tue, 28 Feb 2006 13:56:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E4C8C46BA8 for ; Tue, 28 Feb 2006 08:56:08 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 96E1A5581F; Tue, 28 Feb 2006 13:56:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 82A2516A423; Tue, 28 Feb 2006 13:56: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 261A916A420 for ; Tue, 28 Feb 2006 13:56: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 D783843D45 for ; Tue, 28 Feb 2006 13:56:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1SDuPtF029222 for ; Tue, 28 Feb 2006 13:56:25 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 k1SDuPCF029219 for perforce@freebsd.org; Tue, 28 Feb 2006 13:56:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 13:56:25 GMT Message-Id: <200602281356.k1SDuPCF029219@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 92524 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 13:56:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=92524 Change 92524 by rwatson@rwatson_peppercorn on 2006/02/28 13:56:24 Expose results of audit system call test not just as a config.h entry, but also to Makefiles so that components can be conditionally built. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#6 edit .. //depot/projects/trustedbsd/openbsm/configure#11 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#6 (text+ko) ==== @@ -3,6 +3,9 @@ /* Define to 1 if you have the `alarm' function. */ #undef HAVE_ALARM +/* Define if audit system calls present */ +#undef HAVE_AUDIT_SYSCALLS + /* Define to 1 if you have the `bzero' function. */ #undef HAVE_BZERO ==== //depot/projects/trustedbsd/openbsm/configure#11 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#12 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#13 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -466,7 +466,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fast depCXX_TRUE am__fastdepCXX_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fast depCXX_TRUE am__fastdepCXX_FALSE LIBOBJS HAVE_AUDIT_SYSCALLS_TRUE HAVE_AUDIT_SYSCALLS_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -22867,15 +22867,29 @@ #define HAVE_AUDIT_SYSCALLS _ACEOF +have_audit_syscalls=true else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + +have_audit_syscalls=false + fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + +if $have_audit_syscalls; then + HAVE_AUDIT_SYSCALLS_TRUE= + HAVE_AUDIT_SYSCALLS_FALSE='#' +else + HAVE_AUDIT_SYSCALLS_TRUE='#' + HAVE_AUDIT_SYSCALLS_FALSE= +fi + + ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile tools/Makefile" @@ -22998,6 +23012,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_AUDIT_SYSCALLS_TRUE}" && test -z "${HAVE_AUDIT_SYSCALLS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_AUDIT_SYSCALLS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_AUDIT_SYSCALLS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -23608,6 +23629,8 @@ s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t +s,@HAVE_AUDIT_SYSCALLS_TRUE@,$HAVE_AUDIT_SYSCALLS_TRUE,;t t +s,@HAVE_AUDIT_SYSCALLS_FALSE@,$HAVE_AUDIT_SYSCALLS_FALSE,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF ==== //depot/projects/trustedbsd/openbsm/configure.ac#14 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#13 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#14 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -86,7 +86,11 @@ err = auditon(0, NULL, 0); ], [ AC_DEFINE(HAVE_AUDIT_SYSCALLS,, Define if audit system calls present) +have_audit_syscalls=true +], [ +have_audit_syscalls=false ]) +AM_CONDITIONAL(HAVE_AUDIT_SYSCALLS, $have_audit_syscalls) AC_CONFIG_FILES([Makefile bin/Makefile From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 14:00:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C6DC716A422 for ; Tue, 28 Feb 2006 14:00:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 383DF43D46 for ; Tue, 28 Feb 2006 14:00:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2F8AC46BDA for ; Tue, 28 Feb 2006 09:00:25 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 04EFF58E1B; Tue, 28 Feb 2006 14:00:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D20716A426; Tue, 28 Feb 2006 14:00: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 A6F5D16A424 for ; Tue, 28 Feb 2006 14:00:31 +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 6EE1E43D46 for ; Tue, 28 Feb 2006 14:00:31 +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 k1SE0Vae029529 for ; Tue, 28 Feb 2006 14:00:31 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 k1SE0UlA029526 for perforce@freebsd.org; Tue, 28 Feb 2006 14:00:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:00:30 GMT Message-Id: <200602281400.k1SE0UlA029526@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 92525 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 14:00:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=92525 Change 92525 by rwatson@rwatson_peppercorn on 2006/02/28 13:59:39 Regenerate configure with the right $P4$ from configure.ac update. Build audit, auditd based on HAVE_AUDIT_SYSCALLS. Compile and link bsm_wrappers.c and bsm_notify.c into HAVE_AUDIT_SYSCALLS based on HAVE_AUDIT_SYSCALLS. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/Makefile.am#2 edit .. //depot/projects/trustedbsd/openbsm/configure#12 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.am#2 (text+ko) ==== @@ -1,10 +1,13 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#2 $ # SUBDIRS = \ - audit \ - auditd \ auditreduce \ - praudit + praudit +if HAVE_AUDIT_SYSCALLS +SUBDIRS += \ + audit \ + auditd +endif ==== //depot/projects/trustedbsd/openbsm/configure#12 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#13 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#14 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) @@ -14,10 +14,14 @@ bsm_flags.c \ bsm_io.c \ bsm_mask.c \ + bsm_token.c \ + bsm_user.c + +if HAVE_AUDIT_SYSCALLS +libbsm_la_SOURCES += \ bsm_notify.c \ - bsm_token.c \ - bsm_user.c \ bsm_wrappers.c +endif man3_MANS = \ au_class.3 \ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 14:02:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4004F16A420 for ; Tue, 28 Feb 2006 14:02:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9568F43D46 for ; Tue, 28 Feb 2006 14:02:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 402B746B7F for ; Tue, 28 Feb 2006 09:02:18 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3A4635547A; Tue, 28 Feb 2006 14:02:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2709316A423; Tue, 28 Feb 2006 14:02: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 C78F216A420 for ; Tue, 28 Feb 2006 14:02: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 7CB9343D45 for ; Tue, 28 Feb 2006 14:02: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 k1SE2YFF029754 for ; Tue, 28 Feb 2006 14:02: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 k1SE2YGv029751 for perforce@freebsd.org; Tue, 28 Feb 2006 14:02:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:02:34 GMT Message-Id: <200602281402.k1SE2YGv029751@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 92526 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 14:02:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=92526 Change 92526 by rwatson@rwatson_peppercorn on 2006/02/28 14:02:20 Update for HAVE_AUDIT_SYSCALLS AM_CONDITIONAL() in configure. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/man/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#3 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -105,6 +105,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#3 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -39,6 +39,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@HAVE_AUDIT_SYSCALLS_TRUE@am__append_1 = \ +@HAVE_AUDIT_SYSCALLS_TRUE@ audit \ +@HAVE_AUDIT_SYSCALLS_TRUE@ auditd + subdir = bin DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -58,7 +62,7 @@ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = auditreduce praudit audit auditd DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -89,6 +93,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -159,12 +165,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = \ - audit \ - auditd \ - auditreduce \ - praudit - +SUBDIRS = auditreduce praudit $(am__append_1) all: all-recursive .SUFFIXES: ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#3 $ # srcdir = @srcdir@ @@ -104,6 +104,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#3 $ # srcdir = @srcdir@ @@ -104,6 +104,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#3 $ # srcdir = @srcdir@ @@ -104,6 +104,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#3 $ # srcdir = @srcdir@ @@ -104,6 +104,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#3 $ # srcdir = @srcdir@ @@ -93,6 +93,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#3 $ # srcdir = @srcdir@ @@ -40,6 +40,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@HAVE_AUDIT_SYSCALLS_TRUE@am__append_1 = \ +@HAVE_AUDIT_SYSCALLS_TRUE@ bsm_notify.c \ +@HAVE_AUDIT_SYSCALLS_TRUE@ bsm_wrappers.c + subdir = libbsm DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -59,9 +63,14 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libbsm_la_LIBADD = +am__libbsm_la_SOURCES_DIST = bsm_audit.c bsm_class.c bsm_control.c \ + bsm_event.c bsm_flags.c bsm_io.c bsm_mask.c bsm_token.c \ + bsm_user.c bsm_notify.c bsm_wrappers.c +@HAVE_AUDIT_SYSCALLS_TRUE@am__objects_1 = bsm_notify.lo \ +@HAVE_AUDIT_SYSCALLS_TRUE@ bsm_wrappers.lo am_libbsm_la_OBJECTS = bsm_audit.lo bsm_class.lo bsm_control.lo \ - bsm_event.lo bsm_flags.lo bsm_io.lo bsm_mask.lo bsm_notify.lo \ - bsm_token.lo bsm_user.lo bsm_wrappers.lo + bsm_event.lo bsm_flags.lo bsm_io.lo bsm_mask.lo bsm_token.lo \ + bsm_user.lo $(am__objects_1) libbsm_la_OBJECTS = $(am_libbsm_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp @@ -75,7 +84,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libbsm_la_SOURCES) -DIST_SOURCES = $(libbsm_la_SOURCES) +DIST_SOURCES = $(am__libbsm_la_SOURCES_DIST) man3dir = $(mandir)/man3 NROFF = nroff MANS = $(man3_MANS) @@ -111,6 +120,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -183,19 +194,9 @@ target_alias = @target_alias@ INCLUDES = -I$(top_srcdir) lib_LTLIBRARIES = libbsm.la -libbsm_la_SOURCES = \ - bsm_audit.c \ - bsm_class.c \ - bsm_control.c \ - bsm_event.c \ - bsm_flags.c \ - bsm_io.c \ - bsm_mask.c \ - bsm_notify.c \ - bsm_token.c \ - bsm_user.c \ - bsm_wrappers.c - +libbsm_la_SOURCES = bsm_audit.c bsm_class.c bsm_control.c bsm_event.c \ + bsm_flags.c bsm_io.c bsm_mask.c bsm_token.c bsm_user.c \ + $(am__append_1) man3_MANS = \ au_class.3 \ au_control.3 \ ==== //depot/projects/trustedbsd/openbsm/man/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#3 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -85,6 +85,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/tools/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#3 $ # srcdir = @srcdir@ @@ -101,6 +101,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 14:07:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7178216A444 for ; Tue, 28 Feb 2006 14:07:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBA4443D48 for ; Tue, 28 Feb 2006 14:07:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 11E3A46B7F for ; Tue, 28 Feb 2006 09:07:24 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C397855D03; Tue, 28 Feb 2006 14:07:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AF70016A424; Tue, 28 Feb 2006 14:07: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 5446C16A420 for ; Tue, 28 Feb 2006 14:07:41 +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 1DA2D43D48 for ; Tue, 28 Feb 2006 14:07:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1SE7fxf029967 for ; Tue, 28 Feb 2006 14:07:41 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 k1SE7eOC029964 for perforce@freebsd.org; Tue, 28 Feb 2006 14:07:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:07:40 GMT Message-Id: <200602281407.k1SE7eOC029964@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 92527 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 14:07:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=92527 Change 92527 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 14:07:01 Only implement au_close() if audit system calls are available, as otherwise we can't submit it. au_close_buffer() remains available even without audit system calls, so the remainder of the record construction calls remain useful. (Linux) Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#21 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#21 $ */ #include @@ -266,11 +266,13 @@ pthread_mutex_unlock(&mutex); } +#ifdef HAVE_AUDIT_SYSCALLS /* * Add the header token, identify any missing tokens. Write out the tokens to * the record memory and finally, call audit. */ -int au_close(int d, int keep, short event) +int +au_close(int d, int keep, short event) { au_record_t *rec; size_t tot_rec_size; @@ -318,6 +320,7 @@ au_teardown(rec); return (retval); } +#endif /* HAVE_AUDIT_SYSCALLS */ /* * au_close(), except onto an in-memory buffer. Buffer size as an argument, From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 14:07:47 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C78A16A420 for ; Tue, 28 Feb 2006 14:07:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B03F943D45 for ; Tue, 28 Feb 2006 14:07:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F41B146BDF for ; Tue, 28 Feb 2006 09:07:27 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 68C3D57FAE; Tue, 28 Feb 2006 14:07:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 01BB116A443; Tue, 28 Feb 2006 14:07:42 +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 9E68216A422 for ; Tue, 28 Feb 2006 14:07:41 +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 6956743D4C for ; Tue, 28 Feb 2006 14:07:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1SE7f4p029973 for ; Tue, 28 Feb 2006 14:07:41 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 k1SE7fiT029970 for perforce@freebsd.org; Tue, 28 Feb 2006 14:07:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:07:41 GMT Message-Id: <200602281407.k1SE7fiT029970@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 92528 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 14:07:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92528 Change 92528 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 14:07:32 Don't implement au_to_me() unless audit system calls are available. (Linux) Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#41 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#41 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#41 $ */ #include @@ -1012,7 +1012,7 @@ tid)); } -#if !defined(_KERNEL) && !defined(KERNEL) +#if !defined(_KERNEL) && !defined(KERNEL) && defined(HAVE_AUDIT_SYSCALLS) /* * Collects audit information for the current process * and creates a subject token from it From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 14:08:46 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D43B316A420 for ; Tue, 28 Feb 2006 14:08:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8DB743D46 for ; Tue, 28 Feb 2006 14:08:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3444946B7F for ; Tue, 28 Feb 2006 09:08:26 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C1B4B55C4D; Tue, 28 Feb 2006 14:08:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AED4516A423; Tue, 28 Feb 2006 14:08: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 5B61616A420 for ; Tue, 28 Feb 2006 14:08: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 2757943D46 for ; Tue, 28 Feb 2006 14:08:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1SE8ha4030087 for ; Tue, 28 Feb 2006 14:08:43 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 k1SE8gvG030084 for perforce@freebsd.org; Tue, 28 Feb 2006 14:08:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:08:42 GMT Message-Id: <200602281408.k1SE8gvG030084@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 92529 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 14:08:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=92529 Change 92529 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 14:08:35 Include libbsm.h instead of audit.h so as to pick up the nested include of time.h. (Linux) Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#6 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 14:28:16 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D2AD16A422 for ; Tue, 28 Feb 2006 14:28:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6388643D45 for ; Tue, 28 Feb 2006 14:28:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B78AB46BEE for ; Tue, 28 Feb 2006 09:27:53 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BF0D055A63; Tue, 28 Feb 2006 14:28:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AC01716A424; Tue, 28 Feb 2006 14:28: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 6959216A422 for ; Tue, 28 Feb 2006 14:28: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 2317843D45 for ; Tue, 28 Feb 2006 14:28:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1SES61C030802 for ; Tue, 28 Feb 2006 14:28:07 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 k1SES6aR030799 for perforce@freebsd.org; Tue, 28 Feb 2006 14:28:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:28:06 GMT Message-Id: <200602281428.k1SES6aR030799@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 92530 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 14:28:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92530 Change 92530 by rwatson@rwatson_peppercorn on 2006/02/28 14:27:11 Update history, install notes, credits for upcoming OpenBSM 1.0 alpha 5. Before release, I'll integrate, merge, and test with audit3 to make sure the fairly heavy set of changes to add portability doesn't disrupt FreeBSD support. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#2 edit .. //depot/projects/trustedbsd/openbsm/README#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#2 (text+ko) ==== @@ -1,3 +1,33 @@ +OpenBSM 1.0 alpha 5 + +- Update install notes to indicate /etc files are to be installed manually. +- On systems without LOG_SECURITY, use LOG_AUTH. +- Convert to autoconf/automake in order to move to a more portable (not + BSD-specific) build infrastructure, and more easy conditional building of + components. Currently, the primary feature loss is that automake does + not have native support for manual symlinks. This will be addressed in a + future OpenBSM release. +- Add compat/queue.h, to be used on systems dated BSD queue macro libraries + (as found on Linux). +- Rename CHANGELOG to HISTORY, as our change log doesn't follow some of the + existing conventions for a CHANGELOG. +- Some private data structures moved from audit.h to audit_internal.h to + prevent inappropriate use by applications and name space pollution. +- Improved detection and use of endian macros using autoconf. +- Avoid non-portable use of struct in6_addr, which is largely opaque. +- Avoid leaking BSD kernel socket related token code to user space in + bsm_token.c. +- Teach System V IPC calls to look for Linux naming variations for certain + struct ipc_perm fields. +- Test for audit system calls, and if not present, don't build + bsm_wrappers.c, bsm_notify.c, audit(8), and auditd(8), which rely on + those system calls. +- au_close() is not implemented on systems that don't have audit system + calls, but au_close_buffer() is. +- Work around missing BSDisms in bsm_wrapper.c. +- Fix nested includes so including libbsm.h in an application on Linux + picks up the necessary definitions. + OpenBSM 1.0 alpha 4 - Remove "audit" user example from audit_user, as it's not present on most @@ -94,4 +124,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#1 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#2 $ ==== //depot/projects/trustedbsd/openbsm/README#16 (text+ko) ==== @@ -25,30 +25,34 @@ Building -OpenBSM is currently built using a series of BSD make files which should -work on both FreeBSD and Darwin. One known issue is that versions of -Darwin prior to 10.3.8 have a nested include of "sys/audit.h" from -"sys/proc.h", which can result in type definition conflicts. If running -with include files from an earlier version of Darwin, the nested include -must be manually removed in order that libbsm can be built, due to -potentially conflicting types resulting from an include of "sys/sysctl.h" -by that file. On Darwin, the use of BSD make must be specified explicitly -by using "bsdmake" rather than "make", which on Darwin refers to GNU make. -Typical invocations from the OpenBSM tree root: +OpenBSM is currently built using autoconf and automake, which should allow +for building on a range of operating systems, including FreeBSD, Mac OS X, +and Linux. Depending on the availability of audit facailities in the +underlying operating system, some components that depend on kernel audit +support are built conditionally. Typically, build will be performed using + + ./configure + make -FreeBSD +To install, use: - % make - # make install + make install -Darwin +You may wish to specify that the OpenBSM components not be installed in the +base system, rather in a specific directory. This may be done using the +--prefix argument to configure. If installing to a specific directory, +remember to update your library path so that running tools from that +directory the correct libbsm is used: - % bsdmake - # bsdmake install + ./configure --prefix=/home/rwatson/openbsm + make + make install + LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH -In both cases, you will need to manually propagate openbsm/etc/* into /etc -on your system; this is not done automatically so as to avoid disrupting -the current configuration. +You will need to manually propagate openbsm/etc/* into /etc on your system; +this is not done automatically so as to avoid disrupting the current +configuration. Currently, the locations of these files is not +configurable. Credits @@ -69,6 +73,7 @@ Christian Brueffer Olivier Houchard Christian Peron + Martin Fong In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -90,4 +95,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#15 $ +$P4: //depot/projects/trustedbsd/openbsm/README#16 $ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 20:39:31 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F49C16A422 for ; Tue, 28 Feb 2006 20:39:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E766643D58 for ; Tue, 28 Feb 2006 20:39:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id DE00146BD7 for ; Tue, 28 Feb 2006 15:39:02 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2B78764AFA; Tue, 28 Feb 2006 20:39:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CAB216A423; Tue, 28 Feb 2006 20:39: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 D2CBA16A420 for ; Tue, 28 Feb 2006 20:39: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 C1DE643D7D for ; Tue, 28 Feb 2006 20:39: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 k1SKdF0k053173 for ; Tue, 28 Feb 2006 20:39: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 k1SKdFJJ053170 for perforce@freebsd.org; Tue, 28 Feb 2006 20:39:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 20:39:15 GMT Message-Id: <200602282039.k1SKdFJJ053170@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 92542 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 20:39:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=92542 Change 92542 by rwatson@rwatson_peppercorn on 2006/02/28 20:38:53 Explicit include of sys/types.h to use sys/ipc.h; this is documented on required on all the platforms I've looked at, but apparently nested includes on most of them mean this didn't turn up intil a build on a recent Darwin. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#13 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#13 (xtext) ==== @@ -20491,6 +20491,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include @@ -20538,6 +20539,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include @@ -20607,6 +20609,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include @@ -20654,6 +20657,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include ==== //depot/projects/trustedbsd/openbsm/configure.ac#15 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#14 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#15 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -35,12 +35,14 @@ AC_CHECK_MEMBER([struct ipc_perm.__key], [AC_DEFINE(HAVE_IPC_PERM___KEY,, Define if ipc_perm.__key instead of key)], [],[ +#include #include ]) AC_CHECK_MEMBER([struct ipc_perm.__seq], [AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq)], [],[ +#include #include ]) From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 20:42:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7DD4716A420 for ; Tue, 28 Feb 2006 20:42:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A828C43D64 for ; Tue, 28 Feb 2006 20:42:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8A49C46BD8 for ; Tue, 28 Feb 2006 15:42:15 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id ADA5163C13; Tue, 28 Feb 2006 20:42:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C78116A423; Tue, 28 Feb 2006 20:42:29 +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 5D36416A420 for ; Tue, 28 Feb 2006 20:42:29 +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 811ED43D66 for ; Tue, 28 Feb 2006 20:42:20 +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 k1SKgJWj053385 for ; Tue, 28 Feb 2006 20:42: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 k1SKgJOe053382 for perforce@freebsd.org; Tue, 28 Feb 2006 20:42:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 20:42:19 GMT Message-Id: <200602282042.k1SKgJOe053382@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 92543 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 20:42:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=92543 Change 92543 by rwatson@rwatson_peppercorn on 2006/02/28 20:41:42 TODO items for man page symlinks, audit system call stubs. Affected files ... .. //depot/projects/trustedbsd/openbsm/TODO#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/TODO#5 (text+ko) ==== @@ -8,5 +8,10 @@ - Document contents of libbsm "public" data structures in libbsm man pages. - The audit.log.5 man page is incomplete, as it does not describe all token types. +- With the move to autoconf/automake, man page symlinks are no longer + installed. This needs to be fixed. +- It might be desirable to be able to provide EOPNOTSUPP system call stubs + on systems that don't have the necessary audit system calls; that would + allow the full libbsm and tool set to build, just not run. -$P4: //depot/projects/trustedbsd/openbsm/TODO#4 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#5 $ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 20:58:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A52616A420 for ; Tue, 28 Feb 2006 20:58:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 52EC643D49 for ; Tue, 28 Feb 2006 20:58:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6AA9846B13 for ; Tue, 28 Feb 2006 15:58:23 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CDD6C56703; Tue, 28 Feb 2006 20:58:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BD02916A423; Tue, 28 Feb 2006 20:58: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 7F81716A420 for ; Tue, 28 Feb 2006 20:58:40 +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 1FC2143D53 for ; Tue, 28 Feb 2006 20:58:40 +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 k1SKweNM061415 for ; Tue, 28 Feb 2006 20:58:40 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 k1SKwdSl061412 for perforce@freebsd.org; Tue, 28 Feb 2006 20:58:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 20:58:39 GMT Message-Id: <200602282058.k1SKwdSl061412@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 92544 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 20:58:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=92544 Change 92544 by rwatson@rwatson_peppercorn on 2006/02/28 20:58:09 In the Darwin world, sysctl.h includes ucred.h, which depends on queue.h. In Darwin's sysctl.h there is also an include of bsm/audit.h, which in the version shipped with Darwin, performs a nested include of queue.h. However, our version of bsm/audit.h does not include queue.h, since we don't expose queue-based data structures in public BSM include files, which means sysctl.h has a missing dependency. On Darwin, therefore, perform an additional include of sys/queue.h. Ideally, Darwin will explicitly include sys/queue.h in sysctl.h to avoid dependence on the nested include, but this is not currently the case. Reported by: Martin Fong Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 $ */ #ifdef __APPLE__ @@ -35,6 +35,11 @@ #include #include + +#ifdef __APPLE__ +#include /* Our bsm/audit.h doesn't include queue.h. */ +#endif + #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 21:01:49 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59B7516A420 for ; Tue, 28 Feb 2006 21:01:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B2B343D45 for ; Tue, 28 Feb 2006 21:01:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 792D246C06 for ; Tue, 28 Feb 2006 16:01:28 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D5CC655976; Tue, 28 Feb 2006 21:01:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C1F0916A423; Tue, 28 Feb 2006 21:01: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 8310C16A420 for ; Tue, 28 Feb 2006 21:01:44 +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 4BE4D43D45 for ; Tue, 28 Feb 2006 21:01: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 k1SL1iZO061549 for ; Tue, 28 Feb 2006 21:01: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 k1SL1h4B061546 for perforce@freebsd.org; Tue, 28 Feb 2006 21:01:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 21:01:43 GMT Message-Id: <200602282101.k1SL1h4B061546@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 92545 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 21:01:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=92545 Change 92545 by rwatson@rwatson_peppercorn on 2006/02/28 21:00:55 Add stdlib.h include for exit() definition. Sort includes. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#6 (text+ko) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#6 $ */ #include + +#include +#include #include -#include #include "auditd.h" From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 23:01:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE9BB16A420 for ; Tue, 28 Feb 2006 23:01:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E8A743D75 for ; Tue, 28 Feb 2006 23:01:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7D33546C06 for ; Tue, 28 Feb 2006 18:01:20 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 404715CE94; Tue, 28 Feb 2006 22:59:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DD4916A423; Tue, 28 Feb 2006 22:59: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 E120416A420 for ; Tue, 28 Feb 2006 22:59:09 +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 873F443D46 for ; Tue, 28 Feb 2006 22:59:09 +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 k1SMx9tm071600 for ; Tue, 28 Feb 2006 22:59:09 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 k1SMx8Vu071597 for perforce@freebsd.org; Tue, 28 Feb 2006 22:59:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 22:59:08 GMT Message-Id: <200602282259.k1SMx8Vu071597@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 92552 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 23:01:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92552 Change 92552 by rwatson@rwatson_peppercorn on 2006/02/28 22:58:58 When checking for auditon(), don't depend on OpenBSM include files for the definition of auditon(). Submitted by: Martin Fong Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#14 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#14 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#14 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#15 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -22828,8 +22828,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + + extern int auditon(int, void *, int); int main () ==== //depot/projects/trustedbsd/openbsm/configure.ac#16 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#15 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#16 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -80,8 +80,9 @@ # depend on them or it will generate link-time or run-time errors. Test for # just one. AC_TRY_LINK([ - #include - #include + #include + + extern int auditon(int, void *, int); ], [ int err; From owner-trustedbsd-cvs@FreeBSD.ORG Fri Mar 3 20:31:03 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A49AF16A422 for ; Fri, 3 Mar 2006 20:31:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7FDF43D48 for ; Fri, 3 Mar 2006 20:31:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 597FA46B03 for ; Fri, 3 Mar 2006 15:30:39 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 29C7655BB4; Fri, 3 Mar 2006 20:28:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1426B16A424; Fri, 3 Mar 2006 20:28: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 C3DE316A420 for ; Fri, 3 Mar 2006 20:28:06 +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 58BC743D48 for ; Fri, 3 Mar 2006 20:28: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 k23KS6MS066002 for ; Fri, 3 Mar 2006 20:28: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 k23KS6Uk065999 for perforce@freebsd.org; Fri, 3 Mar 2006 20:28:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 20:28:06 GMT Message-Id: <200603032028.k23KS6Uk065999@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 92688 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2006 20:31:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=92688 Change 92688 by rwatson@rwatson_zoo on 2006/03/03 20:27:35 Integrate OpenBSM 1.0a5 parts into TrustedBSD audit3 branch: - autoconf/automake. - Support for systems without LOG_SECURITY. - Push more private data structures into audit_internal.h. - Build on Linux, Darwin. - Don't expose internals of in6_addr. - Don't expose au_to_socket() (et al) in user space. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#10 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile#4 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/aclocal.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/autogen.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#5 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile#3 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile#3 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile#4 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile#4 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile#6 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/queue.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.guess#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.sub#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/depcomp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/install-sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/missing#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile#7 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#7 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile#5 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#1 branch Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#10 (text+ko) ==== @@ -25,26 +25,34 @@ Building -OpenBSM is currently built using a series of BSD make files which should -work on both FreeBSD and Darwin. One known issue is that versions of -Darwin prior to 10.3.8 have a nested include of "sys/audit.h" from -"sys/proc.h", which can result in type definition conflicts. If running -with include files from an earlier version of Darwin, the nested include -must be manually removed in order that libbsm can be built, due to -potentially conflicting types resulting from an include of "sys/sysctl.h" -by that file. On Darwin, the use of BSD make must be specified explicitly -by using "bsdmake" rather than "make", which on Darwin refers to GNU make. -Typical invocations from the OpenBSM tree root: +OpenBSM is currently built using autoconf and automake, which should allow +for building on a range of operating systems, including FreeBSD, Mac OS X, +and Linux. Depending on the availability of audit facailities in the +underlying operating system, some components that depend on kernel audit +support are built conditionally. Typically, build will be performed using + + ./configure + make + +To install, use: -FreeBSD + make install - % make - # make install +You may wish to specify that the OpenBSM components not be installed in the +base system, rather in a specific directory. This may be done using the +--prefix argument to configure. If installing to a specific directory, +remember to update your library path so that running tools from that +directory the correct libbsm is used: -Darwin + ./configure --prefix=/home/rwatson/openbsm + make + make install + LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH - % bsdmake - # bsdmake install +You will need to manually propagate openbsm/etc/* into /etc on your system; +this is not done automatically so as to avoid disrupting the current +configuration. Currently, the locations of these files is not +configurable. Credits @@ -65,6 +73,7 @@ Christian Brueffer Olivier Houchard Christian Peron + Martin Fong In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -86,4 +95,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#9 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#10 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#6 (text+ko) ==== @@ -8,5 +8,10 @@ - Document contents of libbsm "public" data structures in libbsm man pages. - The audit.log.5 man page is incomplete, as it does not describe all token types. +- With the move to autoconf/automake, man page symlinks are no longer + installed. This needs to be fixed. +- It might be desirable to be able to provide EOPNOTSUPP system call stubs + on systems that don't have the necessary audit system calls; that would + allow the full libbsm and tool set to build, just not run. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#5 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#6 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#5 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#6 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#3 (text+ko) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#2 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#3 $ */ #include + +#include +#include #include -#include #include "auditd.h" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#7 $ */ #include @@ -795,7 +795,11 @@ } } +#ifdef LOG_SECURITY openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); +#else + openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); +#endif syslog(LOG_INFO, "starting...\n"); if (debug == 0 && daemon(0, 0) == -1) { ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#9 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#9 $ */ #ifndef _BSM_AUDIT_H @@ -240,25 +240,11 @@ }; typedef struct auditpinfo_addr auditpinfo_addr_t; -/* Token and record structures. */ - -struct au_token { - u_char *t_data; - size_t len; - TAILQ_ENTRY(au_token) tokens; -}; +/* + * Contents of token_t are opaque outside of libbsm. + */ typedef struct au_token token_t; -struct au_record { - char used; /* Record currently in use? */ - int desc; /* Descriptor for record. */ - TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ - u_char *data; - size_t len; - LIST_ENTRY(au_record) au_rec_q; -}; -typedef struct au_record au_record_t; - /* * Kernel audit queue control parameters. */ @@ -310,6 +296,9 @@ }; typedef struct au_evclass_map au_evclass_map_t; +/* + * Audit system calls. + */ #if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#7 (text+ko) ==== @@ -34,11 +34,15 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#7 $ */ -#ifndef _LIBBSM_INTERNAL_H -#define _LIBBSM_INTERNAL_H +#ifndef _AUDIT_INTERNAL_H +#define _AUDIT_INTERNAL_H + +#if defined(__linux__) && !defined(__unused) +#define __unused +#endif /* * audit_internal.h contains private interfaces that are shared by user space @@ -47,7 +51,23 @@ * broken with future releases of OpenBSM, which may delete, modify, or * otherwise break these interfaces or the assumptions they rely on. */ +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; + +struct au_record { + char used; /* Record currently in use? */ + int desc; /* Descriptor for record. */ + TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ + u_char *data; + size_t len; + LIST_ENTRY(au_record) au_rec_q; +}; +typedef struct au_record au_record_t; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. @@ -96,4 +116,4 @@ #define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size) -#endif /* !_LIBBSM_INTERNAL_H_ */ +#endif /* !_AUDIT_INTERNAL_H_ */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#8 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#8 $ */ #ifndef _LIBBSM_H_ @@ -42,9 +42,9 @@ #include #include -#include #include /* Required for audit.h. */ +#include /* Required for clock_t on Linux. */ #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#4 (text+ko) ==== @@ -25,18 +25,13 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#3 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#4 $ */ #ifndef _COMPAT_ENDIAN_H_ #define _COMPAT_ENDIAN_H_ /* - * Pick up value of BYTE_ORDER/_BYTE_ORDER if not yet included. - */ -#include - -/* * Some systems will have the uint/int types defined here already, others * will need stdint.h. */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#8 (text+ko) ==== @@ -30,11 +30,21 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#8 $ */ #include + +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else +#include +#endif +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ #include #include @@ -256,11 +266,13 @@ pthread_mutex_unlock(&mutex); } +#ifdef HAVE_AUDIT_SYSCALLS /* * Add the header token, identify any missing tokens. Write out the tokens to * the record memory and finally, call audit. */ -int au_close(int d, int keep, short event) +int +au_close(int d, int keep, short event) { au_record_t *rec; size_t tot_rec_size; @@ -308,6 +320,7 @@ au_teardown(rec); return (retval); } +#endif /* HAVE_AUDIT_SYSCALLS */ /* * au_close(), except onto an in-memory buffer. Buffer size as an argument, ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#10 (text+ko) ==== @@ -31,15 +31,37 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#10 $ */ #include -#ifdef __APPLE__ + +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_SYS_ENDIAN_H +#include +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#else /* !__APPLE__ */ +#endif /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ +#else /* !HAVE_CONFIG_H */ #include -#endif /* __APPLE__*/ +#include +#endif /* !HAVE_CONFIG_H */ + #include #include @@ -381,10 +403,7 @@ break; case AU_IPv6: - ipv6.__u6_addr.__u6_addr32[0] = ipaddr[0]; - ipv6.__u6_addr.__u6_addr32[1] = ipaddr[1]; - ipv6.__u6_addr.__u6_addr32[2] = ipaddr[2]; - ipv6.__u6_addr.__u6_addr32[3] = ipaddr[3]; + bcopy(ipaddr, &ipv6, sizeof(ipv6)); fprintf(fp, "%s", inet_ntop(AF_INET6, &ipv6, dst, INET6_ADDRSTRLEN)); break; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#8 (text+ko) ==== @@ -27,11 +27,21 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#8 $ */ #include + +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#7 (text+ko) ==== @@ -26,18 +26,39 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#7 $ */ /* * Based on sample code from Marc Majka. */ -#include /* strerror() */ -#include /* errno */ +#include + +#ifdef HAVE_CONFIG_H + +#include + +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ + +#else /* !HAVE_CONFIG_H */ + +#include + +#endif /* !HAVE_CONFIG_H */ + +#include #include -#include /* uint32_t */ -#include /* syslog() */ -#include /* syslog() */ + +#include +#include +#include +#include +#include + #ifdef __APPLE__ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#10 (text+ko) ==== @@ -30,15 +30,37 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#10 $ */ #include -#ifdef __APPLE__ + +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_SYS_ENDIAN_H +#include +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#else /* !__APPLE__ */ +#endif /* !HAVE_SYS_ENDIANG_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ +#else /* !HAVE_CONFIG_H */ #include -#endif /* __APPLE__*/ +#include +#endif /* !HAVE_CONFIG_H */ + #include #include #include @@ -352,10 +374,7 @@ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); return (t); } @@ -448,9 +467,18 @@ ADD_U_INT16(dptr, perm->mode); ADD_U_INT16(dptr, pad0); + +#ifdef HAVE_IPC_PERM___SEQ + ADD_U_INT16(dptr, perm->__seq); +#else ADD_U_INT16(dptr, perm->seq); +#endif +#ifdef HAVE_IPC_PERM___KEY + ADD_U_INT32(dptr, perm->__key); +#else ADD_U_INT32(dptr, perm->key); +#endif return (t); } @@ -781,50 +809,6 @@ /* * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * local Internet address 4 bytes - * remote port 2 bytes - * remote Internet address 4 bytes - */ -token_t * -au_to_socket(struct socket *so) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * address type/length 4 bytes - * local Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - * remote port 4 bytes - * address type/length 4 bytes - * remote Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - */ -token_t * -au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -token_t * -au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte * socket family 2 bytes * path 104 bytes */ @@ -898,10 +882,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); return (t); @@ -1031,7 +1012,7 @@ tid)); } -#if !defined(_KERNEL) && !defined(KERNEL) +#if !defined(_KERNEL) && !defined(KERNEL) && defined(HAVE_AUDIT_SYSCALLS) /* * Collects audit information for the current process * and creates a subject token from it ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#8 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#9 $ */ #ifdef __APPLE__ @@ -35,6 +35,11 @@ #include #include + +#ifdef __APPLE__ +#include /* Our bsm/audit.h doesn't include queue.h. */ +#endif + #include #include @@ -56,7 +61,11 @@ if (p == NULL) return (kAUBadParamErr); +#ifdef NODEV *p = NODEV; +#else + *p = -1; +#endif /* for /usr/bin/login, try fstat() first */ if (fstat(STDIN_FILENO, &st) != 0) { @@ -78,6 +87,8 @@ int audit_set_terminal_host(uint32_t *m) { + +#ifdef KERN_HOSTID int name[2] = { CTL_KERN, KERN_HOSTID }; size_t len; @@ -90,6 +101,10 @@ return (kAUSysctlErr); } return (kAUNoErr); +#else + *m = -1; + return (kAUNoErr); +#endif } int From owner-trustedbsd-cvs@FreeBSD.ORG Fri Mar 3 21:51:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C4D516A420 for ; Fri, 3 Mar 2006 21:51:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5784B43D46 for ; Fri, 3 Mar 2006 21:51:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 006EB46B3F for ; Fri, 3 Mar 2006 16:51:33 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7139F5583D; Fri, 3 Mar 2006 21:51:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6100116A423; Fri, 3 Mar 2006 21:51: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 1DD6516A420 for ; Fri, 3 Mar 2006 21:51:51 +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 CCF3043D46 for ; Fri, 3 Mar 2006 21:51:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k23LpodG077491 for ; Fri, 3 Mar 2006 21:51:50 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 k23LpnOm077486 for perforce@freebsd.org; Fri, 3 Mar 2006 21:51:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 21:51:49 GMT Message-Id: <200603032151.k23LpnOm077486@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 92694 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2006 21:51:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=92694 Change 92694 by rwatson@rwatson_zoo on 2006/03/03 21:51:17 Assume that config.h will be present; don't attempt to provide FreeBSD default includes when HAVE_CONFIG_H isn't defined. While we can do the includes without config.h, the conditionally compiled system call code works best with a config.h, so we'll want to provide a configured config.h in the FreeBSD vendor import, similar to the approach taken in OpenSSH. This mildly de-obfuscates the includes here also. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 (text+ko) ==== @@ -30,21 +30,17 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_FULL_QUEUE_H #include #else #include #endif -#else /* !HAVE_CONFIG_H */ -#include -#endif /* !HAVE_CONFIG_H */ #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 (text+ko) ==== @@ -31,12 +31,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_SYS_ENDIAN_H #include @@ -57,10 +56,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#include -#endif /* !HAVE_CONFIG_H */ #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 (text+ko) ==== @@ -27,21 +27,17 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 $ */ /* @@ -34,22 +34,13 @@ */ #include -#ifdef HAVE_CONFIG_H - #include - #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ - -#include - -#endif /* !HAVE_CONFIG_H */ - #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 (text+ko) ==== @@ -30,12 +30,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#41 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_SYS_ENDIAN_H #include @@ -56,10 +55,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#include -#endif /* !HAVE_CONFIG_H */ #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Fri Mar 3 21:58:45 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 423BB16A420 for ; Fri, 3 Mar 2006 21:58:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FEAF43D5E for ; Fri, 3 Mar 2006 21:58:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7BF7D46B29 for ; Fri, 3 Mar 2006 16:58:14 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6170372660; Fri, 3 Mar 2006 21:56:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 343E116A46F; Fri, 3 Mar 2006 21:55: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 7363316A44A for ; Fri, 3 Mar 2006 21:55: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 B8A7B43D46 for ; Fri, 3 Mar 2006 21:55: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 k23Ltuws077687 for ; Fri, 3 Mar 2006 21:55: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 k23Ltufb077684 for perforce@freebsd.org; Fri, 3 Mar 2006 21:55:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 21:55:56 GMT Message-Id: <200603032155.k23Ltufb077684@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 92696 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2006 21:58:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=92696 Change 92696 by rwatson@rwatson_zoo on 2006/03/03 21:55:51 Provide a config.h for FreeBSD. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Fri Mar 3 21:58:45 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CE5616A420 for ; Fri, 3 Mar 2006 21:58:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DF9343D66 for ; Fri, 3 Mar 2006 21:58:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6A56846B10 for ; Fri, 3 Mar 2006 16:58:11 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0131459178; Fri, 3 Mar 2006 21:55:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E513516A423; Fri, 3 Mar 2006 21:55: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 B02EC16A420 for ; Fri, 3 Mar 2006 21:55:56 +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 6ABE243D46 for ; Fri, 3 Mar 2006 21:55: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 k23LtuIM077681 for ; Fri, 3 Mar 2006 21:55: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 k23LtuIK077677 for perforce@freebsd.org; Fri, 3 Mar 2006 21:55:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 21:55:56 GMT Message-Id: <200603032155.k23LtuIK077677@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 92695 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2006 21:58:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=92695 Change 92695 by rwatson@rwatson_zoo on 2006/03/03 21:55:14 Integrate OpenBSM change: do rely on presence of config.h. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#11 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#9 (text+ko) ==== @@ -30,21 +30,17 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#9 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_FULL_QUEUE_H #include #else #include #endif -#else /* !HAVE_CONFIG_H */ -#include -#endif /* !HAVE_CONFIG_H */ #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#11 (text+ko) ==== @@ -31,12 +31,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#11 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_SYS_ENDIAN_H #include @@ -57,10 +56,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#include -#endif /* !HAVE_CONFIG_H */ #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#9 (text+ko) ==== @@ -27,21 +27,17 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#9 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#8 $ */ /* @@ -34,22 +34,13 @@ */ #include -#ifdef HAVE_CONFIG_H - #include - #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ - -#include - -#endif /* !HAVE_CONFIG_H */ - #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#11 (text+ko) ==== @@ -30,12 +30,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#11 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_SYS_ENDIAN_H #include @@ -56,10 +55,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#include -#endif /* !HAVE_CONFIG_H */ #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Fri Mar 3 22:04:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BCDF16A431 for ; Fri, 3 Mar 2006 22:04:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7236043D6B for ; Fri, 3 Mar 2006 22:04:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D200346BDA for ; Fri, 3 Mar 2006 17:04:09 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 959A658237; Fri, 3 Mar 2006 22:04:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 56E3016A423; Fri, 3 Mar 2006 22:04: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 165FB16A420 for ; Fri, 3 Mar 2006 22:04:13 +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 4D20043D62 for ; Fri, 3 Mar 2006 22:04:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k23M47CE078138 for ; Fri, 3 Mar 2006 22:04:07 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 k23M46Ui078135 for perforce@freebsd.org; Fri, 3 Mar 2006 22:04:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 22:04:06 GMT Message-Id: <200603032204.k23M46Ui078135@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 92697 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2006 22:04:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=92697 Change 92697 by rwatson@rwatson_zoo on 2006/03/03 22:03:23 Update FreeBSD integration notes for post-autoconf world. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#2 (text) ==== @@ -1,7 +1,33 @@ Upgrade Instructions for OpenBSM -------------------------------- -Currently this is very straight forward: +OpenBSM integrates into the FreeBSD source tree in several places: + +src/contrib/openbsm The OpenBSM distribution itself +src/sys/bsm Modified versions of some bsm/ include files +src/sys/security/audit Kernel audit framework, some OpenBSM-based files +src/usr.sbin/*audit* Makefiles for various OpenBSM tools +src/etc/Makefile Installation of /etc OpenBSM files +src/lib/libbsm/* Build for OpenBSM library + +OpenBSM is normally built using an integrated autoconf/automake build +system. For the purposes of tight integration with FreeBSD, we use an +adapted BSD make (bmake) build system loosely based on the autmake +setup. We also rely on a static config.h generated when OpenBSM is +imported, rather than re-configuring every build. This leads to a +more reproduceable build environment, and avoids dependence on things +not in the base tree (i.e., autoconf, automake, GNU make, etc). An +upgrade of OpenBSM generally involves the following steps: + +- Vendor import of OpenBSM into src/contrib. +- Run configure, commit src/contrib/openbsm/config/config.h. +- Replication of src/contrib/openbsm/bsm changes into src/sys/bsm. +- Possible updates to src/sys/security/audit, especially relating to + bsm_token.c. +- Update any library, tool, or etc BSD Makefiles to add new files, + defines, or other generally useful or necessary things. + +Normally, the CVS vendor import goes along the following lines: cd ~/p4/projects/trustedbsd/openbsm cvs -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import src/contrib/openbsm \ @@ -10,10 +36,9 @@ Replacing the version string as required. Use the "-n" argument to CVS to do a test run. -Right now, no local FreeBSD modification or configuration is required. In -future OpenBSM versions, this is likely to change. - -After importing OpenBSM, make sure to propagate any changes to files that -appear in both contrib/openbsm/bsm and sys/bsm. +Propagation of changes to src/sys/{bsm,security/audit} is something that +requires careful coordination and attention to detail. These files are +not on CVS vendor branches, but do have the same local vs. vendor merge +issues. $FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.2 2006/02/06 00:03:39 rwatson Exp $ From owner-trustedbsd-cvs@FreeBSD.ORG Fri Mar 3 22:39:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00C0916A420 for ; Fri, 3 Mar 2006 22:39:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3259243D4C for ; Fri, 3 Mar 2006 22:39:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D7CE146C0A for ; Fri, 3 Mar 2006 17:39:33 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D9B5A5556B; Fri, 3 Mar 2006 22:39:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C98C116A423; Fri, 3 Mar 2006 22:39: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 A2F4C16A420 for ; Fri, 3 Mar 2006 22:39:52 +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 5984043D4C for ; Fri, 3 Mar 2006 22:39:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k23MdqsP079645 for ; Fri, 3 Mar 2006 22:39:52 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 k23MdpZC079627 for perforce@freebsd.org; Fri, 3 Mar 2006 22:39:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 22:39:51 GMT Message-Id: <200603032239.k23MdpZC079627@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 92701 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2006 22:39:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=92701 Change 92701 by rwatson@rwatson_zoo on 2006/03/03 22:39:36 Integrate recent OpenBSM changes into src/sys/bsm and src/sys/security/audit. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#24 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#22 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#9 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#24 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#23 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#24 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.2 2006/02/01 19:54:22 rwatson Exp $ */ @@ -258,25 +258,11 @@ }; typedef struct auditpinfo_addr auditpinfo_addr_t; -/* Token and record structures. */ - -struct au_token { - u_char *t_data; - size_t len; - TAILQ_ENTRY(au_token) tokens; -}; +/* + * Contents of token_t are opaque outside of libbsm. + */ typedef struct au_token token_t; -struct au_record { - char used; /* Record currently in use? */ - int desc; /* Descriptor for record. */ - TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ - u_char *data; - size_t len; - LIST_ENTRY(au_record) au_rec_q; -}; -typedef struct au_record au_record_t; - /* * Kernel audit queue control parameters. */ @@ -328,6 +314,9 @@ }; typedef struct au_evclass_map au_evclass_map_t; +/* + * Audit system calls. + */ #if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#7 (text+ko) ==== @@ -34,11 +34,15 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#6 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#7 $ */ -#ifndef _LIBBSM_INTERNAL_H -#define _LIBBSM_INTERNAL_H +#ifndef _AUDIT_INTERNAL_H +#define _AUDIT_INTERNAL_H + +#if defined(__linux__) && !defined(__unused) +#define __unused +#endif /* * audit_internal.h contains private interfaces that are shared by user space @@ -47,7 +51,23 @@ * broken with future releases of OpenBSM, which may delete, modify, or * otherwise break these interfaces or the assumptions they rely on. */ +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; + +struct au_record { + char used; /* Record currently in use? */ + int desc; /* Descriptor for record. */ + TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ + u_char *data; + size_t len; + LIST_ENTRY(au_record) au_rec_q; +}; +typedef struct au_record au_record_t; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. @@ -96,4 +116,4 @@ #define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size) -#endif /* !_LIBBSM_INTERNAL_H_ */ +#endif /* !_AUDIT_INTERNAL_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#22 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#21 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#22 $ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.5 2006/02/06 01:12:46 rwatson Exp $ */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#10 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#9 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#10 $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#9 (text+ko) ==== @@ -30,15 +30,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#9 $ */ #include -#ifdef __APPLE__ -#include -#else /* !__APPLE__ */ #include -#endif /* __APPLE__*/ #include #include @@ -326,10 +322,7 @@ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); return (t); } @@ -416,9 +409,18 @@ ADD_U_INT16(dptr, perm->mode); ADD_U_INT16(dptr, pad0); + +#ifdef HAVE_IPC_PERM___SEQ + ADD_U_INT16(dptr, perm->__seq); +#else ADD_U_INT16(dptr, perm->seq); +#endif +#ifdef HAVE_IPC_PERM___KEY + ADD_U_INT32(dptr, perm->__key); +#else ADD_U_INT32(dptr, perm->key); +#endif return (t); } @@ -864,10 +866,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); return (t); @@ -991,7 +990,7 @@ tid)); } -#if !defined(_KERNEL) && !defined(KERNEL) +#if !defined(_KERNEL) && !defined(KERNEL) && defined(HAVE_AUDIT_SYSCALLS) /* * Collects audit information for the current process * and creates a subject token from it From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 13:47:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8EB016A420 for ; Sat, 4 Mar 2006 13:47:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA55043D55 for ; Sat, 4 Mar 2006 13:47:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6C5DD46C20 for ; Sat, 4 Mar 2006 08:46:48 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AEF1F56373; Sat, 4 Mar 2006 13:47:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D0E916A423; Sat, 4 Mar 2006 13:47: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 74D6F16A420 for ; Sat, 4 Mar 2006 13:47:06 +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 EE2AD43D53 for ; Sat, 4 Mar 2006 13:47: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 k24Dl2MI045543 for ; Sat, 4 Mar 2006 13:47: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 k24Dl2iq045540 for perforce@freebsd.org; Sat, 4 Mar 2006 13:47:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 13:47:02 GMT Message-Id: <200603041347.k24Dl2iq045540@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 92721 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 13:47:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=92721 Change 92721 by rwatson@rwatson_zoo on 2006/03/04 13:46:13 Forward declare struct au_record so that having it as a function argument for functions declared in audit_private.h does not require all consumers of the include file to include bsm/audit_internal.h. Remove nested include of audit.h, since all consumers include it already. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#18 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#18 (text+ko) ==== @@ -240,6 +240,7 @@ * Functions relating to the conversion of internal kernel audit records to * the BSM file format. */ +struct au_record; int kaudit_to_bsm(struct kaudit_record *kar, struct au_record **pau); int bsm_rec_verify(void *rec); @@ -266,7 +267,6 @@ #include #include #include -#include /* * Some of the BSM tokenizer functions take different parameters in the From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 14:03:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6440A16A420 for ; Sat, 4 Mar 2006 14:03:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C728043D45 for ; Sat, 4 Mar 2006 14:03:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5D9D446B55 for ; Sat, 4 Mar 2006 09:02:46 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 08609558F3; Sat, 4 Mar 2006 14:01:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EAA0216A423; Sat, 4 Mar 2006 14:01:22 +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 B7B6616A420 for ; Sat, 4 Mar 2006 14:01:22 +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 8150943D45 for ; Sat, 4 Mar 2006 14:01:22 +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 k24E1MIh046254 for ; Sat, 4 Mar 2006 14:01:22 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 k24E1Lb5046251 for perforce@freebsd.org; Sat, 4 Mar 2006 14:01:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 14:01:21 GMT Message-Id: <200603041401.k24E1Lb5046251@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 92722 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 14:03:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=92722 Change 92722 by rwatson@rwatson_peppercorn on 2006/03/04 14:00:45 Avoid wildcards in the upgrade instructions, as it may lead to problems in the future if other files matching the wildcards are not OpenBSM-derived (especially in usr.sbin). Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#3 (text) ==== @@ -6,9 +6,12 @@ src/contrib/openbsm The OpenBSM distribution itself src/sys/bsm Modified versions of some bsm/ include files src/sys/security/audit Kernel audit framework, some OpenBSM-based files -src/usr.sbin/*audit* Makefiles for various OpenBSM tools +src/usr.sbin/audit Makefiles for OpenBSM-derived command +src/usr.sbin/auditd "" +src/usr.sbin/auditreduce "" +src/usr.sbin/praudit "" src/etc/Makefile Installation of /etc OpenBSM files -src/lib/libbsm/* Build for OpenBSM library +src/lib/libbsm Build for OpenBSM library OpenBSM is normally built using an integrated autoconf/automake build system. For the purposes of tight integration with FreeBSD, we use an From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 14:13:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0030816A422 for ; Sat, 4 Mar 2006 14:13:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 925BE43D64 for ; Sat, 4 Mar 2006 14:12:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0FFBF46C30 for ; Sat, 4 Mar 2006 09:12:39 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4BD0756324; Sat, 4 Mar 2006 14:12:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 37D1E16A424; Sat, 4 Mar 2006 14:12:38 +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 EE33E16A420 for ; Sat, 4 Mar 2006 14:12: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 A39F943D62 for ; Sat, 4 Mar 2006 14:12: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 k24ECaH4046622 for ; Sat, 4 Mar 2006 14:12: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 k24ECake046619 for perforce@freebsd.org; Sat, 4 Mar 2006 14:12:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 14:12:36 GMT Message-Id: <200603041412.k24ECake046619@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 92723 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 14:13:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=92723 Change 92723 by rwatson@rwatson_zoo on 2006/03/04 14:11:47 audit.c requires audit_internal for the definition of au_record. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#15 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include +#include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 15:42:33 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B02616A424 for ; Sat, 4 Mar 2006 15:42:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 583FA43D49 for ; Sat, 4 Mar 2006 15:42:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 06C6946B55 for ; Sat, 4 Mar 2006 10:42:11 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 10FF355ACE; Sat, 4 Mar 2006 15:42:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F3C1A16A423; Sat, 4 Mar 2006 15:42:29 +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 C687E16A420 for ; Sat, 4 Mar 2006 15:42:29 +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 654D743D46 for ; Sat, 4 Mar 2006 15:42: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 k24FgTvB049973 for ; Sat, 4 Mar 2006 15:42: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 k24FgPro049970 for perforce@freebsd.org; Sat, 4 Mar 2006 15:42:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 15:42:25 GMT Message-Id: <200603041542.k24FgPro049970@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 92726 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 15:42:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=92726 Change 92726 by rwatson@rwatson_zoo on 2006/03/04 15:42:03 Integrate TrustedBSD base branch from FreeBSD CVS: - bsnmp upgrade - resolver update - lots of proc lock fixes - more explicit interrupt routing on smp - freebsd32_sendfile fixes - alpha tsc - tdfx_linux module/option - ata locking fixes - kbdmux now default + fixes - fdescfs fixes - further calcru fixes - lots of sundry vfs locking fixes - loop back auditing of vfs system call paths - bridge monitor mode and bpf - softupdates queues made per-mount rather than global - netrate http/httpd learn about multi-process operation Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#35 integrate .. //depot/projects/trustedbsd/base/Makefile#42 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#69 integrate .. //depot/projects/trustedbsd/base/README#5 integrate .. //depot/projects/trustedbsd/base/UPDATING#63 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/TODO#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpclient.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_route.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_tree.def#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_ntp/snmp_ntp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/bsnmpd.1#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/config.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/export.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpd.config#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.3#9 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/csup/GNUmakefile#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/README#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/TODO#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/attrstack.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/attrstack.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/config.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/config.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/csup.1#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/detailer.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/detailer.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/diff.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/diff.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fattr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fattr.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fixups.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fixups.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fnmatch.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fnmatch.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/globtree.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/globtree.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/keyword.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/keyword.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/lister.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/lister.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/main.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/main.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/misc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/misc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/mux.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/mux.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/parse.y#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/pathcomp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/pathcomp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/proto.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/proto.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/queue.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/status.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/status.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/stream.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/stream.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/threads.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/threads.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/token.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/token.l#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/updater.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/updater.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/Makefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/mkfilters.1#3 integrate .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#18 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.x11-4.dist#11 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/daily/Makefile#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfw#12 integrate .. //depot/projects/trustedbsd/base/etc/snmpd.config#4 integrate .. //depot/projects/trustedbsd/base/include/printf.h#3 integrate .. //depot/projects/trustedbsd/base/include/resolv.h#8 integrate .. //depot/projects/trustedbsd/base/include/rpc/auth.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#22 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_net.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_net_ntop.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_net_pton.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_comp.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_debug.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_query.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_send.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_des.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_none.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_unix.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_dg.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_raw.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_simple.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_vc.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getpublickey.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/key_call.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/mt_misc.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/mt_misc.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_com.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_generic.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_soc.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcb_clnt.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_auth.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_dg.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_generic.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_raw.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_run.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_simple.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_vc.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_quote.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#19 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/gettimeofday.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldnext.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmc.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/context.S#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_nanosleep.c#7 integrate .. //depot/projects/trustedbsd/base/lib/librt/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/librt/aio.c#1 branch .. //depot/projects/trustedbsd/base/lib/librt/mq.c#1 branch .. //depot/projects/trustedbsd/base/lib/librt/sigev_thread.c#1 branch .. //depot/projects/trustedbsd/base/lib/librt/sigev_thread.h#1 branch .. //depot/projects/trustedbsd/base/lib/librt/timer.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#15 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#32 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#18 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#98 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#28 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#17 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/dmesg/dmesg.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/dump/dump.8#26 integrate .. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.8#15 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/shsec/geom_shsec.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#37 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#18 integrate .. //depot/projects/trustedbsd/base/sbin/init/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sbin/kldunload/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/kldunload/kldunload.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/kldunload/kldunload.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.8#21 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#20 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#41 integrate .. //depot/projects/trustedbsd/base/share/examples/ipfilter/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#64 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#24 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cpufreq.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ddb.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/hwpmc.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/kbdmux.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_netflow.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tdfx.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#39 integrate .. //depot/projects/trustedbsd/base/share/man/man5/periodic.conf.5#18 integrate .. //depot/projects/trustedbsd/base/share/man/man8/rc.subr.8#7 integrate .. //depot/projects/trustedbsd/base/share/man/man9/bus_dma.9#13 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sleep.9#13 integrate .. //depot/projects/trustedbsd/base/share/man/man9/time.9#7 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#27 integrate .. //depot/projects/trustedbsd/base/share/mklocale/ko_KR.eucKR.src#3 integrate .. //depot/projects/trustedbsd/base/share/mklocale/zh_CN.GBK.src#2 integrate .. //depot/projects/trustedbsd/base/share/mklocale/zh_CN.eucCN.src#3 integrate .. //depot/projects/trustedbsd/base/share/mklocale/zh_TW.Big5.src#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#43 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#31 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/intr_machdep.c#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#17 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/apicvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/intr_machdep.h#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/mptable.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/atpic.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/undefined.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#13 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_aau.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_dma.c#3 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda.h#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#17 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#68 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#97 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#41 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#68 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#33 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#34 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ar/if_ar.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-queue.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/de/if_de.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/de/if_devar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir_pci.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbd/kbd.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/am7990.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/am79900.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_cnfg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_ioc.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_type.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_debug.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mse/mse.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/pcf/envctrl.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/pcf/pcf_ebus.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/pcf/pcf_isa.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/if_plip.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/lpt.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/ppi.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppc/ppc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_ebus.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_sbus.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sr/if_sr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_pci.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus_ebus.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_ns8250.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_sab82532.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_z8530.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_kbd_sun.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_tty.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_quirks.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdivar.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/vkbd/vkbd.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/deadfs/dead_vnops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_devs.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vnops.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_subr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ctl.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#28 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#29 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#64 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/PAE#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#36 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/intr_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/io_apic.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/local_apic.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#47 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/apicvar.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/intr_machdep.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/mptable.h#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/xbox.h#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/atpic.c#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_ptrace.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/xbox/xboxfb.c#4 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#59 integrate .. //depot/projects/trustedbsd/base/sys/isa/syscons_isa.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_cpu.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#50 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kse.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kthread.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#46 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_timeout.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#35 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_sleepqueue.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#52 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#72 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#67 integrate .. //depot/projects/trustedbsd/base/sys/modules/3dfx/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/Makefile#73 integrate .. //depot/projects/trustedbsd/base/sys/modules/ce/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/coda5/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/crypto/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/de/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_ef/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_ppp/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/modules/kbdmux/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/uart/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/net/bridgestp.c#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#9 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#48 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#33 integrate .. //depot/projects/trustedbsd/base/sys/net/ppp_deflate.c#7 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#19 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#45 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#60 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#31 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#38 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#30 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/mld6.c#16 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsock.c#18 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.c#19 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/fdc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/ppc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/sio.c#5 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#33 integrate .. //depot/projects/trustedbsd/base/sys/pci/dc21040reg.h#3 delete .. //depot/projects/trustedbsd/base/sys/pci/if_de.c#24 delete .. //depot/projects/trustedbsd/base/sys/pci/if_devar.h#11 delete .. //depot/projects/trustedbsd/base/sys/security/mac/mac_process.c#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#34 integrate .. //depot/projects/trustedbsd/base/sys/sys/_types.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/bio.h#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#36 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#73 integrate .. //depot/projects/trustedbsd/base/sys/sys/queue.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/serial.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/signalvar.h#24 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#53 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#53 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#54 integrate .. //depot/projects/trustedbsd/base/sys/sys/timers.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#61 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#32 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#17 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_rawread.c#16 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#37 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#38 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/softdep.h#7 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#25 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufsmount.h#12 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#29 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#59 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#46 integrate .. //depot/projects/trustedbsd/base/tools/tools/README#23 integrate .. //depot/projects/trustedbsd/base/tools/tools/ministat/ministat.c#6 integrate .. //depot/projects/trustedbsd/base/tools/tools/ncpus/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ncpus/acpi.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ncpus/acpidump.h#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ncpus/biosmptable.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ncpus/ncpus.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/netrate/http/http.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/httpd/httpd.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.1#13 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#22 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tinderbox.1#9 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tinderbox.pl#16 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/index.cgi#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#46 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#46 integrate .. //depot/projects/trustedbsd/base/usr.bin/csup/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.bin/tar/tree.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#48 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/hccontrol.h#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/info.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/link_control.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/util.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pmccontrol/pmccontrol.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/portsnap/portsnap/portsnap.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/quot/quot.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/Makefile#17 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/anonFTP.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#26 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/devices.c#21 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/disks.c#21 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dist.c#31 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dmenu.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/http.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/index.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/installUpgrade.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/keymap.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/label.c#25 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/main.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/media.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/menus.c#47 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/options.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/package.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/sysinstall.h#30 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/system.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/tcpip.c#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/user.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/wizard.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/syslogd/syslog.conf.5#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#35 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.128 2005/12/12 01:28:19 rodrigc Exp $ +$FreeBSD: src/MAINTAINERS,v 1.129 2006/03/04 14:24:32 rwatson Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -26,6 +26,8 @@ UFS EAs rwatson Pre-commit review requested. MAC Framework rwatson Pre-commit review requested. MAC Modules rwatson Pre-commit review requested. +contrib/openbsm rwatson Pre-commit review requested. +sys/security/audit rwatson Pre-commit review requested. ATA/IDE sos Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. ==== //depot/projects/trustedbsd/base/Makefile#42 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.325 2005/11/28 11:14:36 ru Exp $ +# $FreeBSD: src/Makefile,v 1.326 2006/03/01 13:07:17 yar Exp $ # # The user-driven targets are: # @@ -93,11 +93,11 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ - ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \ + ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ - (in /etc/make.conf) or command-line variable. + (in make.conf(5)) or command-line variable. .endif MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} BINMAKE= \ ==== //depot/projects/trustedbsd/base/Makefile.inc1#69 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -506,7 +506,7 @@ # Check for missing UIDs/GIDs. # CHECK_UIDS= -CHECK_GIDS= +CHECK_GIDS= audit .if !defined(NO_SENDMAIL) CHECK_UIDS+= smmsp CHECK_GIDS+= smmsp ==== //depot/projects/trustedbsd/base/README#5 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.22 2003/03/08 10:01:26 markm Exp $ +$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -59,6 +59,8 @@ release Release building Makefile & associated tools. +rescue Build system for statically linked /rescue utilities. + sbin System commands. secure Cryptographic libraries and commands. ==== //depot/projects/trustedbsd/base/UPDATING#63 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20060303: + The TDFX_LINUX kernel option was retired and replaced by the + tdfx_linux device. The latter can be loaded as a kernel module. + Loading it alone should suffice to get 3dfx support for Linux + apps because it will pull in tdfx.ko and linux.ko through its + dependencies. + 20060201: The kernel ABI to file system modules was changed on i386. Please make sure that your kernel and modules are in sync. @@ -510,4 +517,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ +$FreeBSD: src/UPDATING,v 1.440 2006/03/03 21:37:38 yar Exp $ ==== //depot/projects/trustedbsd/base/bin/chflags/chflags.1#10 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.25 2005/06/14 08:25:54 ru Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.26 2006/03/04 02:38:40 trhodes Exp $ .\" -.Dd May 14, 2005 +.Dd March 3, 2006 .Dt CHFLAGS 1 .Os .Sh NAME @@ -120,6 +120,39 @@ clear the nodump flag (owner or super-user only) .El .Pp +A few of the octal values include: +.Bl -tag -offset indent -width ".Ar 10" +.It Li 0 +Clear all file flags. +.It Li 1 +Translates to the +.Ar nodump +keyword. +.It Li 2 +Translates to the +.Ar uchg +keyword. +.It Li 3 +Translates to the +.Ar uchg , nodump +keywords. +.It Li 4 +Translates to the +.Ar uappnd +keyword. +.It Li 10 +Translates to the +.Ar opaque +keyword. +.It Li 20 +translates to the +uunlnk +keyword. +.El +.Pp +Other combinations of keywords may be placed by using +the octets assigned; however, these are the most notable. +.Pp Unless the .Fl H , .Fl L , @@ -140,6 +173,14 @@ command's actions are determined by the last one specified. .Pp You can use "ls -lo" to see the flags of existing files. +.Pp +Note that the ability to change certain flags is dependent +on the current kernel +.Em securelevel +setting. +See +.Xr security 7 +for more information on this setting. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO @@ -147,6 +188,7 @@ .Xr chflags 2 , .Xr stat 2 , .Xr fts 3 , +.Xr security 7 , .Xr symlink 7 .Sh HISTORY The ==== //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#10 (text+ko) ==== @@ -1,3 +1,29 @@ +1.12 + A couple of man page fixes from various submitters. + + Make default communities NULL for security. + + Fix a core dump when -d tracing suboption has no argument (thanks + to Shteryana Shopova). + + Fix bug in parsing the include path in the daemon. + + Fix an uninitialize structure field in gensnmptree (thanks to + jasone@freebsdorg) + + 64bit HC counters in the IF-MIB by polling the OS periodically. + + Fix link traps to be more RFC conform (thanks to glebius@freebsd.org) + + Add fallback definition for SA_SIZE() to support.h. + + Move the porting definitions for U?INT32_{MIN,MAX} into support.h. + + Include a sys/tree.h from FreeBSD-current and add autoconf + check for it. + +1.11a Fix build of modules when stdint.h is included after asn1.h + 1.11 Make the Mib2 routing table use red-black tree. This vastly reduces loading and access time. Load the table only every 10 minutes. In the meantime process message from the routing socket ==== //depot/projects/trustedbsd/base/contrib/bsnmp/TODO#3 (text+ko) ==== @@ -1,6 +1,3 @@ -snmpd_mibII: - - handle HC counters by periodically polling the kernel counters. - snmpd: - rethink transports a little bit: make them loadable and make a private subtree for transports: ==== //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#10 (text+ko) ==== @@ -1,1 +1,1 @@ -1.11 +1.12 ==== //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.1#6 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.5 2005/06/15 11:31:25 brandt_h Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $ .\" -.Dd June 14, 2005 +.Dd February 27, 2006 .Dt GENSNMPTREE 1 .Os .Sh NAME @@ -45,7 +45,7 @@ utility is used to either generate C language tables and header files from a MIB description or to numeric OIDs from MIB descriptions. The first form is used only for maintaining the -.Xr snmpd 1 +.Xr bsnmpd 1 daemon or for module writers. The second form may be used by SNMP client program writers. .Pp @@ -57,7 +57,7 @@ C-file .Ar prefix Ns tree.c containing a table used by -.Xr snmpd 1 +.Xr bsnmpd 1 during PDU processing and a header file .Ar prefix Ns tree.h @@ -70,14 +70,19 @@ .Nm expects MIB variable names (only the last component) on its command line. It reads a MIB specification from standard input and for each MIB variable -name emits two C preprocessor defines on its standard output. -One define -.Va OID_ Ns Ar name -can be used as an array initialized to initialize a -.Va struct asn_oid . -The other define -.Va OIDLEN_ Ns Ar name -contains the length of the OID. +name emits three C preprocessor defines on its standard output: +.Bl -tag -width ".Va OIDLEN_ Ns Ar Name" +.It Va OIDX_ Ns Ar name +This define can be used to initialize a +.Va struct asn_oid +in the following way: +.Pp +.Dl const struct asn_oid oid_sysDescr = OIDX_sysDescr; +.It Va OIDLEN_ Ns Ar name +is the length of the OID. +.It Va OID_ Ns Ar name +is the last component of the OID. +.El .Pp The options are as follows: .Bl -tag -width ".Fl d Ar argument" @@ -88,7 +93,7 @@ .It Fl l Generate local preprocessor includes. This is used for bootstrapping -.Xr snmpd 1 . +.Xr bsnmpd 1 . .It Fl t Instead of normal output print the resulting tree. .It Fl p Ar prefix @@ -187,6 +192,6 @@ ) .Ed .Sh SEE ALSO -.Xr snmpd 1 +.Xr bsnmpd 1 .Sh AUTHORS .An Hartmut Brandt Aq harti@freebsd.org ==== //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.43 2005/10/04 11:21:29 brandt_h Exp $ + * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.44 2006/02/14 09:04:17 brandt_h Exp $ * * Generate OID table from table description. * ==== //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.c,v 1.29 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.31 2005/10/06 07:14:58 brandt_h Exp $ * * ASN.1 for SNMP. */ @@ -41,18 +41,10 @@ #include #endif #include + +#include "support.h" #include "asn1.h" -#if !defined(INT32_MIN) -#define INT32_MIN (-0x7fffffff-1) -#endif -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - static void asn_error_func(const struct asn_buf *, const char *, ...); void (*asn_error)(const struct asn_buf *, const char *, ...) = asn_error_func; ==== //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.h,v 1.19 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.h,v 1.20 2005/10/05 16:43:11 brandt_h Exp $ * * ASN.1 for SNMP */ ==== //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpclient.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/snmpclient.c,v 1.34 2005/10/04 14:32:42 brandt_h Exp $ + * $Begemot: bsnmp/lib/snmpclient.c,v 1.36 2005/10/06 07:14:58 brandt_h Exp $ * * Support functions for SNMP clients. */ @@ -64,14 +64,6 @@ #include "snmpclient.h" #include "snmppriv.h" -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - - /* global context */ struct snmp_client snmp_client; ==== //depot/projects/trustedbsd/base/contrib/bsnmp/lib/support.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 + * Copyright (C) 2004-2005 * Hartmut Brandt. * All rights reserved. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/support.h,v 1.1 2004/08/06 08:47:59 brandt Exp $ + * $Begemot: bsnmp/lib/support.h,v 1.2 2005/10/06 07:14:59 brandt_h Exp $ * * Functions that are missing on certain systems. This header file is not * to be installed. @@ -68,4 +68,29 @@ #endif +/* + * For systems with missing stdint.h or inttypes.h + */ +#if !defined(INT32_MIN) +#define INT32_MIN (-0x7fffffff-1) +#endif +#if !defined(INT32_MAX) +#define INT32_MAX (0x7fffffff) +#endif +#if !defined(UINT32_MAX) +#define UINT32_MAX (0xffffffff) +#endif + +/* + * Systems missing SA_SIZE(). Taken from FreeBSD net/route.h:1.63 + */ +#ifndef SA_SIZE + +#define SA_SIZE(sa) \ + ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \ + sizeof(long) : \ + 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) ) + +#endif + #endif ==== //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$Begemot: bsnmp/oid-list,v 1.3 2005/05/23 09:03:22 brandt_h Exp $ +$Begemot: bsnmp/oid-list,v 1.5 2006/02/27 09:55:45 brandt_h Exp $ This file documents the OID assignments under BSNMP's private OID. @@ -11,11 +11,12 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module - 3 BEGEMOT-IP snmpd mibII module + 3 BEGEMOT-IP snmpd IP related stuff. 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) 201 BEGEMOT-NTP snmpd NTP module + 202 BEGEMOT-HOSTRES snmpd HOSTRES module private stuff 300 BEGEMOT-ACM DLR ACM project If you need an OID and don't know where to stuck it in, I can assign you one - ==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.23 2005/06/09 12:36:52 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.24 2006/02/14 09:04:18 brandt_h Exp $ * * Implementation of the standard interfaces and ip MIB. */ ==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.h#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.15 2005/06/09 12:36:53 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.16 2006/02/14 09:04:19 brandt_h Exp $ * * Implementation of the interfaces and IP groups of MIB-II. */ ==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.16 2005/11/02 12:07:40 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.17 2006/02/14 09:04:19 brandt_h Exp $ * * Interfaces group. */ ==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_route.c#6 (text+ko) ==== @@ -26,11 +26,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.7 2005/06/09 12:36:53 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.9 2005/10/06 07:15:00 brandt_h Exp $ * * Routing table >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 16:17:26 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7EC0116A420 for ; Sat, 4 Mar 2006 16:17:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E569843D49 for ; Sat, 4 Mar 2006 16:17:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 790BA46C31 for ; Sat, 4 Mar 2006 11:16:56 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 320E85669D; Sat, 4 Mar 2006 16:17:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2061016A423; Sat, 4 Mar 2006 16:17: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 B713A16A420 for ; Sat, 4 Mar 2006 16:17:14 +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 38D6543D49 for ; Sat, 4 Mar 2006 16:17:14 +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 k24GHEOt055348 for ; Sat, 4 Mar 2006 16:17:14 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 k24GHBBF055318 for perforce@freebsd.org; Sat, 4 Mar 2006 16:17:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 16:17:11 GMT Message-Id: <200603041617.k24GHBBF055318@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 92728 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 16:17:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=92728 Change 92728 by rwatson@rwatson_zoo on 2006/03/04 16:16:37 Integrate TrustedBSD audit3 branch from TrustedBSD base branch. See @92726 for a list of changes. Among them is the loop back of pathname auditing for many VFS system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#6 integrate .. //depot/projects/trustedbsd/audit3/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#8 integrate .. //depot/projects/trustedbsd/audit3/README#2 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#9 integrate .. //depot/projects/trustedbsd/audit3/bin/chflags/chflags.1#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/NEWS#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/TODO#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/VERSION#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/asn1.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/asn1.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/snmpclient.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/oid-list#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_ntp/snmp_ntp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/bsnmpd.1#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/config.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/snmpd.config#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/snmpmod.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/snmpmod.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/GNUmakefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/TODO#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/attrstack.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/attrstack.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/config.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/config.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/csup.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/detailer.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/detailer.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/diff.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/diff.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fattr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fattr.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fixups.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fixups.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fnmatch.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fnmatch.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/globtree.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/globtree.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/keyword.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/keyword.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/lister.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/lister.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/main.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/main.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/misc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/misc.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/mux.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/mux.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/parse.y#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/pathcomp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/pathcomp.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/proto.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/proto.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/queue.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/status.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/status.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/stream.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/stream.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/threads.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/threads.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/token.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/token.l#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/updater.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/updater.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/man/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/man/mkfilters.1#3 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/periodic.conf#6 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.x11-4.dist#6 integrate .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ipfw#5 integrate .. //depot/projects/trustedbsd/audit3/etc/snmpd.config#4 integrate .. //depot/projects/trustedbsd/audit3/include/printf.h#3 integrate .. //depot/projects/trustedbsd/audit3/include/resolv.h#4 integrate .. //depot/projects/trustedbsd/audit3/include/rpc/auth.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getaddrinfo.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_net.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_net_ntop.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_net_pton.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_comp.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_debug.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_query.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_send.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/auth_des.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/auth_none.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/auth_unix.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/clnt_dg.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/clnt_raw.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/clnt_simple.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/clnt_vc.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/getpublickey.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/key_call.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/mt_misc.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/mt_misc.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/rpc_com.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/rpc_generic.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/rpc_soc.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/rpcb_clnt.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_auth.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_dg.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_generic.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_raw.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_run.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_simple.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_vc.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/xprintf_quote.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/gettimeofday.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/kldnext.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmc.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/amd64/amd64/context.S#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_cond.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_mutex.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_nanosleep.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/librt/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/lib/librt/aio.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/librt/mq.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/librt/sigev_thread.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/librt/sigev_thread.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/librt/timer.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex.c#6 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpd.c#6 integrate .. //depot/projects/trustedbsd/audit3/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#2 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#4 integrate .. //depot/projects/trustedbsd/audit3/release/doc/share/sgml/release.ent#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/bsdlabel/bsdlabel.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/dmesg/dmesg.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/dump/dump.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/dumpon/dumpon.8#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/fdisk_pc98/fdisk.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/fdisk_pc98/fdisk.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/shsec/geom_shsec.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/init/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/kldunload/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/kldunload/kldunload.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/kldunload/kldunload.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.c#4 integrate .. //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#11 integrate .. //depot/projects/trustedbsd/audit3/share/examples/ipfilter/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/acpi.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/altq.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/cpufreq.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ddb.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/hwpmc.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/if_bridge.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/kbdmux.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_netflow.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/tdfx.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#10 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/periodic.conf.5#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/rc.subr.8#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/bus_dma.9#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/sleep.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/time.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/misc/bsd-family-tree#7 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/ko_KR.eucKR.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/zh_CN.GBK.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/zh_CN.eucCN.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/zh_TW.Big5.src#2 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/trap.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/mptable.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/isa/atpic.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/trap.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/undefined.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pmap.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#10 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#18 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#9 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#10 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.i386#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.pc98#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/de/if_de.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/de/if_devar.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iir/iir.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iir/iir.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/kbd/kbd.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/le/am7990.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/le/am79900.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_cnfg.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_ioc.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_type.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mse/mse.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/lpt.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/ppi.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/puc.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/puc_ebus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/puc_sbus.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/re/if_re.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sio/sio.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/tdfx/tdfx_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_bus_ebus.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_dev_sab82532.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_kbd_sun.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uhci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uplcom.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_port.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_subr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdivar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/deadfs/dead_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nullfs/null_subr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/procfs/procfs_ctl.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_io.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/PAE#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/XBOX#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/io_apic.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/local_apic.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/mptable.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/xbox.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/isa/atpic.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_ptrace.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/isa/syscons_isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#28 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_kse.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_kthread.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_malloc.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_resource.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_synch.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_tc.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_time.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_prf.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#32 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#29 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/3dfx/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/ce/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/coda5/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/crypto/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/de/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_ef/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_ppp/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/kbdmux/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/uart/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bridgestp.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/ppp_deflate.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/mld6.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/cbus/fdc.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/cbus/ppc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/cbus/sio.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/dc21040reg.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/pci/if_de.c#6 delete .. //depot/projects/trustedbsd/audit3/sys/pci/if_devar.h#5 delete .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/_types.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/bio.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mount.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/queue.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/serial.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/signalvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#18 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#19 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#22 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/timers.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/vnode.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_alloc.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_rawread.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/softdep.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufsmount.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_contig.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_object.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vnode_pager.c#8 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/README#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ministat/ministat.c#4 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ncpus/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ncpus/acpi.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ncpus/acpidump.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ncpus/biosmptable.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ncpus/ncpus.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/netrate/http/http.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/netrate/httpd/httpd.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/.cvsignore#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tbmaster.1#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tbmaster.pl#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tinderbox.1#5 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tinderbox.pl#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/www/.cvsignore#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/www/index.cgi#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#9 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/csup/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/tar/tree.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#15 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/hccontrol/info.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/hccontrol/link_control.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/hccontrol/util.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pmccontrol/pmccontrol.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/portsnap/portsnap/portsnap.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/quot/quot.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/anonFTP.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/config.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/devices.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/disks.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/dist.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/dmenu.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/http.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/index.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/installUpgrade.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/keymap.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/label.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/media.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/menus.c#8 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/options.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/package.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/sysinstall.h#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/system.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/tcpip.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/user.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/wizard.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/syslogd/syslog.conf.5#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/MAINTAINERS#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.128 2005/12/12 01:28:19 rodrigc Exp $ +$FreeBSD: src/MAINTAINERS,v 1.129 2006/03/04 14:24:32 rwatson Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -26,6 +26,8 @@ UFS EAs rwatson Pre-commit review requested. MAC Framework rwatson Pre-commit review requested. MAC Modules rwatson Pre-commit review requested. +contrib/openbsm rwatson Pre-commit review requested. +sys/security/audit rwatson Pre-commit review requested. ATA/IDE sos Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. ==== //depot/projects/trustedbsd/audit3/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.325 2005/11/28 11:14:36 ru Exp $ +# $FreeBSD: src/Makefile,v 1.326 2006/03/01 13:07:17 yar Exp $ # # The user-driven targets are: # @@ -93,11 +93,11 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ - ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \ + ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ - (in /etc/make.conf) or command-line variable. + (in make.conf(5)) or command-line variable. .endif MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} BINMAKE= \ ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -506,7 +506,7 @@ # Check for missing UIDs/GIDs. # CHECK_UIDS= -CHECK_GIDS= +CHECK_GIDS= audit .if !defined(NO_SENDMAIL) CHECK_UIDS+= smmsp CHECK_GIDS+= smmsp ==== //depot/projects/trustedbsd/audit3/README#2 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.22 2003/03/08 10:01:26 markm Exp $ +$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -59,6 +59,8 @@ release Release building Makefile & associated tools. +rescue Build system for statically linked /rescue utilities. + sbin System commands. secure Cryptographic libraries and commands. ==== //depot/projects/trustedbsd/audit3/UPDATING#9 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20060303: + The TDFX_LINUX kernel option was retired and replaced by the + tdfx_linux device. The latter can be loaded as a kernel module. + Loading it alone should suffice to get 3dfx support for Linux + apps because it will pull in tdfx.ko and linux.ko through its + dependencies. + 20060201: The kernel ABI to file system modules was changed on i386. Please make sure that your kernel and modules are in sync. @@ -510,4 +517,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ +$FreeBSD: src/UPDATING,v 1.440 2006/03/03 21:37:38 yar Exp $ ==== //depot/projects/trustedbsd/audit3/bin/chflags/chflags.1#5 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.25 2005/06/14 08:25:54 ru Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.26 2006/03/04 02:38:40 trhodes Exp $ .\" -.Dd May 14, 2005 +.Dd March 3, 2006 .Dt CHFLAGS 1 .Os .Sh NAME @@ -120,6 +120,39 @@ clear the nodump flag (owner or super-user only) .El .Pp +A few of the octal values include: +.Bl -tag -offset indent -width ".Ar 10" +.It Li 0 +Clear all file flags. +.It Li 1 +Translates to the +.Ar nodump +keyword. +.It Li 2 +Translates to the +.Ar uchg +keyword. +.It Li 3 +Translates to the +.Ar uchg , nodump +keywords. +.It Li 4 +Translates to the +.Ar uappnd +keyword. +.It Li 10 +Translates to the +.Ar opaque +keyword. +.It Li 20 +translates to the +uunlnk +keyword. +.El +.Pp +Other combinations of keywords may be placed by using +the octets assigned; however, these are the most notable. +.Pp Unless the .Fl H , .Fl L , @@ -140,6 +173,14 @@ command's actions are determined by the last one specified. .Pp You can use "ls -lo" to see the flags of existing files. +.Pp +Note that the ability to change certain flags is dependent +on the current kernel +.Em securelevel +setting. +See +.Xr security 7 +for more information on this setting. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO @@ -147,6 +188,7 @@ .Xr chflags 2 , .Xr stat 2 , .Xr fts 3 , +.Xr security 7 , .Xr symlink 7 .Sh HISTORY The ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/NEWS#5 (text+ko) ==== @@ -1,3 +1,29 @@ +1.12 + A couple of man page fixes from various submitters. + + Make default communities NULL for security. + + Fix a core dump when -d tracing suboption has no argument (thanks + to Shteryana Shopova). + + Fix bug in parsing the include path in the daemon. + + Fix an uninitialize structure field in gensnmptree (thanks to + jasone@freebsdorg) + + 64bit HC counters in the IF-MIB by polling the OS periodically. + + Fix link traps to be more RFC conform (thanks to glebius@freebsd.org) + + Add fallback definition for SA_SIZE() to support.h. + + Move the porting definitions for U?INT32_{MIN,MAX} into support.h. + + Include a sys/tree.h from FreeBSD-current and add autoconf + check for it. + +1.11a Fix build of modules when stdint.h is included after asn1.h + 1.11 Make the Mib2 routing table use red-black tree. This vastly reduces loading and access time. Load the table only every 10 minutes. In the meantime process message from the routing socket ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/TODO#2 (text+ko) ==== @@ -1,6 +1,3 @@ -snmpd_mibII: - - handle HC counters by periodically polling the kernel counters. - snmpd: - rethink transports a little bit: make them loadable and make a private subtree for transports: ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/VERSION#5 (text+ko) ==== @@ -1,1 +1,1 @@ -1.11 +1.12 ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.1#5 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.5 2005/06/15 11:31:25 brandt_h Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $ .\" -.Dd June 14, 2005 +.Dd February 27, 2006 .Dt GENSNMPTREE 1 .Os .Sh NAME @@ -45,7 +45,7 @@ utility is used to either generate C language tables and header files from a MIB description or to numeric OIDs from MIB descriptions. The first form is used only for maintaining the -.Xr snmpd 1 +.Xr bsnmpd 1 daemon or for module writers. The second form may be used by SNMP client program writers. .Pp @@ -57,7 +57,7 @@ C-file .Ar prefix Ns tree.c containing a table used by -.Xr snmpd 1 +.Xr bsnmpd 1 during PDU processing and a header file .Ar prefix Ns tree.h @@ -70,14 +70,19 @@ .Nm expects MIB variable names (only the last component) on its command line. It reads a MIB specification from standard input and for each MIB variable -name emits two C preprocessor defines on its standard output. -One define -.Va OID_ Ns Ar name -can be used as an array initialized to initialize a -.Va struct asn_oid . -The other define -.Va OIDLEN_ Ns Ar name -contains the length of the OID. +name emits three C preprocessor defines on its standard output: +.Bl -tag -width ".Va OIDLEN_ Ns Ar Name" +.It Va OIDX_ Ns Ar name +This define can be used to initialize a +.Va struct asn_oid +in the following way: +.Pp +.Dl const struct asn_oid oid_sysDescr = OIDX_sysDescr; +.It Va OIDLEN_ Ns Ar name +is the length of the OID. +.It Va OID_ Ns Ar name +is the last component of the OID. +.El .Pp The options are as follows: .Bl -tag -width ".Fl d Ar argument" @@ -88,7 +93,7 @@ .It Fl l Generate local preprocessor includes. This is used for bootstrapping -.Xr snmpd 1 . +.Xr bsnmpd 1 . .It Fl t Instead of normal output print the resulting tree. .It Fl p Ar prefix @@ -187,6 +192,6 @@ ) .Ed .Sh SEE ALSO -.Xr snmpd 1 +.Xr bsnmpd 1 .Sh AUTHORS .An Hartmut Brandt Aq harti@freebsd.org ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.43 2005/10/04 11:21:29 brandt_h Exp $ + * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.44 2006/02/14 09:04:17 brandt_h Exp $ * * Generate OID table from table description. * ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/asn1.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.c,v 1.29 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.31 2005/10/06 07:14:58 brandt_h Exp $ * * ASN.1 for SNMP. */ @@ -41,18 +41,10 @@ #include #endif #include + +#include "support.h" #include "asn1.h" -#if !defined(INT32_MIN) -#define INT32_MIN (-0x7fffffff-1) -#endif -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - static void asn_error_func(const struct asn_buf *, const char *, ...); void (*asn_error)(const struct asn_buf *, const char *, ...) = asn_error_func; ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/asn1.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.h,v 1.19 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.h,v 1.20 2005/10/05 16:43:11 brandt_h Exp $ * * ASN.1 for SNMP */ ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/snmpclient.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/snmpclient.c,v 1.34 2005/10/04 14:32:42 brandt_h Exp $ + * $Begemot: bsnmp/lib/snmpclient.c,v 1.36 2005/10/06 07:14:58 brandt_h Exp $ * * Support functions for SNMP clients. */ @@ -64,14 +64,6 @@ #include "snmpclient.h" #include "snmppriv.h" -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - - /* global context */ struct snmp_client snmp_client; ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/support.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 + * Copyright (C) 2004-2005 * Hartmut Brandt. * All rights reserved. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/support.h,v 1.1 2004/08/06 08:47:59 brandt Exp $ + * $Begemot: bsnmp/lib/support.h,v 1.2 2005/10/06 07:14:59 brandt_h Exp $ * * Functions that are missing on certain systems. This header file is not * to be installed. @@ -68,4 +68,29 @@ #endif +/* + * For systems with missing stdint.h or inttypes.h + */ +#if !defined(INT32_MIN) +#define INT32_MIN (-0x7fffffff-1) +#endif +#if !defined(INT32_MAX) +#define INT32_MAX (0x7fffffff) +#endif +#if !defined(UINT32_MAX) +#define UINT32_MAX (0xffffffff) +#endif + +/* + * Systems missing SA_SIZE(). Taken from FreeBSD net/route.h:1.63 + */ +#ifndef SA_SIZE + +#define SA_SIZE(sa) \ + ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \ + sizeof(long) : \ + 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) ) + +#endif + #endif ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/oid-list#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$Begemot: bsnmp/oid-list,v 1.3 2005/05/23 09:03:22 brandt_h Exp $ +$Begemot: bsnmp/oid-list,v 1.5 2006/02/27 09:55:45 brandt_h Exp $ This file documents the OID assignments under BSNMP's private OID. @@ -11,11 +11,12 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module - 3 BEGEMOT-IP snmpd mibII module + 3 BEGEMOT-IP snmpd IP related stuff. 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) 201 BEGEMOT-NTP snmpd NTP module + 202 BEGEMOT-HOSTRES snmpd HOSTRES module private stuff 300 BEGEMOT-ACM DLR ACM project If you need an OID and don't know where to stuck it in, I can assign you one - ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.23 2005/06/09 12:36:52 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.24 2006/02/14 09:04:18 brandt_h Exp $ * * Implementation of the standard interfaces and ip MIB. */ ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.15 2005/06/09 12:36:53 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.16 2006/02/14 09:04:19 brandt_h Exp $ * * Implementation of the interfaces and IP groups of MIB-II. */ ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.16 2005/11/02 12:07:40 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.17 2006/02/14 09:04:19 brandt_h Exp $ * * Interfaces group. */ ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_route.c#5 (text+ko) ==== @@ -26,11 +26,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.7 2005/06/09 12:36:53 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.9 2005/10/06 07:15:00 brandt_h Exp $ * * Routing table */ +#include "support.h" + +#ifdef HAVE_SYS_TREE_H #include +#else +#include "tree.h" +#endif + #include "mibII.h" #include "mibII_oid.h" ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 16:33:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6089A16A420 for ; Sat, 4 Mar 2006 16:33:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4FF243D45 for ; Sat, 4 Mar 2006 16:33:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BE78146BB3 for ; Sat, 4 Mar 2006 11:33:16 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 27310557EA; Sat, 4 Mar 2006 16:33:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1482C16A424; Sat, 4 Mar 2006 16:33: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 BA2C416A420 for ; Sat, 4 Mar 2006 16:33: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 84B9643D46 for ; Sat, 4 Mar 2006 16:33: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 k24GXYjH059791 for ; Sat, 4 Mar 2006 16:33: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 k24GXYFK059788 for perforce@freebsd.org; Sat, 4 Mar 2006 16:33:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 16:33:34 GMT Message-Id: <200603041633.k24GXYFK059788@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 92729 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 16:33:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=92729 Change 92729 by rwatson@rwatson_zoo on 2006/03/04 16:33:13 Remove dup audit_pipe.c in conf files -- a result of a mismerge. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/conf/files#19 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/conf/files#19 (text+ko) ==== @@ -1836,7 +1836,6 @@ rpc/rpcclnt.c optional nfsclient security/audit/audit.c optional audit security/audit/audit_arg.c optional audit -security/audit/audit_pipe.c optional audit security/audit/audit_bsm.c optional audit security/audit/audit_bsm_klib.c optional audit security/audit/audit_bsm_token.c optional audit From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 16:35:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EF3916A422 for ; Sat, 4 Mar 2006 16:35:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9452B43D46 for ; Sat, 4 Mar 2006 16:35:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 585C346B52 for ; Sat, 4 Mar 2006 11:35:19 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DA0CD560AA; Sat, 4 Mar 2006 16:35:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C538116A425; Sat, 4 Mar 2006 16:35: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 9D55516A420 for ; Sat, 4 Mar 2006 16:35: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 67CA943D49 for ; Sat, 4 Mar 2006 16:35:37 +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 k24GZbGM059934 for ; Sat, 4 Mar 2006 16:35:37 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 k24GZbtZ059931 for perforce@freebsd.org; Sat, 4 Mar 2006 16:35:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 16:35:37 GMT Message-Id: <200603041635.k24GZbtZ059931@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 92730 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 16:35:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=92730 Change 92730 by rwatson@rwatson_zoo on 2006/03/04 16:35:27 Remove XXX comment -- jhb has now fixed this :-). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.c#6 (text+ko) ==== @@ -215,9 +215,6 @@ if (uap->flags & IBCS2_X_OK) bsd_flags |= X_OK; - /* - * XXXRW: This should probably be kern_eaccess()? - */ CHECKALTEXIST(td, uap->path, &path); error = kern_eaccess(td, path, UIO_SYSSPACE, bsd_flags); free(path, M_TEMP); From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 16:37:46 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BC8116A420 for ; Sat, 4 Mar 2006 16:37:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 781C343D45 for ; Sat, 4 Mar 2006 16:37:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 84BC646BB3 for ; Sat, 4 Mar 2006 11:37:23 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CB02755E8C; Sat, 4 Mar 2006 16:37:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BA4F416A423; Sat, 4 Mar 2006 16:37: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 92EF116A420 for ; Sat, 4 Mar 2006 16:37:40 +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 5CE7943D53 for ; Sat, 4 Mar 2006 16:37:40 +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 k24Gbekx060022 for ; Sat, 4 Mar 2006 16:37:40 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 k24GbeYr060019 for perforce@freebsd.org; Sat, 4 Mar 2006 16:37:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 16:37:40 GMT Message-Id: <200603041637.k24GbeYr060019@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 92731 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 16:37:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=92731 Change 92731 by rwatson@rwatson_peppercorn on 2006/03/04 16:37:05 Correct typo in comment. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#43 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#43 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#43 $ */ #include @@ -49,7 +49,7 @@ #endif /* !HAVE_ENDIAN_H */ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif /* !HAVE_SYS_ENDIANG_H */ +#endif /* !HAVE_SYS_ENDIAN_H */ #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 16:38:47 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DA9016A420 for ; Sat, 4 Mar 2006 16:38:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D1C143D46 for ; Sat, 4 Mar 2006 16:38:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CA23E46B33 for ; Sat, 4 Mar 2006 11:38:24 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A326F557EA; Sat, 4 Mar 2006 16:38:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8976116A423; Sat, 4 Mar 2006 16:38:42 +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 639D316A420 for ; Sat, 4 Mar 2006 16:38:42 +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 1AD8C43D46 for ; Sat, 4 Mar 2006 16:38: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 k24GcfXe060117 for ; Sat, 4 Mar 2006 16:38: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 k24Gcf3d060114 for perforce@freebsd.org; Sat, 4 Mar 2006 16:38:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 16:38:41 GMT Message-Id: <200603041638.k24Gcf3d060114@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 92732 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 16:38:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92732 Change 92732 by rwatson@rwatson_zoo on 2006/03/04 16:38:37 Integrate OpenBSM 1.0a5 comment spelling tweak. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#12 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#12 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#11 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#12 $ */ #include @@ -49,7 +49,7 @@ #endif /* !HAVE_ENDIAN_H */ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif /* !HAVE_SYS_ENDIANG_H */ +#endif /* !HAVE_SYS_ENDIAN_H */ #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 17:08:22 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C52E16A420 for ; Sat, 4 Mar 2006 17:08:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62EC043D4C for ; Sat, 4 Mar 2006 17:08:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E819546C35 for ; Sat, 4 Mar 2006 12:08:00 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 01E7455764; Sat, 4 Mar 2006 17:08:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E4C3D16A423; Sat, 4 Mar 2006 17:08: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 BD6D416A420 for ; Sat, 4 Mar 2006 17:08: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 8800E43D45 for ; Sat, 4 Mar 2006 17:08: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 k24H8JmN069274 for ; Sat, 4 Mar 2006 17:08: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 k24H8JVL069271 for perforce@freebsd.org; Sat, 4 Mar 2006 17:08:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 17:08:19 GMT Message-Id: <200603041708.k24H8JVL069271@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 92736 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 17:08:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=92736 Change 92736 by rwatson@rwatson_zoo on 2006/03/04 17:08:13 Trim Linux ifdefs from kernel version of bsm_token code. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#10 $ */ #include @@ -410,17 +410,9 @@ ADD_U_INT16(dptr, pad0); -#ifdef HAVE_IPC_PERM___SEQ - ADD_U_INT16(dptr, perm->__seq); -#else ADD_U_INT16(dptr, perm->seq); -#endif -#ifdef HAVE_IPC_PERM___KEY - ADD_U_INT32(dptr, perm->__key); -#else ADD_U_INT32(dptr, perm->key); -#endif return (t); } From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 17:10:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B40BB16A420 for ; Sat, 4 Mar 2006 17:10:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 359D743D45 for ; Sat, 4 Mar 2006 17:10:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 09B7C46BBD for ; Sat, 4 Mar 2006 12:10:33 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C6D23559F6; Sat, 4 Mar 2006 17:10:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B4F4316A424; Sat, 4 Mar 2006 17:10: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 8829216A422 for ; Sat, 4 Mar 2006 17:10:51 +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 4B04643D48 for ; Sat, 4 Mar 2006 17:10:51 +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 k24HApd0069484 for ; Sat, 4 Mar 2006 17:10:51 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 k24HApQU069475 for perforce@freebsd.org; Sat, 4 Mar 2006 17:10:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 17:10:51 GMT Message-Id: <200603041710.k24HApQU069475@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 92737 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 17:10:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92737 Change 92737 by rwatson@rwatson_zoo on 2006/03/04 17:10:50 Sync white space to FreeBSD CVS. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#10 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#11 $ */ #include @@ -409,7 +409,6 @@ ADD_U_INT16(dptr, perm->mode); ADD_U_INT16(dptr, pad0); - ADD_U_INT16(dptr, perm->seq); ADD_U_INT32(dptr, perm->key); From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 17:26:15 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4EBD916A420 for ; Sat, 4 Mar 2006 17:26:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93D2F43D46 for ; Sat, 4 Mar 2006 17:26:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F06B746BCA for ; Sat, 4 Mar 2006 12:25:52 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B47CB55554; Sat, 4 Mar 2006 17:26:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A177916A423; Sat, 4 Mar 2006 17:26: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 7936F16A420 for ; Sat, 4 Mar 2006 17:26: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 40FE943D45 for ; Sat, 4 Mar 2006 17:26: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 k24HQBpp070474 for ; Sat, 4 Mar 2006 17:26: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 k24HQAGc070471 for perforce@freebsd.org; Sat, 4 Mar 2006 17:26:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 17:26:10 GMT Message-Id: <200603041726.k24HQAGc070471@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 92740 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 17:26:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=92740 Change 92740 by rwatson@rwatson_fledge on 2006/03/04 17:26:10 Add OpenBSM 1.0 alpha 5 to the TrustedBSD web site. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#6 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#6 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#5 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#6 $ @@ -81,6 +81,13 @@ created by McAfee Research under contract to Apple Computer, and has since been extended by the volunteer TrustedBSD team.

    +

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

    +

    2006-02-23 - OpenBSM 1.0 alpha 4 release is an initial test release of the OpenBSM code base, and matches what is present in FreeBSD CVS at this date. Download. From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 4 22:54:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D33E16A42B for ; Sat, 4 Mar 2006 22:54:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 827E843D46 for ; Sat, 4 Mar 2006 22:54:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 695F846C51 for ; Sat, 4 Mar 2006 17:54:08 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A15C963486; Sat, 4 Mar 2006 22:54:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DC7C16A424; Sat, 4 Mar 2006 22:54: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 5C05816A420 for ; Sat, 4 Mar 2006 22:54: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 7F1BE43D46 for ; Sat, 4 Mar 2006 22:54: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 k24MsQEg091576 for ; Sat, 4 Mar 2006 22:54: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 k24MsPFi091573 for perforce@freebsd.org; Sat, 4 Mar 2006 22:54:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 22:54:25 GMT Message-Id: <200603042254.k24MsPFi091573@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 92749 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 22:54:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=92749 Change 92749 by rwatson@rwatson_zoo on 2006/03/04 22:54:15 Integrate TrustedBSD base branch from FreeBSD CVS: - OpenBSM 1.0 alpha 5 loop back. - dwmalone's structural improvements to mac_bsdextended. Affected files ... .. //depot/projects/trustedbsd/base/contrib/openbsm/CHANGELOG#3 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/TODO#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/aclocal.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/autogen.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/compat/queue.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.guess#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.sub#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/depcomp#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/install-sh#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/ltmain.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/missing#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/configure#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/configure.ac#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_notify.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/man/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/lib/libutil/pidfile.3#4 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit.h#3 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#13 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_ufs.c#7 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#13 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#21 integrate .. //depot/projects/trustedbsd/base/usr.bin/finger/sprint.c#8 integrate Differences ... ==== //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#2 (text) ==== @@ -1,7 +1,33 @@ Upgrade Instructions for OpenBSM -------------------------------- -Currently this is very straight forward: +OpenBSM integrates into the FreeBSD source tree in several places: + +src/contrib/openbsm The OpenBSM distribution itself +src/sys/bsm Modified versions of some bsm/ include files +src/sys/security/audit Kernel audit framework, some OpenBSM-based files +src/usr.sbin/*audit* Makefiles for various OpenBSM tools +src/etc/Makefile Installation of /etc OpenBSM files +src/lib/libbsm/* Build for OpenBSM library + +OpenBSM is normally built using an integrated autoconf/automake build +system. For the purposes of tight integration with FreeBSD, we use an +adapted BSD make (bmake) build system loosely based on the autmake +setup. We also rely on a static config.h generated when OpenBSM is +imported, rather than re-configuring every build. This leads to a +more reproduceable build environment, and avoids dependence on things +not in the base tree (i.e., autoconf, automake, GNU make, etc). An +upgrade of OpenBSM generally involves the following steps: + +- Vendor import of OpenBSM into src/contrib. +- Run configure, commit src/contrib/openbsm/config/config.h. +- Replication of src/contrib/openbsm/bsm changes into src/sys/bsm. +- Possible updates to src/sys/security/audit, especially relating to + bsm_token.c. +- Update any library, tool, or etc BSD Makefiles to add new files, + defines, or other generally useful or necessary things. + +Normally, the CVS vendor import goes along the following lines: cd ~/p4/projects/trustedbsd/openbsm cvs -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import src/contrib/openbsm \ @@ -10,10 +36,9 @@ Replacing the version string as required. Use the "-n" argument to CVS to do a test run. -Right now, no local FreeBSD modification or configuration is required. In -future OpenBSM versions, this is likely to change. +Propagation of changes to src/sys/{bsm,security/audit} is something that +requires careful coordination and attention to detail. These files are +not on CVS vendor branches, but do have the same local vs. vendor merge +issues. -After importing OpenBSM, make sure to propagate any changes to files that -appear in both contrib/openbsm/bsm and sys/bsm. - -$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.2 2006/02/06 00:03:39 rwatson Exp $ +$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.3 2006/03/04 16:50:04 rwatson Exp $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/README#3 (text) ==== @@ -25,26 +25,34 @@ Building -OpenBSM is currently built using a series of BSD make files which should -work on both FreeBSD and Darwin. One known issue is that versions of -Darwin prior to 10.3.8 have a nested include of "sys/audit.h" from -"sys/proc.h", which can result in type definition conflicts. If running -with include files from an earlier version of Darwin, the nested include -must be manually removed in order that libbsm can be built, due to -potentially conflicting types resulting from an include of "sys/sysctl.h" -by that file. On Darwin, the use of BSD make must be specified explicitly -by using "bsdmake" rather than "make", which on Darwin refers to GNU make. -Typical invocations from the OpenBSM tree root: +OpenBSM is currently built using autoconf and automake, which should allow +for building on a range of operating systems, including FreeBSD, Mac OS X, +and Linux. Depending on the availability of audit facailities in the +underlying operating system, some components that depend on kernel audit +support are built conditionally. Typically, build will be performed using + + ./configure + make + +To install, use: -FreeBSD + make install - % make - # make install +You may wish to specify that the OpenBSM components not be installed in the +base system, rather in a specific directory. This may be done using the +--prefix argument to configure. If installing to a specific directory, +remember to update your library path so that running tools from that +directory the correct libbsm is used: -Darwin + ./configure --prefix=/home/rwatson/openbsm + make + make install + LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH - % bsdmake - # bsdmake install +You will need to manually propagate openbsm/etc/* into /etc on your system; +this is not done automatically so as to avoid disrupting the current +configuration. Currently, the locations of these files is not +configurable. Credits @@ -65,6 +73,7 @@ Christian Brueffer Olivier Houchard Christian Peron + Martin Fong In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -86,4 +95,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#14 $ +$P4: //depot/projects/trustedbsd/openbsm/README#16 $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/TODO#2 (text) ==== @@ -8,5 +8,10 @@ - Document contents of libbsm "public" data structures in libbsm man pages. - The audit.log.5 man page is incomplete, as it does not describe all token types. +- With the move to autoconf/automake, man page symlinks are no longer + installed. This needs to be fixed. +- It might be desirable to be able to provide EOPNOTSUPP system call stubs + on systems that don't have the necessary audit system calls; that would + allow the full libbsm and tool set to build, just not run. -$P4: //depot/projects/trustedbsd/openbsm/TODO#4 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#5 $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/audit.c#3 (text) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#6 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/audit_warn.c#2 (text) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#6 $ */ #include + +#include +#include #include -#include #include "auditd.h" ==== //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#3 (text) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 $ */ #include @@ -795,7 +795,11 @@ } } +#ifdef LOG_SECURITY openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); +#else + openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); +#endif syslog(LOG_INFO, "starting...\n"); if (debug == 0 && daemon(0, 0) == -1) { ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit.h#2 (text) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 $ */ #ifndef _BSM_AUDIT_H @@ -240,25 +240,11 @@ }; typedef struct auditpinfo_addr auditpinfo_addr_t; -/* Token and record structures. */ - -struct au_token { - u_char *t_data; - size_t len; - TAILQ_ENTRY(au_token) tokens; -}; +/* + * Contents of token_t are opaque outside of libbsm. + */ typedef struct au_token token_t; -struct au_record { - char used; /* Record currently in use? */ - int desc; /* Descriptor for record. */ - TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ - u_char *data; - size_t len; - LIST_ENTRY(au_record) au_rec_q; -}; -typedef struct au_record au_record_t; - /* * Kernel audit queue control parameters. */ @@ -310,6 +296,9 @@ }; typedef struct au_evclass_map au_evclass_map_t; +/* + * Audit system calls. + */ #if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_internal.h#2 (text) ==== @@ -34,11 +34,15 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 $ */ -#ifndef _LIBBSM_INTERNAL_H -#define _LIBBSM_INTERNAL_H +#ifndef _AUDIT_INTERNAL_H +#define _AUDIT_INTERNAL_H + +#if defined(__linux__) && !defined(__unused) +#define __unused +#endif /* * audit_internal.h contains private interfaces that are shared by user space @@ -47,7 +51,23 @@ * broken with future releases of OpenBSM, which may delete, modify, or * otherwise break these interfaces or the assumptions they rely on. */ +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; + +struct au_record { + char used; /* Record currently in use? */ + int desc; /* Descriptor for record. */ + TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ + u_char *data; + size_t len; + LIST_ENTRY(au_record) au_rec_q; +}; +typedef struct au_record au_record_t; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. @@ -96,4 +116,4 @@ #define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size) -#endif /* !_LIBBSM_INTERNAL_H_ */ +#endif /* !_AUDIT_INTERNAL_H_ */ ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#3 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#18 $ */ #ifndef _LIBBSM_H_ @@ -42,9 +42,9 @@ #include #include -#include #include /* Required for audit.h. */ +#include /* Required for clock_t on Linux. */ #include #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/compat/endian.h#2 (text) ==== @@ -25,18 +25,13 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#7 $ */ #ifndef _COMPAT_ENDIAN_H_ #define _COMPAT_ENDIAN_H_ /* - * Pick up value of BYTE_ORDER/_BYTE_ORDER if not yet included. - */ -#include - -/* * Some systems will have the uint/int types defined here already, others * will need stdint.h. */ ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_audit.c#2 (text) ==== @@ -30,11 +30,17 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 $ */ #include + +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else +#include +#endif #include #include @@ -256,11 +262,13 @@ pthread_mutex_unlock(&mutex); } +#ifdef HAVE_AUDIT_SYSCALLS /* * Add the header token, identify any missing tokens. Write out the tokens to * the record memory and finally, call audit. */ -int au_close(int d, int keep, short event) +int +au_close(int d, int keep, short event) { au_record_t *rec; size_t tot_rec_size; @@ -308,6 +316,7 @@ au_teardown(rec); return (retval); } +#endif /* HAVE_AUDIT_SYSCALLS */ /* * au_close(), except onto an in-memory buffer. Buffer size as an argument, ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_io.c#2 (text) ==== @@ -31,15 +31,32 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 $ */ #include -#ifdef __APPLE__ + +#include +#ifdef HAVE_SYS_ENDIAN_H +#include +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#else /* !__APPLE__ */ -#include -#endif /* __APPLE__*/ +#endif /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ + #include #include @@ -381,10 +398,7 @@ break; case AU_IPv6: - ipv6.__u6_addr.__u6_addr32[0] = ipaddr[0]; - ipv6.__u6_addr.__u6_addr32[1] = ipaddr[1]; - ipv6.__u6_addr.__u6_addr32[2] = ipaddr[2]; - ipv6.__u6_addr.__u6_addr32[3] = ipaddr[3]; + bcopy(ipaddr, &ipv6, sizeof(ipv6)); fprintf(fp, "%s", inet_ntop(AF_INET6, &ipv6, dst, INET6_ADDRSTRLEN)); break; ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_mask.c#2 (text) ==== @@ -27,11 +27,17 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 $ */ #include + +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_notify.c#3 (text) ==== @@ -26,18 +26,30 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 $ */ /* * Based on sample code from Marc Majka. */ -#include /* strerror() */ -#include /* errno */ +#include + +#include +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ + +#include #include -#include /* uint32_t */ -#include /* syslog() */ -#include /* syslog() */ + +#include +#include +#include +#include +#include + #ifdef __APPLE__ #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#2 (text) ==== @@ -30,15 +30,32 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#34 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#43 $ */ #include -#ifdef __APPLE__ + +#include +#ifdef HAVE_SYS_ENDIAN_H +#include +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#else /* !__APPLE__ */ -#include -#endif /* __APPLE__*/ +#endif /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ + #include #include #include @@ -352,10 +369,7 @@ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); return (t); } @@ -448,9 +462,18 @@ ADD_U_INT16(dptr, perm->mode); ADD_U_INT16(dptr, pad0); + +#ifdef HAVE_IPC_PERM___SEQ + ADD_U_INT16(dptr, perm->__seq); +#else ADD_U_INT16(dptr, perm->seq); +#endif +#ifdef HAVE_IPC_PERM___KEY + ADD_U_INT32(dptr, perm->__key); +#else ADD_U_INT32(dptr, perm->key); +#endif return (t); } @@ -781,50 +804,6 @@ /* * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * local Internet address 4 bytes - * remote port 2 bytes - * remote Internet address 4 bytes - */ -token_t * -au_to_socket(struct socket *so) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * address type/length 4 bytes - * local Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - * remote port 4 bytes - * address type/length 4 bytes - * remote Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - */ -token_t * -au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -token_t * -au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte * socket family 2 bytes * path 104 bytes */ @@ -898,10 +877,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); return (t); @@ -1031,7 +1007,7 @@ tid)); } -#if !defined(_KERNEL) && !defined(KERNEL) +#if !defined(_KERNEL) && !defined(KERNEL) && defined(HAVE_AUDIT_SYSCALLS) /* * Collects audit information for the current process * and creates a subject token from it ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_user.c#2 (text) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_wrappers.c#3 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 $ */ #ifdef __APPLE__ @@ -35,6 +35,11 @@ #include #include + +#ifdef __APPLE__ +#include /* Our bsm/audit.h doesn't include queue.h. */ +#endif + #include #include @@ -56,7 +61,11 @@ if (p == NULL) return (kAUBadParamErr); +#ifdef NODEV *p = NODEV; +#else + *p = -1; +#endif /* for /usr/bin/login, try fstat() first */ if (fstat(STDIN_FILENO, &st) != 0) { @@ -78,6 +87,8 @@ int audit_set_terminal_host(uint32_t *m) { + +#ifdef KERN_HOSTID int name[2] = { CTL_KERN, KERN_HOSTID }; size_t len; @@ -90,6 +101,10 @@ return (kAUSysctlErr); } return (kAUNoErr); +#else + *m = -1; + return (kAUNoErr); +#endif } int ==== //depot/projects/trustedbsd/base/lib/libutil/pidfile.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libutil/pidfile.3,v 1.4 2006/01/28 14:13:15 pjd Exp $ +.\" $FreeBSD: src/lib/libutil/pidfile.3,v 1.5 2006/03/04 15:20:28 keramida Exp $ .\" .Dd August 22, 2005 .Dt PIDFILE 3 @@ -120,8 +120,8 @@ pfh = pidfile_open("/var/run/daemon.pid", 0600, &otherpid); if (pfh == NULL) { if (errno == EEXIST) { - errx(EXIT_FAILURE, "Daemon already running, pid: %d.", - (int)otherpid); + errx(EXIT_FAILURE, "Daemon already running, pid: %jd.", + (intmax_t)otherpid); } /* If we cannot create pidfile from other reasons, only warn. */ warn("Cannot open or create pidfile"); @@ -147,7 +147,7 @@ /* Do child work. */ break; default: - syslog(LOG_INFO, "Child %d started.", (int)childpid); + syslog(LOG_INFO, "Child %jd started.", (intmax_t)childpid); break; } } ==== //depot/projects/trustedbsd/base/sys/bsm/audit.h#3 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/base/sys/bsm/audit.h#2 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.2 2006/02/01 19:54:22 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/base/sys/bsm/audit.h#3 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.3 2006/03/04 16:54:21 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -258,25 +258,11 @@ }; typedef struct auditpinfo_addr auditpinfo_addr_t; -/* Token and record structures. */ - -struct au_token { - u_char *t_data; - size_t len; - TAILQ_ENTRY(au_token) tokens; -}; +/* + * Contents of token_t are opaque outside of libbsm. + */ typedef struct au_token token_t; -struct au_record { - char used; /* Record currently in use? */ - int desc; /* Descriptor for record. */ - TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ - u_char *data; - size_t len; - LIST_ENTRY(au_record) au_rec_q; -}; -typedef struct au_record au_record_t; - /* * Kernel audit queue control parameters. */ @@ -328,6 +314,9 @@ }; typedef struct au_evclass_map au_evclass_map_t; +/* + * Audit system calls. + */ #if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); ==== //depot/projects/trustedbsd/base/sys/bsm/audit_internal.h#2 (text) ==== @@ -34,12 +34,16 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#5 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.1 2006/02/01 19:54:22 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#7 $ + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.2 2006/03/04 16:54:21 rwatson Exp $ */ -#ifndef _LIBBSM_INTERNAL_H -#define _LIBBSM_INTERNAL_H +#ifndef _AUDIT_INTERNAL_H +#define _AUDIT_INTERNAL_H + +#if defined(__linux__) && !defined(__unused) +#define __unused +#endif /* * audit_internal.h contains private interfaces that are shared by user space @@ -48,7 +52,23 @@ * broken with future releases of OpenBSM, which may delete, modify, or * otherwise break these interfaces or the assumptions they rely on. */ +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; +struct au_record { + char used; /* Record currently in use? */ + int desc; /* Descriptor for record. */ + TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ + u_char *data; + size_t len; + LIST_ENTRY(au_record) au_rec_q; +}; +typedef struct au_record au_record_t; + + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. @@ -97,4 +117,4 @@ #define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size) -#endif /* !_LIBBSM_INTERNAL_H_ */ +#endif /* !_AUDIT_INTERNAL_H_ */ ==== //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#13 (text+ko) ==== @@ -92,7 +92,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.18 2006/02/28 07:44:50 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.19 2006/03/04 21:46:34 mjacob Exp $"); #include #include /* XXX For static handler registration */ @@ -502,12 +502,12 @@ handled += pers->event(mpt, req, msg); if (handled == 0 && mpt->mpt_pers_mask == 0) { - mpt_lprt(mpt, MPT_PRT_WARN, + mpt_lprt(mpt, MPT_PRT_INFO, "No Handlers For Any Event Notify Frames. " "Event %#x (ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); } else if (handled == 0) { - mpt_prt(mpt, + mpt_lprt(mpt, MPT_PRT_WARN, "Unhandled Event Notify Frame. Event %#x " "(ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); ==== //depot/projects/trustedbsd/base/sys/geom/label/g_label_ufs.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ufs.c,v 1.9 2006/02/18 10:59:47 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ufs.c,v 1.10 2006/03/04 19:41:54 pjd Exp $"); #include #include @@ -78,8 +78,13 @@ if (fs == NULL) continue; /* Check for magic and make sure things are the right size */ - if (fs->fs_magic != FS_UFS1_MAGIC && - fs->fs_magic != FS_UFS2_MAGIC) { + if (fs->fs_magic == FS_UFS1_MAGIC && + fs->fs_old_size * fs->fs_fsize == (int32_t)pp->mediasize) { + /* Valid UFS1. */ + } else if (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_fsize > 0 && + pp->mediasize / fs->fs_fsize == fs->fs_size) { + /* Valid UFS2. */ + } else { g_free(fs); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 01:09:13 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9849016A420 for ; Sun, 5 Mar 2006 01:09:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B89D43D45 for ; Sun, 5 Mar 2006 01:09:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9E59246B83 for ; Sat, 4 Mar 2006 20:08:51 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C0D2A55526; Sun, 5 Mar 2006 01:09:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B21A016A423; Sun, 5 Mar 2006 01:09: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 898F516A420 for ; Sun, 5 Mar 2006 01:09:10 +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 3C7C243D45 for ; Sun, 5 Mar 2006 01:09:10 +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 k2519AER004879 for ; Sun, 5 Mar 2006 01:09:10 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 k251999V004876 for perforce@freebsd.org; Sun, 5 Mar 2006 01:09:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 01:09:09 GMT Message-Id: <200603050109.k251999V004876@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 92753 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 01:09:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=92753 Change 92753 by rwatson@rwatson_peppercorn on 2006/03/05 01:08:12 Belatedly update VERSION. Need to do this *before* the release next time. Maybe next time around. Affected files ... .. //depot/projects/trustedbsd/openbsm/VERSION#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/VERSION#7 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_3 +OPENBSM_1_0_ALPHA_5 From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 02:12:32 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52F1C16A420 for ; Sun, 5 Mar 2006 02:12:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAC7543D46 for ; Sun, 5 Mar 2006 02:12:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E9ED546C4E for ; Sat, 4 Mar 2006 21:12:10 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 24B90554C4; Sun, 5 Mar 2006 02:12:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1447F16A423; Sun, 5 Mar 2006 02:12:29 +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 C898916A420 for ; Sun, 5 Mar 2006 02:12:28 +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 86D2843D46 for ; Sun, 5 Mar 2006 02:12:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k252CSeg007200 for ; Sun, 5 Mar 2006 02:12:28 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 k252CSjB007197 for perforce@freebsd.org; Sun, 5 Mar 2006 02:12:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 02:12:28 GMT Message-Id: <200603050212.k252CSjB007197@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 92757 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 02:12:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=92757 Change 92757 by rwatson@rwatson_peppercorn on 2006/03/05 02:12:12 Switch to using Solaris-style AU_TO_WRITE and AU_NO_WRITE for 'keep' argument to au_close(). This appeared already to work due to numeric constants aligning (a bit like the stars), but using the actual constant names is better. Add a man page for au_open(), au_write(), au_close(), and au_close_buffer(). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#23 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#3 $ # INCLUDES = -I$(top_srcdir) @@ -30,6 +30,7 @@ au_free_token.3 \ au_io.3 \ au_mask.3 \ + au_open.3 \ au_token.3 \ au_user.3 \ libbsm.3 ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#4 $ # srcdir = @srcdir@ @@ -204,6 +204,7 @@ au_free_token.3 \ au_io.3 \ au_mask.3 \ + au_open.3 \ au_token.3 \ au_user.3 \ libbsm.3 ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#23 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#23 $ */ #include @@ -280,12 +280,11 @@ return (-1); /* Invalid descriptor */ } - if (!keep) { + if (keep == AU_NO_WRITE) { retval = 0; goto cleanup; } - tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; if (tot_rec_size > MAX_AUDIT_RECORD_SIZE) { ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#19 $ */ #ifdef __APPLE__ @@ -130,7 +130,7 @@ * tok = au_to_random_token_2(...); * au_write(aufd, tok); * ... - * au_close(aufd, 1, AUE_your_event_type); + * au_close(aufd, AU_TO_WRITE, AUE_your_event_type); * * Assumes, like all wrapper calls, that the caller has previously checked * that auditing is enabled via the audit_get_state() call. @@ -156,7 +156,7 @@ if (subject && au_write(aufd, subject) == -1) { au_free_token(subject); au_free_token(misctok); - (void)au_close(aufd, 0, event_code); + (void)au_close(aufd, AU_TO_WRITE, event_code); syslog(LOG_ERR, "%s: write of subject failed", func); return (kAUWriteSubjectTokErr); } @@ -164,31 +164,30 @@ /* Save the event-specific token. */ if (misctok && au_write(aufd, misctok) == -1) { au_free_token(misctok); - (void)au_close(aufd, 0, event_code); + (void)au_close(aufd, AU_NO_WRITE, event_code); syslog(LOG_ERR, "%s: write of caller token failed", func); return (kAUWriteCallerTokErr); } /* Tokenize and save the return value. */ if ((rettok = au_to_return32(retval, errcode)) == NULL) { - (void)au_close(aufd, 0, event_code); + (void)au_close(aufd, AU_NO_WRITE, event_code); syslog(LOG_ERR, "%s: au_to_return32() failed", func); return (kAUMakeReturnTokErr); } if (au_write(aufd, rettok) == -1) { au_free_token(rettok); - (void)au_close(aufd, 0, event_code); + (void)au_close(aufd, AU_NO_WRITE, event_code); syslog(LOG_ERR, "%s: write of return code failed", func); return (kAUWriteReturnTokErr); } /* - * au_close()'s second argument is "keep": if keep == 0, the record is - * discarded. We assume the caller wouldn't have bothered with this + * We assume the caller wouldn't have bothered with this * function if it hadn't already decided to keep the record. */ - if (au_close(aufd, 1, event_code) < 0) { + if (au_close(aufd, AU_TO_WRITE, event_code) < 0) { syslog(LOG_ERR, "%s: au_close() failed", func); return (kAUCloseErr); } From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 02:33:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0CBD216A422 for ; Sun, 5 Mar 2006 02:33:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 426DA43D7E for ; Sun, 5 Mar 2006 02:33:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 33E3246BD6 for ; Sat, 4 Mar 2006 21:32:53 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 38A1D582E2; Sun, 5 Mar 2006 02:32:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 271EC16A423; Sun, 5 Mar 2006 02:32: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 D9DF416A420 for ; Sun, 5 Mar 2006 02:32:33 +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 7538543D45 for ; Sun, 5 Mar 2006 02:32: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 k252WXHT008391 for ; Sun, 5 Mar 2006 02:32: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 k252WXgk008388 for perforce@freebsd.org; Sun, 5 Mar 2006 02:32:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 02:32:33 GMT Message-Id: <200603050232.k252WXgk008388@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 92761 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 02:33:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92761 Change 92761 by rwatson@rwatson_fledge on 2006/03/05 02:32:16 s/AU_NO_WRITE/AU_TO_NO_WRITE/ Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#24 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#20 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#1 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#2 $ .\" .Dd March 4, 2006 .Dt AU_OPEN 3 @@ -74,7 +74,7 @@ argument determines the behavior: a value of .Dv AU_TO_WRITE causes the record to be committed; a value of -.Dv AU_NO_WRITE +.Dv AU_TO_NO_WRITE causes it to be abandoned. When the audit record is committed, a BSM header will be inserted before tokens added to the record, using the event identifier passed via ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#24 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#23 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#24 $ */ #include @@ -280,7 +280,7 @@ return (-1); /* Invalid descriptor */ } - if (keep == AU_NO_WRITE) { + if (keep == AU_TO_NO_WRITE) { retval = 0; goto cleanup; } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#20 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#20 $ */ #ifdef __APPLE__ @@ -164,21 +164,21 @@ /* Save the event-specific token. */ if (misctok && au_write(aufd, misctok) == -1) { au_free_token(misctok); - (void)au_close(aufd, AU_NO_WRITE, event_code); + (void)au_close(aufd, AU_TO_NO_WRITE, event_code); syslog(LOG_ERR, "%s: write of caller token failed", func); return (kAUWriteCallerTokErr); } /* Tokenize and save the return value. */ if ((rettok = au_to_return32(retval, errcode)) == NULL) { - (void)au_close(aufd, AU_NO_WRITE, event_code); + (void)au_close(aufd, AU_TO_NO_WRITE, event_code); syslog(LOG_ERR, "%s: au_to_return32() failed", func); return (kAUMakeReturnTokErr); } if (au_write(aufd, rettok) == -1) { au_free_token(rettok); - (void)au_close(aufd, AU_NO_WRITE, event_code); + (void)au_close(aufd, AU_TO_NO_WRITE, event_code); syslog(LOG_ERR, "%s: write of return code failed", func); return (kAUWriteReturnTokErr); } From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 02:45:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1802016A425 for ; Sun, 5 Mar 2006 02:45:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B32F43D45 for ; Sun, 5 Mar 2006 02:45:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3DBF446BBC for ; Sat, 4 Mar 2006 21:45:32 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9DC7F56341; Sun, 5 Mar 2006 02:45:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DEFB16A423; Sun, 5 Mar 2006 02: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 4CCEC16A420 for ; Sun, 5 Mar 2006 02:45:51 +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 15BEF43D45 for ; Sun, 5 Mar 2006 02:45:51 +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 k252jo7Z008959 for ; Sun, 5 Mar 2006 02:45:50 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 k252joHI008956 for perforce@freebsd.org; Sun, 5 Mar 2006 02:45:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 02:45:50 GMT Message-Id: <200603050245.k252joHI008956@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 92764 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 02:45:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92764 Change 92764 by rwatson@rwatson_fledge on 2006/03/05 02:45:38 Add information on au_close() changes and au_open.3 to HISTORY. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#3 (text+ko) ==== @@ -1,3 +1,10 @@ +OpenBSM 1.0 alpha 6 + +- Use AU_TO_WRITE and AU_NO_TO_WRITE for the 'keep' argument to au_close(); + previously we used hard-coded 0 and 1 values. +- Add man page for au_open(), au_write(), au_close(), and + au_close_buffer(). + OpenBSM 1.0 alpha 5 - Update install notes to indicate /etc files are to be installed manually. @@ -124,4 +131,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#2 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#3 $ From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 09:34:20 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C3C116A420 for ; Sun, 5 Mar 2006 09:34:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E186143D48 for ; Sun, 5 Mar 2006 09:34:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 73CB146C3E for ; Sun, 5 Mar 2006 04:33:59 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C52CB55C26; Sun, 5 Mar 2006 09:34:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B30AA16A423; Sun, 5 Mar 2006 09:34: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 80BE016A420 for ; Sun, 5 Mar 2006 09:34:17 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49FD643D49 for ; Sun, 5 Mar 2006 09:34:17 +0000 (GMT) (envelope-from brueffer@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 k259YHke038740 for ; Sun, 5 Mar 2006 09:34:17 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k259YHh0038737 for perforce@freebsd.org; Sun, 5 Mar 2006 09:34:17 GMT (envelope-from brueffer@freebsd.org) Date: Sun, 5 Mar 2006 09:34:17 GMT Message-Id: <200603050934.k259YHh0038737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 92770 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 09:34:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=92770 Change 92770 by brueffer@brueffer_serenity on 2006/03/05 09:33:24 Fixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#2 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#3 $ .\" .Dd March 4, 2006 .Dt AU_OPEN 3 @@ -66,8 +66,8 @@ .Pp The .Fn au_close -is used to commit an audit record to the system audit log, or abandon the -record. +function is used to commit an audit record to the system audit log, or +abandon the record. In either cases, all resources associated with the record will be released. The .Va keep @@ -82,6 +82,7 @@ and a trailer added to the end. Committing a record to the system audit log requires privilege. .Pp +The .Fn au_close_buffer function writes the resulting record to an in-memory buffer of size .Va *buflen ; @@ -93,7 +94,7 @@ The function .Fn au_open returns a non-negative audit record descriptor number on success, or a -negative value on failure, along with error information in. +negative value on failure, along with error information in .Va errno . .Pp The functions @@ -119,7 +120,7 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh BUGS -There is currently no interface to extract a single token without wrapping +There is currently no interface to extract a single token without it being automatically wrapped in a header and trailer. .Pp Currently, @@ -134,4 +135,4 @@ .Fn au_open would reserve resources necessary to commit any submitted record, releasing them on -.Fn au_close. +.Fn au_close . From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 15:30:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F87916A420 for ; Sun, 5 Mar 2006 15:30:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 398C243D7B for ; Sun, 5 Mar 2006 15:30:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7E11E46C5E for ; Sun, 5 Mar 2006 10:29:57 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3A89C5B2F7; Sun, 5 Mar 2006 15:30:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2411C16A423; Sun, 5 Mar 2006 15:30:05 +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 D752316A422 for ; Sun, 5 Mar 2006 15:30:04 +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 A0DCC43D66 for ; Sun, 5 Mar 2006 15:30:01 +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 k25FU1Fl059642 for ; Sun, 5 Mar 2006 15:30:01 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 k25FU1ll059639 for perforce@freebsd.org; Sun, 5 Mar 2006 15:30:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 15:30:01 GMT Message-Id: <200603051530.k25FU1ll059639@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 92785 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 15:30:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=92785 Change 92785 by rwatson@rwatson_peppercorn on 2006/03/05 15:29:13 Correct typo. Submitted by: keramida Affected files ... .. //depot/projects/trustedbsd/openbsm/README#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#17 (text+ko) ==== @@ -27,7 +27,7 @@ OpenBSM is currently built using autoconf and automake, which should allow for building on a range of operating systems, including FreeBSD, Mac OS X, -and Linux. Depending on the availability of audit facailities in the +and Linux. Depending on the availability of audit facilities in the underlying operating system, some components that depend on kernel audit support are built conditionally. Typically, build will be performed using @@ -95,4 +95,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#16 $ +$P4: //depot/projects/trustedbsd/openbsm/README#17 $ From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 15:34:14 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F7D316A420 for ; Sun, 5 Mar 2006 15:34:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2729F43D49 for ; Sun, 5 Mar 2006 15:34:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 08E8446BA2 for ; Sun, 5 Mar 2006 10:33:49 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1452B55B70; Sun, 5 Mar 2006 15:34:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0084516A424; Sun, 5 Mar 2006 15:34: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 CF6F416A420 for ; Sun, 5 Mar 2006 15:34: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 2809143D49 for ; Sun, 5 Mar 2006 15:34:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k25FY7CU059858 for ; Sun, 5 Mar 2006 15:34:07 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 k25FY6RY059855 for perforce@freebsd.org; Sun, 5 Mar 2006 15:34:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 15:34:06 GMT Message-Id: <200603051534.k25FY6RY059855@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 92786 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 15:34:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=92786 Change 92786 by rwatson@rwatson_peppercorn on 2006/03/05 15:33:21 Various compatibility and functionality tweaks to help support a BSM file format and API test suite: - Support a more complete range of data types for the arbitrary data token: add AUR_CHAR (alias to AUR_BYTE), remove AUR_LONG, add AUR_INT32 (alias to AUR_INT), add AUR_INT64. - Add au_close_token(), which allows writing a single token_t to a memory buffer. Not likely to be used much by applications, but useful for writing test tools. This is not a Solaris BSM API. - Modify au_to_file() so that it accepts a timeval in user space, not just kernel -- this is not a Solaris BSM API so can be modified without causing compatibility issues. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#4 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#15 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#25 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#35 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#44 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#4 (text+ko) ==== @@ -4,6 +4,15 @@ previously we used hard-coded 0 and 1 values. - Add man page for au_open(), au_write(), au_close(), and au_close_buffer(). +- Support a more complete range of data types for the arbitrary data token: + add AUR_CHAR (alias to AUR_BYTE), remove AUR_LONG, add AUR_INT32 (alias + to AUR_INT), add AUR_INT64. +- Add au_close_token(), which allows writing a single token_t to a memory + buffer. Not likely to be used much by applications, but useful for + writing test tools. +- Modify au_to_file() so that it accepts a timeval in user space, not just + kernel -- this is not a Solaris BSM API so can be modified without + causing compatibility issues. OpenBSM 1.0 alpha 5 @@ -131,4 +140,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#3 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#4 $ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#15 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#15 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -187,13 +187,19 @@ /* data-types for the arbitrary token */ #define AUR_BYTE 0 +#define AUR_CHAR AUR_BYTE #define AUR_SHORT 1 -#define AUR_LONG 2 +#define AUR_INT32 2 +#define AUR_INT AUR_INT +#define AUR_INT64 3 /* ... and their sizes */ #define AUR_BYTE_SIZE sizeof(u_char) +#define AUR_CHAR_SIZE AUR_BYTE_SIZE #define AUR_SHORT_SIZE sizeof(uint16_t) -#define AUR_LONG_SIZE sizeof(uint32_t) +#define AUR_INT32_SIZE sizeof(uint32_t) +#define AUR_INT_SIZE AUR_INT32_SIZE +#define AUR_INT64_SIZE sizeof(uint64_t) /* Modifiers for the header token */ #define PAD_NOTATTR 0x4000 /* nonattributable event */ @@ -230,12 +236,9 @@ int au_write(int d, token_t *m); int au_close(int d, int keep, short event); int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen); +int au_close_token(token_t *tok, u_char *buffer, size_t *buflen); -#if defined(KERNEL) || defined(_KERNEL) token_t *au_to_file(char *file, struct timeval tm); -#else -token_t *au_to_file(char *file); -#endif #if defined(KERNEL) || defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, ==== //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#4 $ .\" .Dd March 4, 2006 .Dt AU_OPEN 3 @@ -46,6 +46,8 @@ .Fn au_close "int d" "int keep" "short event" .Ft int .Fn au_close_buffer "int d" "short event" "u_char *buffer" "size_t *buflen" +.Ft int +.Fn au_close_token "token_t *tok" "u_char *buffer" "size_t *buflen" .Sh DESCRIPTION These interfaces allow applications to allocate audit records, construct a record using a series of tokens, and commit the audit record to the system @@ -90,6 +92,17 @@ The argument .Va short is the event identifier to use in the record header. +.Pp +The +.Fn au_close_token +function generates the BSM stream output for a single token, +.Va tok , +in the passed buffer +.Va buffer . +The initial buffer size and resulting data size are passed via +.Va *buflen . +.Fn au_close_token +will free the token before returning. .Sh RETURN VALUES The function .Fn au_open @@ -100,8 +113,9 @@ The functions .Fn au_write , .Fn au_close , +.Fn au_close_buffer , and -.Fn au_close_buffer +.Fn au_close_token return 0 on success, or a negative value on failure, along with error information in .Va errno . @@ -120,9 +134,6 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh BUGS -There is currently no interface to extract a single token without -it being automatically wrapped in a header and trailer. -.Pp Currently, .Fn au_open does not reserve kernel resources necessary to commit the record to the ==== //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#6 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#6 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -116,9 +116,7 @@ .Ft token_t * .Fn au_to_opaque "char *data" "u_int64_t bytes" .Ft token_t * -.Fn au_to_file "char *file" -.Ft token_t * -.Fn au_to_file "char *file" +.Fn au_to_file "char *file" "struct timeval tm" .Ft token_t * .Fn au_to_text "char *text" .Ft token_t * ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#25 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#24 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#25 $ */ #include @@ -360,3 +360,24 @@ au_teardown(rec); return (retval); } + +/* + * au_close_token() returns the byte format of a token_t. This won't + * generally be used by applications, but is quite useful for writing test + * tools. Will free the token on either success or failure. + */ +int +au_close_token(token_t *tok, u_char *buffer, size_t *buflen) +{ + + if (tok->len > *buflen) { + au_free_token(tok); + errno = ENOMEM; + return (EINVAL); + } + + memcpy(buffer, tok->t_data, tok->len); + *buflen = tok->len; + au_free_token(tok); + return (0); +} ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#35 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#35 $ */ #include @@ -893,6 +893,7 @@ */ switch(tok->tt.arb.bu) { case AUR_BYTE: + /* case AUR_CHAR: */ datasize = AUR_BYTE_SIZE; break; @@ -900,8 +901,13 @@ datasize = AUR_SHORT_SIZE; break; - case AUR_LONG: - datasize = AUR_LONG_SIZE; + case AUR_INT32: + /* case AUR_INT: */ + datasize = AUR_INT32_SIZE; + break; + + case AUR_INT64: + datasize = AUR_INT64_SIZE; break; default: @@ -962,6 +968,7 @@ print_delim(fp, del); switch(tok->tt.arb.bu) { case AUR_BYTE: + /* case AUR_CHAR: */ str = "byte"; size = AUR_BYTE_SIZE; print_string(fp, str, strlen(str)); @@ -979,23 +986,36 @@ print_delim(fp, del); print_1_byte(fp, tok->tt.arb.uc, "%u"); print_delim(fp, del); - for (i = 0; itt.arb.uc; i++) + for (i = 0; i < tok->tt.arb.uc; i++) fprintf(fp, format, *((u_int16_t *)(tok->tt.arb.data + (size * i)))); break; - case AUR_LONG: + case AUR_INT32: + /* case AUR_INT: */ str = "int"; - size = AUR_LONG_SIZE; + size = AUR_INT32_SIZE; print_string(fp, str, strlen(str)); print_delim(fp, del); print_1_byte(fp, tok->tt.arb.uc, "%u"); print_delim(fp, del); - for (i = 0; itt.arb.uc; i++) + for (i = 0; i < tok->tt.arb.uc; i++) fprintf(fp, format, *((u_int32_t *)(tok->tt.arb.data + (size * i)))); break; + case AUR_INT64: + str = "int64"; + size = AUR_INT64_SIZE; + print_string(fp, str, strlen(str)); + print_delim(fp, del); + print_1_byte(fp, tok->tt.arb.uc, "%u"); + print_delim(fp, del); + for (i = 0; i < tok->tt.arb.uc; i++) + fprintf(fp, format, *((u_int64_t *)(tok->tt.arb.data + + (size * i)))); + break; + default: return; } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#44 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#43 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#44 $ */ #include @@ -243,6 +243,7 @@ /* Determine the size of the basic unit. */ switch (unit_type) { case AUR_BYTE: + /* case AUR_CHAR: */ datasize = AUR_BYTE_SIZE; break; @@ -250,8 +251,13 @@ datasize = AUR_SHORT_SIZE; break; - case AUR_LONG: - datasize = AUR_LONG_SIZE; + case AUR_INT32: + /* case AUR_INT: */ + datasize = AUR_INT32_SIZE; + break; + + case AUR_INT64: + datasize = AUR_INT64_SIZE; break; default: @@ -261,7 +267,7 @@ totdata = datasize * unit_count; - GET_TOKEN_AREA(t, dptr, totdata + 4 * sizeof(u_char)); + GET_TOKEN_AREA(t, dptr, 4 * sizeof(u_char) + totdata); if (t == NULL) return (NULL); @@ -528,23 +534,12 @@ * file pathname N bytes + 1 terminating NULL byte */ token_t * -#if defined(KERNEL) || defined(_KERNEL) au_to_file(char *file, struct timeval tm) -#else -au_to_file(char *file) -#endif { token_t *t; u_char *dptr = NULL; u_int16_t filelen; u_int32_t timems; -#if !defined(KERNEL) && !defined(_KERNEL) - struct timeval tm; - struct timezone tzp; - - if (gettimeofday(&tm, &tzp) == -1) - return (NULL); -#endif filelen = strlen(file); filelen += 1; From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 15:45:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2222316A422 for ; Sun, 5 Mar 2006 15:45:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 887F043D45 for ; Sun, 5 Mar 2006 15:45:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B0F9D46BA2 for ; Sun, 5 Mar 2006 10:45:05 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 46E6A55928; Sun, 5 Mar 2006 15:45:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 339FB16A423; Sun, 5 Mar 2006 15:45: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 0CCEE16A420 for ; Sun, 5 Mar 2006 15:45: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 BD2DD43D45 for ; Sun, 5 Mar 2006 15:45: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 k25FjOxA060475 for ; Sun, 5 Mar 2006 15:45: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 k25FjOtq060472 for perforce@freebsd.org; Sun, 5 Mar 2006 15:45:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 15:45:24 GMT Message-Id: <200603051545.k25FjOtq060472@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 92789 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 15:45:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=92789 Change 92789 by rwatson@rwatson_peppercorn on 2006/03/05 15:45:02 Define a new API, au_to_header32_tm(), which adds a struct timeval argument to the ordinary au_to_header32(), which is now implemented by wrapping au_to_header32_tm() and calling gettimeofday(). #ifndef KERNEL the APIs that invoke gettimeofday(), rather than having a variable definition. Don't try to retrieve time zone information using gettimeofday(), as it's not needed, and introduces possible failure modes. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#5 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#16 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#26 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#45 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#5 (text+ko) ==== @@ -13,6 +13,13 @@ - Modify au_to_file() so that it accepts a timeval in user space, not just kernel -- this is not a Solaris BSM API so can be modified without causing compatibility issues. +- Define a new API, au_to_header32_tm(), which adds a struct timeval + argument to the ordinary au_to_header32(), which is now implemented by + wrapping au_to_header32_tm() and calling gettimeofday(). #ifndef KERNEL + the APIs that invoke gettimeofday(), rather than having a variable + definition. Don't try to retrieve time zone information using + gettimeofday(), as it's not needed, and introduces possible failure + modes. OpenBSM 1.0 alpha 5 @@ -140,4 +147,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#4 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#5 $ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#16 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#16 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -240,17 +240,14 @@ token_t *au_to_file(char *file, struct timeval tm); -#if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, +token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); -token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, - struct timeval tm); -#else +#if !defined(KERNEL) && !defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); #endif -token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_me(void); token_t *au_to_arg(char n, char *text, uint32_t v); token_t *au_to_arg32(char n, char *text, uint32_t v); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#26 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#25 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#26 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#45 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#44 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#45 $ */ #include @@ -1112,24 +1112,13 @@ * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) */ token_t * -#if defined(KERNEL) || defined(_KERNEL) -au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, +au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm) -#else -au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) -#endif { token_t *t; u_char *dptr = NULL; u_int32_t timems; -#if !defined(KERNEL) && !defined(_KERNEL) - struct timeval tm; - struct timezone tzp; - if (gettimeofday(&tm, &tzp) == -1) - return (NULL); -#endif - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + sizeof(u_char) + 2 * sizeof(u_int16_t) + 2 * sizeof(u_int32_t)); if (t == NULL) @@ -1149,7 +1138,18 @@ return (t); } +#if !defined(KERNEL) && !defined(_KERNEL) token_t * +au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) +{ + struct timeval tm; + + if (gettimeofday(&tm, NULL) == -1) + return (NULL); + return (au_to_header32_tm(rec_size, e_type, e_mod, tm)); +} + +token_t * au_to_header64(__unused int rec_size, __unused au_event_t e_type, __unused au_emod_t e_mod) { @@ -1164,6 +1164,7 @@ return (au_to_header32(rec_size, e_type, e_mod)); } +#endif /* * token ID 1 byte From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 16:16:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A878F16A422 for ; Sun, 5 Mar 2006 16:16:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C085043D48 for ; Sun, 5 Mar 2006 16:16:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3EBF246B42 for ; Sun, 5 Mar 2006 11:15:45 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5E06456278; Sun, 5 Mar 2006 16:16:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 42FA316A423; Sun, 5 Mar 2006 16:16: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 EA00F16A420 for ; Sun, 5 Mar 2006 16:16:02 +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 9ADB643D49 for ; Sun, 5 Mar 2006 16:16: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 k25GG2gv061790 for ; Sun, 5 Mar 2006 16:16: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 k25GG16R061787 for perforce@freebsd.org; Sun, 5 Mar 2006 16:16:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 16:16:01 GMT Message-Id: <200603051616.k25GG16R061787@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 92790 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 16:16:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92790 Change 92790 by rwatson@rwatson_peppercorn on 2006/03/05 16:15:28 Mark several files as being executable. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/install-sh#2 edit .. //depot/projects/trustedbsd/openbsm/config/ltmain.sh#2 edit .. //depot/projects/trustedbsd/openbsm/config/missing#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/install-sh#2 (xtext/text+ko) ==== ==== //depot/projects/trustedbsd/openbsm/config/ltmain.sh#2 (xtext/text+ko) ==== ==== //depot/projects/trustedbsd/openbsm/config/missing#2 (xtext/text+ko) ==== From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 16:16:09 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B88E316A422 for ; Sun, 5 Mar 2006 16:16:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3855C43D48 for ; Sun, 5 Mar 2006 16:16:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A82FA46BAA for ; Sun, 5 Mar 2006 11:15:48 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A08C557081; Sun, 5 Mar 2006 16:16:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 74AA016A438; Sun, 5 Mar 2006 16:16: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 4568916A420 for ; Sun, 5 Mar 2006 16:16: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 E659643D4C for ; Sun, 5 Mar 2006 16:16: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 k25GG2nb061796 for ; Sun, 5 Mar 2006 16:16: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 k25GG2YJ061793 for perforce@freebsd.org; Sun, 5 Mar 2006 16:16:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 16:16:02 GMT Message-Id: <200603051616.k25GG2YJ061793@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 92791 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 16:16:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=92791 Change 92791 by rwatson@rwatson_peppercorn on 2006/03/05 16:15:56 Mark configure.guess as executable. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.guess#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.guess#2 (xtext/text+ko) ==== From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 16:17:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB43816A420 for ; Sun, 5 Mar 2006 16:17:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3913E43D48 for ; Sun, 5 Mar 2006 16:17:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A244946B9C for ; Sun, 5 Mar 2006 11:16:47 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3AA5055538; Sun, 5 Mar 2006 16:17:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2703A16A423; Sun, 5 Mar 2006 16:17:05 +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 012C216A420 for ; Sun, 5 Mar 2006 16:17:05 +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 A938443D48 for ; Sun, 5 Mar 2006 16:17:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k25GH4U8061895 for ; Sun, 5 Mar 2006 16:17:04 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 k25GH4cE061892 for perforce@freebsd.org; Sun, 5 Mar 2006 16:17:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 16:17:04 GMT Message-Id: <200603051617.k25GH4cE061892@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 92792 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 16:17:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=92792 Change 92792 by rwatson@rwatson_peppercorn on 2006/03/05 16:16:30 Two more files as executable. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.sub#2 edit .. //depot/projects/trustedbsd/openbsm/config/depcomp#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.sub#2 (xtext/text+ko) ==== ==== //depot/projects/trustedbsd/openbsm/config/depcomp#2 (xtext/text+ko) ==== From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 18:38:02 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B2F716A42B for ; Sun, 5 Mar 2006 18:38:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89CE843D48 for ; Sun, 5 Mar 2006 18:38:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A178646BB5 for ; Sun, 5 Mar 2006 13:37:40 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4A65057063; Sun, 5 Mar 2006 18:38:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3744516A422; Sun, 5 Mar 2006 18:38: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 EC1E316A423 for ; Sun, 5 Mar 2006 18:37: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 98A1343D49 for ; Sun, 5 Mar 2006 18:37:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k25IbxmO074623 for ; Sun, 5 Mar 2006 18:37:59 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 k25IbxZg074620 for perforce@freebsd.org; Sun, 5 Mar 2006 18:37:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 18:37:59 GMT Message-Id: <200603051837.k25IbxZg074620@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 92803 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 18:38:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=92803 Change 92803 by rwatson@rwatson_peppercorn on 2006/03/05 18:37:45 Always read and write process32/subject32 addr/machine fields in network byte order, as they are interpreted as IP addresses. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#36 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#46 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#6 (text+ko) ==== @@ -20,6 +20,8 @@ definition. Don't try to retrieve time zone information using gettimeofday(), as it's not needed, and introduces possible failure modes. +- Always read and write process32 and subject32 machine/addr fields in + network byte order. OpenBSM 1.0 alpha 5 @@ -147,4 +149,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#5 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#6 $ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#36 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#35 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#36 $ */ #include @@ -1732,7 +1732,8 @@ if (err) return (-1); - READ_TOKEN_U_INT32(buf, len, tok->tt.proc32.tid.addr, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.proc32.tid.addr, + sizeof(tok->tt.proc32.tid.addr), tok->len, err); if (err) return (-1); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#46 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#45 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#46 $ */ #include @@ -645,7 +645,7 @@ ADD_U_INT32(dptr, pid); ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->port); - ADD_U_INT32(dptr, tid->machine); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); return (t); } @@ -918,7 +918,7 @@ ADD_U_INT32(dptr, pid); ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->port); - ADD_U_INT32(dptr, tid->machine); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); return (t); } From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 18:40:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D2C516A422 for ; Sun, 5 Mar 2006 18:40:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B79743D45 for ; Sun, 5 Mar 2006 18:40:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4E42E46B2A for ; Sun, 5 Mar 2006 13:39:43 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 09BEA55675; Sun, 5 Mar 2006 18:40:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EAD4016A423; Sun, 5 Mar 2006 18:40: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 C465416A420 for ; Sun, 5 Mar 2006 18:40:02 +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 8DEF043D45 for ; Sun, 5 Mar 2006 18:40: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 k25Ie2rZ074768 for ; Sun, 5 Mar 2006 18:40: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 k25Ie2Xe074765 for perforce@freebsd.org; Sun, 5 Mar 2006 18:40:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 18:40:02 GMT Message-Id: <200603051840.k25Ie2Xe074765@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 92804 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 18:40:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=92804 Change 92804 by rwatson@rwatson_peppercorn on 2006/03/05 18:39:14 Slightly revise description of previous change, in order to note that the byte order here is a property of the consumer using the APIs properly with network byte order IP address fields. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#7 (text+ko) ==== @@ -20,8 +20,10 @@ definition. Don't try to retrieve time zone information using gettimeofday(), as it's not needed, and introduces possible failure modes. -- Always read and write process32 and subject32 machine/addr fields in - network byte order. +- Don't perform byte order transformations on the addr/machine fields of + the terminal ID that appears in the process32/subject32 tokens. These + are assumed to be IP addresses, and as such, to be in network byte + order. OpenBSM 1.0 alpha 5 @@ -149,4 +151,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#6 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#7 $ From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 18:43:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5978916A420 for ; Sun, 5 Mar 2006 18:43:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2579A43D69 for ; Sun, 5 Mar 2006 18:42:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7C48B46BF0 for ; Sun, 5 Mar 2006 13:42:34 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9DF7063EC7; Sun, 5 Mar 2006 18:42:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7993116A486; Sun, 5 Mar 2006 18:42:08 +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 5104716A481 for ; Sun, 5 Mar 2006 18:42:08 +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 B342543D45 for ; Sun, 5 Mar 2006 18:42:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k25Ig7LF074909 for ; Sun, 5 Mar 2006 18:42:07 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 k25Ig7oB074906 for perforce@freebsd.org; Sun, 5 Mar 2006 18:42:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 18:42:07 GMT Message-Id: <200603051842.k25Ig7oB074906@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 92805 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 18:43:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=92805 Change 92805 by rwatson@rwatson_peppercorn on 2006/03/05 18:41:06 Bump version string to alpha 6 now so I don't forget later. Affected files ... .. //depot/projects/trustedbsd/openbsm/VERSION#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/VERSION#8 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_5 +OPENBSM_1_0_ALPHA_6 From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 19:55:41 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCFCB16A424 for ; Sun, 5 Mar 2006 19:55:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EE9543D46 for ; Sun, 5 Mar 2006 19:55:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 26E0946BCA for ; Sun, 5 Mar 2006 14:55:20 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9FF6D56001; Sun, 5 Mar 2006 19:55:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BFF516A423; Sun, 5 Mar 2006 19:55: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 60F3216A420 for ; Sun, 5 Mar 2006 19:55: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 0F08F43D49 for ; Sun, 5 Mar 2006 19:55: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 k25JtboL079501 for ; Sun, 5 Mar 2006 19:55:37 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 k25Jtbsu079498 for perforce@freebsd.org; Sun, 5 Mar 2006 19:55:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 5 Mar 2006 19:55:37 GMT Message-Id: <200603051955.k25Jtbsu079498@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 92809 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 19:55:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=92809 Change 92809 by rwatson@rwatson_peppercorn on 2006/03/05 19:54:48 When decoding the following token types, assume that the consumer wants network byte order IP addresses and port numbers, and in some cases other multi-byte IP header fields: - AUT_IN_ADDR - AUT_IP - AUT_IPORT - AUT_SOCKINET32 - AUT_SOCKET - AUT_SOCKET32_EX When printing these fields, convert from network byte order. When encoding the following token types, assume the consumer provides IP addresses and port numbers in network byte order: - AUT_IN_ADDR - AUT_IN_ADDR_EX - AUT_SOCKINET32 - AUT_SOCKINET128 In general, prefer to hard-code the size of fields in terms of the sizes they are defined in in the BSM spec. It's not clear whether this is really better or worse than defining it in terms of local data types, since we will break nastily either way. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#37 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#47 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#37 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#36 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#37 $ */ #include @@ -1356,7 +1356,8 @@ { int err = 0; - READ_TOKEN_U_INT32(buf, len, tok->tt.inaddr.addr, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.inaddr.addr, sizeof(uint32_t), + tok->len, err); if (err) return (-1); @@ -1430,15 +1431,18 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.ip.len, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.ip.len, sizeof(uint16_t), + tok->len, err); if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.ip.id, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.ip.id, sizeof(uint16_t), + tok->len, err); if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.ip.offset, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.ip.offset, sizeof(uint16_t), + tok->len, err); if (err) return (-1); @@ -1450,7 +1454,8 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.ip.chksm, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.ip.chksm, sizeof(uint16_t), + tok->len, err); if (err) return (-1); @@ -1478,17 +1483,17 @@ print_delim(fp, del); print_mem(fp, (u_char *)(&tok->tt.ip.tos), sizeof(u_char)); print_delim(fp, del); - print_2_bytes(fp, tok->tt.ip.len, "%u"); + print_2_bytes(fp, ntohs(tok->tt.ip.len), "%u"); print_delim(fp, del); - print_2_bytes(fp, tok->tt.ip.id, "%u"); + print_2_bytes(fp, ntohs(tok->tt.ip.id), "%u"); print_delim(fp, del); - print_2_bytes(fp, tok->tt.ip.offset, "%u"); + print_2_bytes(fp, ntohs(tok->tt.ip.offset), "%u"); print_delim(fp, del); print_mem(fp, (u_char *)(&tok->tt.ip.ttl), sizeof(u_char)); print_delim(fp, del); print_mem(fp, (u_char *)(&tok->tt.ip.prot), sizeof(u_char)); print_delim(fp, del); - print_2_bytes(fp, tok->tt.ip.chksm, "%u"); + print_2_bytes(fp, ntohs(tok->tt.ip.chksm), "%u"); print_delim(fp, del); print_ip_address(fp, tok->tt.ip.src); print_delim(fp, del); @@ -1602,7 +1607,8 @@ { int err = 0; - READ_TOKEN_U_INT16(buf, len, tok->tt.iport.port, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.iport.port, sizeof(uint16_t), + tok->len, err); if (err) return (-1); @@ -1616,7 +1622,7 @@ print_tok_type(fp, tok->id, "ip port", raw); print_delim(fp, del); - print_2_bytes(fp, tok->tt.iport.port, "%#x"); + print_2_bytes(fp, ntohs(tok->tt.iport.port), "%#x"); } /* @@ -1952,7 +1958,8 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet32.port, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.port, + sizeof(uint16_t), tok->len, err); if (err) return (-1); @@ -1973,7 +1980,7 @@ print_delim(fp, del); print_2_bytes(fp, tok->tt.sockinet32.family, "%u"); print_delim(fp, del); - print_2_bytes(fp, tok->tt.sockinet32.port, "%u"); + print_2_bytes(fp, ntohs(tok->tt.sockinet32.port), "%u"); print_delim(fp, del); print_ip_address(fp, tok->tt.sockinet32.addr); } @@ -1982,7 +1989,8 @@ * socket family 2 bytes * path 104 bytes */ -static int fetch_sock_unix_tok(tokenstr_t *tok, char *buf, int len) +static int +fetch_sock_unix_tok(tokenstr_t *tok, char *buf, int len) { int err = 0; @@ -2018,7 +2026,8 @@ * remote port 2 bytes * remote address 4 bytes */ -static int fetch_socket_tok(tokenstr_t *tok, char *buf, int len) +static int +fetch_socket_tok(tokenstr_t *tok, char *buf, int len) { int err = 0; @@ -2026,7 +2035,8 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.socket.l_port, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.socket.l_port, sizeof(uint16_t), + tok->len, err); if (err) return (-1); @@ -2035,7 +2045,8 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.socket.r_port, tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.socket.r_port, sizeof(uint16_t), + tok->len, err); if (err) return (-1); @@ -2056,11 +2067,11 @@ print_delim(fp, del); print_2_bytes(fp, tok->tt.socket.type, "%u"); print_delim(fp, del); - print_2_bytes(fp, tok->tt.socket.l_port, "%u"); + print_2_bytes(fp, ntohs(tok->tt.socket.l_port), "%u"); print_delim(fp, del); print_ip_address(fp, tok->tt.socket.l_addr); print_delim(fp, del); - print_2_bytes(fp, tok->tt.socket.r_port, "%u"); + print_2_bytes(fp, ntohs(tok->tt.socket.r_port), "%u"); print_delim(fp, del); print_ip_address(fp, tok->tt.socket.r_addr); } @@ -2380,8 +2391,8 @@ if (err) return (-1); - READ_TOKEN_U_INT16(buf, len, tok->tt.socket_ex32.l_port, tok->len, - err); + READ_TOKEN_BYTES(buf, len, &tok->tt.socket_ex32.l_port, + sizeof(uint16_t), tok->len, err); if (err) return (-1); @@ -2395,8 +2406,8 @@ if (err) return (-1); - READ_TOKEN_U_INT32(buf, len, tok->tt.socket_ex32.r_port, tok->len, - err); + READ_TOKEN_BYTES(buf, len, &tok->tt.socket_ex32.r_port, + sizeof(uint16_t), tok->len, err); if (err) return (-1); @@ -2422,11 +2433,11 @@ print_delim(fp, del); print_2_bytes(fp, tok->tt.socket_ex32.type, "%#x"); print_delim(fp, del); - print_2_bytes(fp, tok->tt.socket_ex32.l_port, "%#x"); + print_2_bytes(fp, ntohs(tok->tt.socket_ex32.l_port), "%#x"); print_delim(fp, del); print_ip_address(fp, tok->tt.socket_ex32.l_addr); print_delim(fp, del); - print_4_bytes(fp, tok->tt.socket_ex32.r_port, "%#x"); + print_4_bytes(fp, ntohs(tok->tt.socket_ex32.r_port), "%#x"); print_delim(fp, del); print_ip_address(fp, tok->tt.socket_ex32.r_addr); } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#47 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#46 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#47 $ */ #include @@ -347,12 +347,12 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(uint32_t)); if (t == NULL) return (NULL); ADD_U_CHAR(dptr, AUT_IN_ADDR); - ADD_U_INT32(dptr, internet_addr->s_addr); + ADD_MEM(dptr, &internet_addr->s_addr, sizeof(uint32_t)); return (t); } @@ -369,13 +369,13 @@ u_char *dptr = NULL; u_int32_t type = AF_INET6; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 5 * sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 5 * sizeof(uint32_t)); if (t == NULL) return (NULL); ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); + ADD_MEM(dptr, internet_addr, 5 * sizeof(uint32_t)); return (t); } @@ -832,21 +832,28 @@ { token_t *t; u_char *dptr = NULL; + uint16_t family; - GET_TOKEN_AREA(t, dptr, 3 * sizeof(u_char) + sizeof(u_int16_t) + - sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 2 * sizeof(uint16_t) + + sizeof(uint32_t)); if (t == NULL) return (NULL); ADD_U_CHAR(dptr, AUT_SOCKINET32); /* - * In Darwin, sin_family is one octet, but BSM defines the token - * to store two. So we copy in a 0 first. + * BSM defines the family field as 16 bits, but many operating + * systems have an 8-bit sin_family field. Extend to 16 bits before + * writing into the token. Assume that both the port and the address + * in the sockaddr_in are already in network byte order, but family + * is in local byte order. + * + * XXXRW: Should a name space conversion be taking place on the value + * of sin_family? */ - ADD_U_CHAR(dptr, 0); - ADD_U_CHAR(dptr, so->sin_family); - ADD_U_INT16(dptr, so->sin_port); - ADD_U_INT32(dptr, so->sin_addr.s_addr); + family = so->sin_family; + ADD_U_INT16(dptr, family); + ADD_MEM(dptr, &so->sin_port, sizeof(uint16_t)); + ADD_MEM(dptr, &so->sin_addr.s_addr, sizeof(uint32_t)); return (t); @@ -872,7 +879,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); + ADD_MEM(dptr, &so->sin6_addr, 4 * sizeof(uint32_t)); return (t); From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 5 21:48:04 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D922616A424 for ; Sun, 5 Mar 2006 21:48:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4775043D45 for ; Sun, 5 Mar 2006 21:48:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2CA7A46C5B for ; Sun, 5 Mar 2006 16:47:43 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 32CE9566AF; Sun, 5 Mar 2006 21:48:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C2A916A423; Sun, 5 Mar 2006 21:48: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 CD8FB16A420 for ; Sun, 5 Mar 2006 21:47:59 +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 991F043D45 for ; Sun, 5 Mar 2006 21:47:59 +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 k25LlxtQ092108 for ; Sun, 5 Mar 2006 21:47:59 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k25LlxaL092105 for perforce@freebsd.org; Sun, 5 Mar 2006 21:47:59 GMT (envelope-from wsalamon@computer.org) Date: Sun, 5 Mar 2006 21:47:59 GMT Message-Id: <200603052147.k25LlxaL092105@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 92819 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 21:48:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=92819 Change 92819 by wsalamon@gretsch on 2006/03/05 21:47:32 Audit the remaining required arguments for quotactl(), mkfifo(), and symlink() system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#30 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#30 (text+ko) ==== @@ -191,6 +191,8 @@ int error; struct nameidata nd; + AUDIT_ARG(cmd, uap->cmd); + AUDIT_ARG(uid, uap->uid); if (jailed(td->td_ucred) && !prison_quotas) return (EPERM); mtx_lock(&Giant); @@ -1316,6 +1318,7 @@ struct nameidata nd; int vfslocked; + AUDIT_ARG(mode, mode); restart: bwillwrite(); NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, @@ -1531,6 +1534,7 @@ if ((error = copyinstr(path, syspath, MAXPATHLEN, NULL)) != 0) goto out; } + AUDIT_ARG(text, syspath); restart: bwillwrite(); NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#10 (text+ko) ==== @@ -547,6 +547,12 @@ /* Header, subject, and return tokens added at end */ break; + case AUE_MKFIFO: + if (ARG_IS_VALID(kar, ARG_MODE)) { + tok = au_to_arg32(2, "mode", ar->ar_arg_mode); + kau_write(rec, tok); + } + /* fall through */ case AUE_ACCESS: case AUE_CHDIR: case AUE_CHROOT: @@ -555,7 +561,6 @@ case AUE_GETATTRLIST: case AUE_NFS_GETFH: case AUE_LSTAT: - case AUE_MKFIFO: case AUE_PATHCONF: case AUE_READLINK: case AUE_REVOKE: From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 6 17:04:01 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D5E4016A420 for ; Mon, 6 Mar 2006 17:04:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E1CF43D66 for ; Mon, 6 Mar 2006 17:03:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 48B7346BA1 for ; Mon, 6 Mar 2006 12:03:27 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 934AE5651B; Mon, 6 Mar 2006 17:02:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7310B16A423; Mon, 6 Mar 2006 17:02: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 44B9816A420 for ; Mon, 6 Mar 2006 17:02:44 +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 679BE43D48 for ; Mon, 6 Mar 2006 17:02: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 k26H2YpB080824 for ; Mon, 6 Mar 2006 17:02: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 k26H2XvP080821 for perforce@freebsd.org; Mon, 6 Mar 2006 17:02:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Mar 2006 17:02:33 GMT Message-Id: <200603061702.k26H2XvP080821@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 92857 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Mar 2006 17:04:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=92857 Change 92857 by rwatson@rwatson_zoo on 2006/03/06 17:01:52 Integrate TrustedBSD audit3 branch from TrustedBSD base branch: - OpenBSM 1.0 alpha 5 loop back. - dwmalone's structural improvements to mac_bsdextended. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/pidfile.3#4 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#25 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_ufs.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/crypto.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#19 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/finger/sprint.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#4 (text) ==== @@ -6,12 +6,9 @@ src/contrib/openbsm The OpenBSM distribution itself src/sys/bsm Modified versions of some bsm/ include files src/sys/security/audit Kernel audit framework, some OpenBSM-based files -src/usr.sbin/audit Makefiles for OpenBSM-derived command -src/usr.sbin/auditd "" -src/usr.sbin/auditreduce "" -src/usr.sbin/praudit "" +src/usr.sbin/*audit* Makefiles for various OpenBSM tools src/etc/Makefile Installation of /etc OpenBSM files -src/lib/libbsm Build for OpenBSM library +src/lib/libbsm/* Build for OpenBSM library OpenBSM is normally built using an integrated autoconf/automake build system. For the purposes of tight integration with FreeBSD, we use an @@ -44,4 +41,4 @@ not on CVS vendor branches, but do have the same local vs. vendor merge issues. -$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.2 2006/02/06 00:03:39 rwatson Exp $ +$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.3 2006/03/04 16:50:04 rwatson Exp $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#11 (text+ko) ==== @@ -95,4 +95,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#10 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#11 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#7 (text+ko) ==== @@ -14,4 +14,4 @@ on systems that don't have the necessary audit system calls; that would allow the full libbsm and tool set to build, just not run. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#6 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#7 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#7 $ */ /* * Program to trigger the audit daemon with a message that is either: ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#3 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#4 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#8 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#10 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#10 $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#8 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#8 $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#9 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#9 $ */ #ifndef _LIBBSM_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#4 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#5 $ */ #ifndef _COMPAT_ENDIAN_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#10 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#11 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#12 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#10 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#9 $ */ /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#12 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#13 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#9 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#10 $ */ #ifdef __APPLE__ ==== //depot/projects/trustedbsd/audit3/lib/libutil/pidfile.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libutil/pidfile.3,v 1.4 2006/01/28 14:13:15 pjd Exp $ +.\" $FreeBSD: src/lib/libutil/pidfile.3,v 1.5 2006/03/04 15:20:28 keramida Exp $ .\" .Dd August 22, 2005 .Dt PIDFILE 3 @@ -120,8 +120,8 @@ pfh = pidfile_open("/var/run/daemon.pid", 0600, &otherpid); if (pfh == NULL) { if (errno == EEXIST) { - errx(EXIT_FAILURE, "Daemon already running, pid: %d.", - (int)otherpid); + errx(EXIT_FAILURE, "Daemon already running, pid: %jd.", + (intmax_t)otherpid); } /* If we cannot create pidfile from other reasons, only warn. */ warn("Cannot open or create pidfile"); @@ -147,7 +147,7 @@ /* Do child work. */ break; default: - syslog(LOG_INFO, "Child %d started.", (int)childpid); + syslog(LOG_INFO, "Child %jd started.", (intmax_t)childpid); break; } } ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#25 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#24 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.2 2006/02/01 19:54:22 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#25 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.3 2006/03/04 16:54:21 rwatson Exp $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#8 (text+ko) ==== @@ -34,7 +34,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#7 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#8 $ + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.2 2006/03/04 16:54:21 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H @@ -68,6 +69,7 @@ typedef struct au_record au_record_t; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. ==== //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#8 (text+ko) ==== @@ -92,7 +92,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.18 2006/02/28 07:44:50 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.19 2006/03/04 21:46:34 mjacob Exp $"); #include #include /* XXX For static handler registration */ @@ -502,12 +502,12 @@ handled += pers->event(mpt, req, msg); if (handled == 0 && mpt->mpt_pers_mask == 0) { - mpt_lprt(mpt, MPT_PRT_WARN, + mpt_lprt(mpt, MPT_PRT_INFO, "No Handlers For Any Event Notify Frames. " "Event %#x (ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); } else if (handled == 0) { - mpt_prt(mpt, + mpt_lprt(mpt, MPT_PRT_WARN, "Unhandled Event Notify Frame. Event %#x " "(ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); ==== //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_ufs.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ufs.c,v 1.9 2006/02/18 10:59:47 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ufs.c,v 1.10 2006/03/04 19:41:54 pjd Exp $"); #include #include @@ -78,8 +78,13 @@ if (fs == NULL) continue; /* Check for magic and make sure things are the right size */ - if (fs->fs_magic != FS_UFS1_MAGIC && - fs->fs_magic != FS_UFS2_MAGIC) { + if (fs->fs_magic == FS_UFS1_MAGIC && + fs->fs_old_size * fs->fs_fsize == (int32_t)pp->mediasize) { + /* Valid UFS1. */ + } else if (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_fsize > 0 && + pp->mediasize / fs->fs_fsize == fs->fs_size) { + /* Valid UFS2. */ + } else { g_free(fs); continue; } ==== //depot/projects/trustedbsd/audit3/sys/opencrypto/crypto.c#4 (text+ko) ==== @@ -21,7 +21,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.16 2005/01/07 02:29:16 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/opencrypto/crypto.c,v 1.17 2006/03/04 15:50:46 wkoszek Exp $"); #define CRYPTO_TIMING /* enable timing support */ @@ -252,6 +252,7 @@ }; MODULE_VERSION(crypto, 1); DECLARE_MODULE(crypto, crypto_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); +MODULE_DEPEND(crypto, zlib, 1, 1, 1); /* * Create a new session. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.c,v 1.7 2006/02/11 23:53:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit.c,v 1.8 2006/03/04 17:00:55 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#12 (text+ko) ==== @@ -30,7 +30,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#11 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#12 $ + * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.2 2006/03/04 17:00:55 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.2 2006/02/07 14:46:26 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.3 2006/03/04 17:09:17 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#19 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_private.h,v 1.2 2006/02/06 22:50:39 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_private.h,v 1.3 2006/03/04 17:00:55 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.27 2006/01/15 01:02:20 csjp Exp $ + * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.28 2006/03/04 20:47:19 dwmalone Exp $ */ /* @@ -353,11 +353,10 @@ } static int -mac_bsdextended_check_system_swapon(struct ucred *cred, struct vnode *vp, - struct label *label) +mac_bsdextended_check_vp(struct ucred *cred, struct vnode *vp, int acc_mode) { + int error; struct vattr vap; - int error; if (!mac_bsdextended_enabled) return (0); @@ -365,75 +364,49 @@ error = VOP_GETATTR(vp, &vap, cred, curthread); if (error) return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE)); + acc_mode)); +} + +static int +mac_bsdextended_check_system_swapon(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); } static int mac_bsdextended_check_vnode_access(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, acc_mode)); + return (mac_bsdextended_check_vp(cred, vp, acc_mode)); } static int mac_bsdextended_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_EXEC)); + return (mac_bsdextended_check_vp(cred, dvp, MBI_EXEC)); } static int mac_bsdextended_check_vnode_chroot(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_EXEC)); + return (mac_bsdextended_check_vp(cred, dvp, MBI_EXEC)); } static int mac_bsdextended_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp, struct vattr *vap) { - struct vattr dvap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &dvap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, dvap.va_uid, dvap.va_gid, - MBI_WRITE)); + return (mac_bsdextended_check_vp(cred, dvp, MBI_WRITE)); } static int @@ -441,59 +414,29 @@ struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { - struct vattr vap; int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); + error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); if (error) return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); - if (error) - return (error); - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE)); + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); } static int mac_bsdextended_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE)); + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); } static int @@ -501,51 +444,24 @@ struct label *label, struct image_params *imgp, struct label *execlabel) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_READ|MBI_EXEC)); + return (mac_bsdextended_check_vp(cred, vp, MBI_READ|MBI_EXEC)); } static int mac_bsdextended_check_vnode_getacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_STAT)); + return (mac_bsdextended_check_vp(cred, vp, MBI_STAT)); } static int mac_bsdextended_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_READ)); + return (mac_bsdextended_check_vp(cred, vp, MBI_READ)); } static int @@ -553,25 +469,13 @@ struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { - struct vattr vap; int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); + error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); if (error) return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); - if (error) - return (error); - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); + error = mac_bsdextended_check_vp(cred, vp, MBI_WRITE); if (error) return (error); return (0); @@ -581,84 +485,40 @@ mac_bsdextended_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_READ)); + return (mac_bsdextended_check_vp(cred, vp, MBI_READ)); } static int mac_bsdextended_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_EXEC)); + return (mac_bsdextended_check_vp(cred, dvp, MBI_EXEC)); } static int mac_bsdextended_check_vnode_open(struct ucred *cred, struct vnode *vp, struct label *filelabel, int acc_mode) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, acc_mode)); + return (mac_bsdextended_check_vp(cred, vp, acc_mode)); } static int mac_bsdextended_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_READ)); + return (mac_bsdextended_check_vp(cred, dvp, MBI_READ)); } static int mac_bsdextended_check_vnode_readdlink(struct ucred *cred, struct vnode *vp, struct label *label) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_READ)); + return (mac_bsdextended_check_vp(cred, vp, MBI_READ)); } static int @@ -666,24 +526,12 @@ struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { - struct vattr vap; int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); + error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); if (error) return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); - if (error) - return (error); - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); + error = mac_bsdextended_check_vp(cred, vp, MBI_WRITE); return (error); } @@ -693,27 +541,14 @@ struct label *dlabel, struct vnode *vp, struct label *label, int samedir, struct componentname *cnp) { - struct vattr vap; int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); + error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); if (error) return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); - if (error) - return (error); - if (vp != NULL) { - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE); - } + if (vp != NULL) + error = mac_bsdextended_check_vp(cred, vp, MBI_WRITE); return (error); } @@ -722,136 +557,64 @@ mac_bsdextended_check_vnode_revoke(struct ucred *cred, struct vnode *vp, struct label *label) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_setacl_vnode(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_WRITE)); + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); } static int mac_bsdextended_check_vnode_setflags(struct ucred *cred, struct vnode *vp, struct label *label, u_long flags) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_setmode(struct ucred *cred, struct vnode *vp, struct label *label, mode_t mode) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_setowner(struct ucred *cred, struct vnode *vp, struct label *label, uid_t uid, gid_t gid) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, struct label *label, struct timespec atime, struct timespec utime) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, - MBI_ADMIN)); + return (mac_bsdextended_check_vp(cred, vp, MBI_ADMIN)); } static int mac_bsdextended_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { - struct vattr vap; - int error; - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(vp, &vap, active_cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(active_cred, vap.va_uid, vap.va_gid, - MBI_STAT)); + return (mac_bsdextended_check_vp(active_cred, vp, MBI_STAT)); } static struct mac_policy_ops mac_bsdextended_ops = ==== //depot/projects/trustedbsd/audit3/usr.bin/finger/sprint.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 6 22:39:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36BCC16A422 for ; Mon, 6 Mar 2006 22:39:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5F6143D6B for ; Mon, 6 Mar 2006 22:38:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8CB3646BFE for ; Mon, 6 Mar 2006 17:38:33 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 974295584C; Mon, 6 Mar 2006 22:38:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8488F16A420; Mon, 6 Mar 2006 22: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 315AD16A420 for ; Mon, 6 Mar 2006 22:38:52 +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 B2DF043D7B for ; Mon, 6 Mar 2006 22:38:51 +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 k26McpYl011824 for ; Mon, 6 Mar 2006 22:38:51 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 k26McpI9011819 for perforce@freebsd.org; Mon, 6 Mar 2006 22:38:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 6 Mar 2006 22:38:51 GMT Message-Id: <200603062238.k26McpI9011819@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 92880 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Mar 2006 22:39:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=92880 Change 92880 by rwatson@rwatson_peppercorn on 2006/03/06 22:38:02 Update HISTORY. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#8 (text+ko) ==== @@ -24,6 +24,9 @@ the terminal ID that appears in the process32/subject32 tokens. These are assumed to be IP addresses, and as such, to be in network byte order. +- Universally, APIs now assume that IP addresses and ports are provided + in network byte order. APIs now generally provide these types in + network byte order when decoding. OpenBSM 1.0 alpha 5 @@ -151,4 +154,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#7 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#8 $ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 11:04:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9AAC116A422 for ; Tue, 7 Mar 2006 11:04:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CC8643D45 for ; Tue, 7 Mar 2006 11:04:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 94D7146BEE for ; Tue, 7 Mar 2006 06:04:14 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9941755B3F; Tue, 7 Mar 2006 11:04:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 86E9D16A423; Tue, 7 Mar 2006 11:04: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 3FFF316A422 for ; Tue, 7 Mar 2006 11:04: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 8E2BB43D53 for ; Tue, 7 Mar 2006 11:04: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 k27B4XFu081619 for ; Tue, 7 Mar 2006 11:04: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 k27B4X8o081616 for perforce@freebsd.org; Tue, 7 Mar 2006 11:04:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 11:04:33 GMT Message-Id: <200603071104.k27B4X8o081616@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 92895 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 11:04:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=92895 Change 92895 by rwatson@rwatson_peppercorn on 2006/03/07 11:03:32 Add todo for making praudit able to support individual tokens in streams, not just full records and file tokens. Affected files ... .. //depot/projects/trustedbsd/openbsm/TODO#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/TODO#6 (text+ko) ==== @@ -13,5 +13,9 @@ - It might be desirable to be able to provide EOPNOTSUPP system call stubs on systems that don't have the necessary audit system calls; that would allow the full libbsm and tool set to build, just not run. +- Teach praudit how to begin printing at any point in a token stream, not + just at the beginning of a record. This will make it easier to use + praudit in test suites processing single-token files without header and + trailer context. -$P4: //depot/projects/trustedbsd/openbsm/TODO#5 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#6 $ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 11:08:04 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB6F316A420 for ; Tue, 7 Mar 2006 11:08:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBC6C43D45 for ; Tue, 7 Mar 2006 11:08:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1476E46BED for ; Tue, 7 Mar 2006 06:07:41 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DB6C655D46; Tue, 7 Mar 2006 11:08:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C869B16A423; Tue, 7 Mar 2006 11: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 9D8C616A420 for ; Tue, 7 Mar 2006 11:08:01 +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 67CB243D45 for ; Tue, 7 Mar 2006 11:08:01 +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 k27B81Ef081782 for ; Tue, 7 Mar 2006 11:08:01 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 k27B80RP081760 for perforce@freebsd.org; Tue, 7 Mar 2006 11:08:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 11:08:00 GMT Message-Id: <200603071108.k27B80RP081760@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 92896 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 11:08:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=92896 Change 92896 by rwatson@rwatson_peppercorn on 2006/03/07 11:08:00 Snapshot beginnings of a BSM file format test set. This isn't a full Makefile, and generate currently only generates samples of a subset of the tokens. However, I didn't want to lose the current iteration if a disk crashed or the like. The eventual goal of this test tool is to generate a set of tokens using OpenBSM, then compare them to a "known good" reference set. This will also form a foundation for testing praudit along similar lines, by providing reference output and comparing executed output with it. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile#1 add .. //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 12:25:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CE5316A422 for ; Tue, 7 Mar 2006 12:25:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 113CA43D48 for ; Tue, 7 Mar 2006 12:25:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B4A9546BAB for ; Tue, 7 Mar 2006 07:25:16 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id EC812559A3; Tue, 7 Mar 2006 12:25:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DAACB16A423; Tue, 7 Mar 2006 12:25:36 +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 8BBDA16A420 for ; Tue, 7 Mar 2006 12:25:36 +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 5528A43D45 for ; Tue, 7 Mar 2006 12:25: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 k27CPaSg084549 for ; Tue, 7 Mar 2006 12:25: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 k27CPZPB084546 for perforce@freebsd.org; Tue, 7 Mar 2006 12:25:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 12:25:35 GMT Message-Id: <200603071225.k27CPZPB084546@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 92898 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 12:25:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=92898 Change 92898 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/03/07 12:24:36 autoconf/automake bits for test subtree and generate tool. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure.ac#17 edit .. //depot/projects/trustedbsd/openbsm/test/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile#2 delete .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.am#1 add Differences ... ==== //depot/projects/trustedbsd/openbsm/configure.ac#17 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#16 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#17 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -104,6 +104,8 @@ bsm/Makefile libbsm/Makefile man/Makefile + test/Makefile + test/bsm/Makefile tools/Makefile]) AC_OUTPUT From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 14:32:16 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B072816A422 for ; Tue, 7 Mar 2006 14:32:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5368D43D45 for ; Tue, 7 Mar 2006 14:32:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6F36446B06 for ; Tue, 7 Mar 2006 09:31:42 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 45E537429F; Tue, 7 Mar 2006 14:31:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F46E16A423; Tue, 7 Mar 2006 14:31:53 +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 E151F16A424 for ; Tue, 7 Mar 2006 14:31:52 +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 CA59243D46 for ; Tue, 7 Mar 2006 14:31:49 +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 k27EVnWP097088 for ; Tue, 7 Mar 2006 14:31:49 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 k27EVn8M097085 for perforce@freebsd.org; Tue, 7 Mar 2006 14:31:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 14:31:49 GMT Message-Id: <200603071431.k27EVn8M097085@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 92906 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 14:32:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92906 Change 92906 by rwatson@rwatson_sesame on 2006/03/07 14:31:02 Regenate configure, Makefile.in for test tree. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#15 edit .. //depot/projects/trustedbsd/openbsm/test/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#1 add Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#15 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#15 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#17 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -22895,7 +22895,7 @@ fi - ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile tools/Makefile" + ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile test/Makefile test/bsm/Makefile tools/Makefile" cat >confcache <<\_ACEOF @@ -23477,6 +23477,8 @@ "bsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES bsm/Makefile" ;; "libbsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbsm/Makefile" ;; "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; + "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; + "test/bsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/bsm/Makefile" ;; "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config/config.h" ;; From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 15:22:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BA0D16A432 for ; Tue, 7 Mar 2006 15:22:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6BD443D45 for ; Tue, 7 Mar 2006 15:22:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4358546BB3 for ; Tue, 7 Mar 2006 10:22:32 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A115F57823; Tue, 7 Mar 2006 15:22:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F4AF16A424; Tue, 7 Mar 2006 15:22: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 4D12416A420 for ; Tue, 7 Mar 2006 15:22:52 +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 0EAC843D45 for ; Tue, 7 Mar 2006 15:22:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k27FMpWH099560 for ; Tue, 7 Mar 2006 15:22:51 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 k27FMpNR099557 for perforce@freebsd.org; Tue, 7 Mar 2006 15:22:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 15:22:51 GMT Message-Id: <200603071522.k27FMpNR099557@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 92908 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 15:22:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92908 Change 92908 by rwatson@rwatson_sesame on 2006/03/07 15:22:32 Remove au_to_socket()-related man page references. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#7 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#7 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -57,9 +57,6 @@ .Nm au_to_return64 , .Nm au_to_return , .Nm au_to_seq , -.Nm au_to_socket , -.Nm au_to_socket_ex_32 , -.Nm au_to_socket_ex_128 , .Nm au_to_sock_inet32 , .Nm au_to_sock_inet128 , .Nm au_to_sock_inet , @@ -138,12 +135,6 @@ .Ft token_t * .Fn au_to_seq "long audit_count" .Ft token_t * -.Fn au_to_socket "struct socket *so" -.Ft token_t * -.Fn au_to_socket_ex_32 "struct socket *so" -.Ft token_t * -.Fn au_to_socket_ex_128 "struct socket *so" -.Ft token_t * .Fn au_to_sock_inet32 "struct sockaddr_in *so" .Ft token_t * .Fn au_to_sock_inet128 "struct sockaddr_in6 *so" ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#5 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 @@ -158,9 +158,6 @@ .Xr au_to_return32 3 , .Xr au_to_return64 3 , .Xr au_to_seq 3 , -.Xr au_to_socket 3 , -.Xr au_to_socket_ex_32 3 , -.Xr au_to_socket_ex_128 3 , .Xr au_to_sock_inet 3 , .Xr au_to_sock_inet32 3 , .Xr au_to_sock_inet128 3 , From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 15:28:17 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 181A616A422 for ; Tue, 7 Mar 2006 15:28:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DCEB43D6E for ; Tue, 7 Mar 2006 15:28:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C8C4846B8D for ; Tue, 7 Mar 2006 10:27:43 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7741B72CAB; Tue, 7 Mar 2006 15:28:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FC8516A424; Tue, 7 Mar 2006 15:28: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 3313716A420 for ; Tue, 7 Mar 2006 15:28:02 +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 C7DA943D79 for ; Tue, 7 Mar 2006 15:27: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 k27FRwdn099899 for ; Tue, 7 Mar 2006 15:27: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 k27FRw5V099896 for perforce@freebsd.org; Tue, 7 Mar 2006 15:27:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 7 Mar 2006 15:27:58 GMT Message-Id: <200603071527.k27FRw5V099896@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 92909 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 15:28:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=92909 Change 92909 by rwatson@rwatson_sesame on 2006/03/07 15:27:32 OpenBSM no longer does au_to_socket(), so don't try to test it. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#2 $ */ /* @@ -468,15 +468,6 @@ } static void -generate_socket_token(const char *directory, const char *token_filename, - const char *record_filename) -{ - token_t *socket_token; - -} - - -static void generate_seq_token(const char *directory, const char *token_filename, const char *record_filename) { @@ -592,7 +583,6 @@ generate_iport_token(directory, "iport_token", "iport_record"); generate_arg32_token(directory, "arg32_token", "arg32_record"); - generate_socket_token(directory, "socket_token", "socket_record"); generate_seq_token(directory, "seq_token", "seq_record"); generate_attr_token(directory, "attr_token", "attr_record"); generate_ipc_perm_token(directory, "ipc_perm_token", From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 16:26:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A897D16A437 for ; Tue, 7 Mar 2006 16:26:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0578E43D6A for ; Tue, 7 Mar 2006 16:26:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D415746BED for ; Tue, 7 Mar 2006 11:26:23 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0BC50555DC; Tue, 7 Mar 2006 16:26:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EAF0916A423; Tue, 7 Mar 2006 16:26:42 +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 ADBF216A420 for ; Tue, 7 Mar 2006 16:26:42 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8859243D6B for ; Tue, 7 Mar 2006 16:26:39 +0000 (GMT) (envelope-from millert@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 k27GQdju004964 for ; Tue, 7 Mar 2006 16:26:39 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GQdHK004961 for perforce@freebsd.org; Tue, 7 Mar 2006 16:26:39 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:26:39 GMT Message-Id: <200603071626.k27GQdHK004961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92914 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 16:26:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=92914 Change 92914 by millert@millert_ibook on 2006/03/07 16:26:22 Make lh_references natural_t to match lh_check_unlock() and for consistency with the ipc_object bits on which the label handle structs are modelled. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#7 (text+ko) ==== @@ -33,7 +33,7 @@ typedef struct ipc_labelh { - int lh_references; + natural_t lh_references; int lh_type; struct label lh_label; ipc_port_t lh_port; From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 16:29:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 126D116A422 for ; Tue, 7 Mar 2006 16:29:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54C6643D4C for ; Tue, 7 Mar 2006 16:29:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3AD7546BE6 for ; Tue, 7 Mar 2006 11:29:32 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6A87155D7F; Tue, 7 Mar 2006 16:29:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5265416A43A; Tue, 7 Mar 2006 16:29: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 E0E8C16A425 for ; Tue, 7 Mar 2006 16:29:51 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B398943DA0 for ; Tue, 7 Mar 2006 16:29:43 +0000 (GMT) (envelope-from millert@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 k27GThVe005175 for ; Tue, 7 Mar 2006 16:29:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GThhh005171 for perforce@freebsd.org; Tue, 7 Mar 2006 16:29:43 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:29:43 GMT Message-Id: <200603071629.k27GThhh005171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92915 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 16:29:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=92915 Change 92915 by millert@millert_ibook on 2006/03/07 16:29:41 Print out text labels too. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/examples/labelh/labelh_test.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/examples/labelh/labelh_test.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ { kern_return_t kr; mach_port_name_t labelHandle, portName; - char *textlabel; + char *textlabel, textbuf[512]; int ch, count, dealloc, destroy, getnew, getport; int gettask, reqlabel, i; @@ -109,7 +109,8 @@ mach_error(":", kr); exit(1); } - printf("new label handle: 0x%x\n", labelHandle); + printf("new label handle: 0x%x (%s)\n", labelHandle, + textlabel); } if (gettask) { /* Get label handle for our task */ @@ -119,7 +120,14 @@ mach_error("mach_get_task_label():", kr); exit(1); } - printf("task label handle: 0x%x\n", labelHandle); + kr = mach_get_task_label_text(mach_task_self(), + "sebsd", textbuf); + if (kr != KERN_SUCCESS) { + mach_error("mach_get_task_label_text():", kr); + exit(1); + } + printf("task label handle: 0x%x (%s)\n", labelHandle, + textbuf); } if (getport) { /* Get a label handle for the new port */ @@ -129,7 +137,14 @@ mach_error("mach_get_label():", kr); exit(1); } - printf("port label handle: 0x%x\n", labelHandle); + kr = mach_get_label_text(mach_task_self(), labelHandle, + "sebsd", textbuf); + if (kr != KERN_SUCCESS) { + mach_error("mach_get_label_text():", kr); + exit(1); + } + printf("port label handle: 0x%x (%s)\n", labelHandle, + textbuf); } if (reqlabel) { /* Compute label handle based on port and task. */ @@ -139,7 +154,14 @@ mach_error("mac_request_label():", kr); exit(1); } - printf("coputed label handle: 0x%x\n", labelHandle); + kr = mach_get_label_text(mach_task_self(), labelHandle, + "sebsd", textbuf); + if (kr != KERN_SUCCESS) { + mach_error("mach_get_label_text():", kr); + exit(1); + } + printf("computed label handle: 0x%x (%s)\n", + labelHandle, textbuf); } if (dealloc) { /* Deallocate the label handle */ @@ -167,7 +189,7 @@ void usage(void) { - fprintf(stderr, "usage: %s [-c count] [-dx] -n text_label | -t | -p\n", + fprintf(stderr, "usage: %s [-c count] [-dx] -n text_label | -t | -r | -p\n", __progname); exit(1); } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 16:33:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 151C016A427 for ; Tue, 7 Mar 2006 16:33:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6783143D48 for ; Tue, 7 Mar 2006 16:33:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 94CF046B28 for ; Tue, 7 Mar 2006 11:33:29 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E484556B0A; Tue, 7 Mar 2006 16:33:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D4C2316A423; Tue, 7 Mar 2006 16:33:49 +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 9845B16A420 for ; Tue, 7 Mar 2006 16:33:49 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48C0A43D49 for ; Tue, 7 Mar 2006 16:33:49 +0000 (GMT) (envelope-from millert@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 k27GXnU2005565 for ; Tue, 7 Mar 2006 16:33:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GXmik005562 for perforce@freebsd.org; Tue, 7 Mar 2006 16:33:48 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:33:48 GMT Message-Id: <200603071633.k27GXmik005562@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92916 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 16:33:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92916 Change 92916 by millert@millert_ibook on 2006/03/07 16:32:57 Fix some style nits. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#9 (text+ko) ==== @@ -236,8 +236,8 @@ #ifdef MAC if (kmsg->ikm_sender != NULL) { - labelh_release (kmsg->ikm_sender); - kmsg->ikm_sender = NULL; + labelh_release(kmsg->ikm_sender); + kmsg->ikm_sender = NULL; } #endif @@ -608,8 +608,8 @@ #ifdef MAC if (kmsg->ikm_sender != NULL) { - labelh_release (kmsg->ikm_sender); - kmsg->ikm_sender = NULL; + labelh_release (kmsg->ikm_sender); + kmsg->ikm_sender = NULL; } #endif } @@ -716,12 +716,10 @@ #ifdef MAC task_t cur = current_thread()->top_act->task; - if (cur) - { - labelh_reference (cur->label); - kmsg->ikm_sender = cur->label; - } - else + if (cur) { + labelh_reference(cur->label); + kmsg->ikm_sender = cur->label; + } else trailer->msgh_labels.sender = 0; #else trailer->msgh_labels.sender = 0; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#6 (text+ko) ==== @@ -1836,12 +1836,16 @@ } kern_return_t -mach_set_port_label (ipc_space_t space, mach_port_name_t name, vm_offset_t labelstr) +mach_set_port_label( + ipc_space_t space, + mach_port_name_t name, + vm_offset_t labelstr) { #ifdef MAC ipc_entry_t entry; kern_return_t kr; struct label inl; + int rc; if (space == IS_NULL || space->is_task == NULL) return KERN_INVALID_TASK; @@ -1849,32 +1853,33 @@ if (!MACH_PORT_VALID(name)) return KERN_INVALID_NAME; - mac_init_port_label (&inl); - int rc = mac_internalize_port_label (&inl, labelstr); + mac_init_port_label(&inl); + rc = mac_internalize_port_label(&inl, labelstr); if (rc) - return KERN_INVALID_ARGUMENT; + return KERN_INVALID_ARGUMENT; kr = ipc_right_lookup_write(space, name, &entry); if (kr != KERN_SUCCESS) return kr; - if (IOT_PORT != io_otype(entry->ie_object)) { - is_write_unlock (space); - return KERN_INVALID_RIGHT; + if (io_otype(entry->ie_object) != IOT_PORT) { + is_write_unlock(space); + return KERN_INVALID_RIGHT; } ipc_port_t port = (ipc_port_t) entry->ie_object; - ip_lock (port); + ip_lock(port); - rc = mac_check_port_relabel (&space->is_task->maclabel, &port->ip_label, &inl); + rc = mac_check_port_relabel(&space->is_task->maclabel, + &port->ip_label, &inl); if (rc) - kr = KERN_NO_ACCESS; + kr = KERN_NO_ACCESS; else - mac_copy_port_label (&inl, &port->ip_label); + mac_copy_port_label(&inl, &port->ip_label); - ip_unlock (port); - is_write_unlock (space); + ip_unlock(port); + is_write_unlock(space); return kr; #else return KERN_INVALID_ARGUMENT; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.c#5 (text+ko) ==== @@ -381,9 +381,8 @@ eml_task_reference(new_task, parent_task); #ifdef MAC - /*mutex_init(&new_task->labellock, ETAP_NO_TRACE);*/ - new_task->label = labelh_new (); - mac_init_task_label (&new_task->maclabel); + new_task->label = labelh_new(); + mac_init_task_label(&new_task->maclabel); #endif ipc_task_init(new_task, parent_task); @@ -471,8 +470,7 @@ task_lock(task); #ifdef MAC - /* Prevent task from being destroyed while the label is - still in use */ + /* Prevent task from being destroyed while the label is still in use */ tasklabel_lock(task); #endif refs = --task->ref_count; @@ -1806,5 +1804,4 @@ (*f)(&pt->maclabel, arg); tasklabel_unlock(pt); } - #endif From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 16:39:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BAD3C16A420 for ; Tue, 7 Mar 2006 16:39:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10E8243D49 for ; Tue, 7 Mar 2006 16:39:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 927A546B28 for ; Tue, 7 Mar 2006 11:39:37 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0FCC255497; Tue, 7 Mar 2006 16:39:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0068916A423; Tue, 7 Mar 2006 16:39: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 C702E16A420 for ; Tue, 7 Mar 2006 16:39:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 285EB43D55 for ; Tue, 7 Mar 2006 16:39:57 +0000 (GMT) (envelope-from millert@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 k27GdvMu005810 for ; Tue, 7 Mar 2006 16:39:57 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GduY9005807 for perforce@freebsd.org; Tue, 7 Mar 2006 16:39:56 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:39:56 GMT Message-Id: <200603071639.k27GduY9005807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92917 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 16:39:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=92917 Change 92917 by millert@millert_ibook on 2006/03/07 16:39:26 Convert mach_get_task_label() and mach_get_task_label_text() to take ipc_space_t not task_t and add sanity check for space being IS_NULL. Fixes a panic when the port passed in is not a task port. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#6 (text+ko) ==== @@ -32,13 +32,16 @@ kern_return_t mach_get_task_label( - task_t t, + ipc_space_t space, mach_port_name_t *outlabel) { - ipc_labelh_t lh = t->label; - ipc_space_t space = t->itk_space; kern_return_t kr; + ipc_labelh_t lh; + + if (space == IS_NULL || space->is_task == NULL) + return KERN_INVALID_TASK; + lh = space->is_task->label; ip_lock(lh->lh_port); lh->lh_port->ip_mscount++; lh->lh_port->ip_srights++; @@ -55,16 +58,21 @@ return (KERN_SUCCESS); } +kern_return_t -kern_return_t mach_get_task_label_text( - task_t t, + ipc_space_t space, labelstr_t policies, labelstr_t outl) { - tasklabel_lock(t); - mac_externalize_task_label(&t->maclabel, policies, outl, 512, 0); - tasklabel_unlock(t); + + if (space == IS_NULL) + return KERN_INVALID_TASK; + + tasklabel_lock(space->is_task); + mac_externalize_task_label(&space->is_task->maclabel, policies, outl, + 512, 0); + tasklabel_unlock(space->is_task); return KERN_SUCCESS; } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#7 (text+ko) ==== @@ -23,7 +23,7 @@ @return Standard MiG return values (0 for success) */ -routine mach_get_task_label(task : task_t; +routine mach_get_task_label(task : ipc_space_t; out label : mach_port_name_t); /** @@ -38,7 +38,7 @@ @return Standard MiG return values (0 for success) */ -routine mach_get_task_label_text(task : task_t; +routine mach_get_task_label_text(task : ipc_space_t; policies : labelstr_t; out label : labelstr_t); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 16:42:02 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B98EE16A429 for ; Tue, 7 Mar 2006 16:42:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D259043D58 for ; Tue, 7 Mar 2006 16:42:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 507C046B0A for ; Tue, 7 Mar 2006 11:41:40 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A7C15555D7; Tue, 7 Mar 2006 16:42:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 984D416A423; Tue, 7 Mar 2006 16:42: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 558D116A420 for ; Tue, 7 Mar 2006 16:42:00 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C6C243D4C for ; Tue, 7 Mar 2006 16:42:00 +0000 (GMT) (envelope-from millert@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 k27Gfx1a006023 for ; Tue, 7 Mar 2006 16:42:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GfxZa006020 for perforce@freebsd.org; Tue, 7 Mar 2006 16:41:59 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:41:59 GMT Message-Id: <200603071641.k27GfxZa006020@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92918 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 16:42:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=92918 Change 92918 by millert@millert_ibook on 2006/03/07 16:41:27 Check to make sure the port is not dead before we use it. This fixes a race condition between label handle deallocation and user space requests using the label handle's port (such as mach_get_label_text). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#7 (text+ko) ==== @@ -1773,6 +1773,7 @@ ipc_port_t port; struct label outl; kern_return_t kr; + int dead; if (!MACH_PORT_VALID(name)) return KERN_INVALID_NAME; @@ -1782,10 +1783,16 @@ if (kr != KERN_SUCCESS) return kr; - /* Make sure we are not dealing with a label handle. */ port = (ipc_port_t) entry->ie_object; - ip_lock(port); + dead = ipc_right_check(space, port, name, entry); + if (dead) { + is_write_unlock(space); + return KERN_INVALID_RIGHT; + } + /* port is now locked */ + is_write_unlock(space); + /* Make sure we are not dealing with a label handle. */ if (ip_kotype(port) == IKOT_LABELH) { /* already is a label handle! */ ip_unlock(port); @@ -1813,6 +1820,7 @@ ipc_entry_t entry; kern_return_t kr; struct label *l; + int dead; if (space == IS_NULL || space->is_task == NULL) return KERN_INVALID_TASK; @@ -1824,15 +1832,21 @@ if (kr != KERN_SUCCESS) return kr; - io_lock(entry->ie_object); - is_write_unlock (space); + dead = ipc_right_check(space, entry->ie_object, name, entry); + if (dead) { + is_write_unlock(space); + return KERN_INVALID_RIGHT; + } + /* object (port) is now locked */ + + is_write_unlock(space); l = io_getlabel(entry->ie_object); - mac_externalize_port_label (l, policies, outlabel, 512, 0); + mac_externalize_port_label(l, policies, outlabel, 512, 0); io_unlocklabel(entry->ie_object); - io_unlock (entry->ie_object); - return 0; + io_unlock(entry->ie_object); + return KERN_SUCCESS; } kern_return_t ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#7 (text+ko) ==== @@ -47,7 +47,7 @@ lh->lh_port->ip_srights++; ip_reference(lh->lh_port); ip_unlock(lh->lh_port); - kr = ipc_object_copyout(space, lh->lh_port, + kr = ipc_object_copyout(space, (ipc_object_t) lh->lh_port, MACH_MSG_TYPE_PORT_SEND, 0, outlabel); if (kr != KERN_SUCCESS) { ip_lock(lh->lh_port); @@ -146,6 +146,7 @@ ipc_object_t objp; kern_return_t kr; struct label *objl; + int dead; if (space == IS_NULL || space->is_task == NULL) return KERN_INVALID_TASK; @@ -166,6 +167,13 @@ return kr; } + dead = ipc_right_check(space, entry->ie_object, obj, entry); + if (dead) { + is_write_unlock(space); + mac_destroy_task_label(&subjl); + return KERN_INVALID_RIGHT; + } + objp = entry->ie_object; io_lock (objp); is_write_unlock (space); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 16:44:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 467FE16A422 for ; Tue, 7 Mar 2006 16:44:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9E8043D45 for ; Tue, 7 Mar 2006 16:44:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6400146C1B for ; Tue, 7 Mar 2006 11:43:43 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AC36155847; Tue, 7 Mar 2006 16:44:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 98CCD16A423; Tue, 7 Mar 2006 16:44: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 70A5616A422 for ; Tue, 7 Mar 2006 16:44:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C83143D45 for ; Tue, 7 Mar 2006 16:44:03 +0000 (GMT) (envelope-from millert@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 k27Gi3mA006132 for ; Tue, 7 Mar 2006 16:44:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27Gi2sA006129 for perforce@freebsd.org; Tue, 7 Mar 2006 16:44:02 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:44:02 GMT Message-Id: <200603071644.k27Gi2sA006129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92919 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 16:44:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=92919 Change 92919 by millert@millert_ibook on 2006/03/07 16:43:19 Add label type defines for lh_type and set them in labelh_new() and labelh_new_user(). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#7 (text+ko) ==== @@ -74,7 +74,7 @@ io_lock_init(lh); lh->lh_port = port; lh->lh_label = *inl; - lh->lh_type = 0; + lh->lh_type = LABELH_TYPE_USER; lh->lh_references = 1; /* Must call ipc_kobject_set() with port unlocked. */ @@ -118,7 +118,7 @@ lh = (ipc_labelh_t)zalloc(ipc_labelh_zone); io_lock_init(lh); lh->lh_port = ipc_port_alloc_kernel(); - lh->lh_type = 0; + lh->lh_type = LABELH_TYPE_KERN; lh->lh_references = 1; ip_unlock(lh->lh_port); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#8 (text+ko) ==== @@ -44,6 +44,9 @@ #endif } *ipc_labelh_t; +#define LABELH_TYPE_KERN 0 +#define LABELH_TYPE_USER 1 + ipc_labelh_t labelh_duplicate(ipc_labelh_t old); ipc_labelh_t labelh_modify(ipc_labelh_t old); ipc_labelh_t labelh_new(void); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 16:47:10 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 135F316A420 for ; Tue, 7 Mar 2006 16:47:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2516B43D46 for ; Tue, 7 Mar 2006 16:47:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id ACE6446B16 for ; Tue, 7 Mar 2006 11:46:47 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1ECD856861; Tue, 7 Mar 2006 16:47:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F1DD16A423; Tue, 7 Mar 2006 16:47:08 +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 DDF5216A420 for ; Tue, 7 Mar 2006 16:47:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A0D5143D46 for ; Tue, 7 Mar 2006 16:47:07 +0000 (GMT) (envelope-from millert@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 k27Gl7Hn009181 for ; Tue, 7 Mar 2006 16:47:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27Gl7Kp009054 for perforce@freebsd.org; Tue, 7 Mar 2006 16:47:07 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:47:07 GMT Message-Id: <200603071647.k27Gl7Kp009054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92921 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 16:47:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=92921 Change 92921 by millert@millert_ibook on 2006/03/07 16:46:29 Change how label handles are freed when their reference count reaches zero. We no longer free label handle storage when the ref count == 0. For kernel-allocated label handles, just deallocate the associated port. The actual label handle storage is deallocated by labelh_destroy() which is called by ipc_kobject_destroy() after all port references are gone. This fixes a race between a user program requesting (and accessing) the label of a labeled kernel object and the destruction of that object (task, port, etc). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/ipc_kobject.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.c#8 (text+ko) ==== @@ -47,7 +47,7 @@ if (space == IS_NULL || space->is_task == NULL) return (KERN_INVALID_TASK); - /* XXX - perform entrypoint check here */ + /* XXX - perform entrypoint check here? */ /* * Note: the calling task will have a receive right for the port. @@ -75,7 +75,7 @@ lh->lh_port = port; lh->lh_label = *inl; lh->lh_type = LABELH_TYPE_USER; - lh->lh_references = 1; + lh->lh_references = 1; /* unused for LABELH_TYPE_USER */ /* Must call ipc_kobject_set() with port unlocked. */ ip_unlock(lh->lh_port); @@ -154,6 +154,11 @@ { ipc_labelh_t lh; + /* + * A label handle may only have a single reference. + * If there are no other references this is a no-op. + * Otherwise, make a copy we can write to and return it. + */ if (old->lh_references == 1) return (old); lh = labelh_duplicate(old); @@ -175,6 +180,9 @@ return (lh); } +/* + * Release a reference on an (unlocked) label handle. + */ void labelh_release(ipc_labelh_t lh) { @@ -183,10 +191,18 @@ lh_check_unlock(lh); } +/* + * Deallocate space associated with the label handle backed by the + * specified port. For kernel-allocated label handles the + * label handle reference count should be 0. For user-allocated + * handles the ref count is not used (it was initialized to 1). + */ void -lh_free(ipc_labelh_t lh) +labelh_destroy(ipc_port_t port) { - ipc_object_release(&lh->lh_port->ip_object); + ipc_labelh_t lh = (ipc_labelh_t) port->ip_kobject; + + ip_release(lh->lh_port); mac_destroy_port_label(&lh->lh_label); zfree(ipc_labelh_zone, (vm_offset_t)lh); } ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_labelh.h#9 (text+ko) ==== @@ -47,19 +47,19 @@ #define LABELH_TYPE_KERN 0 #define LABELH_TYPE_USER 1 +void labelh_destroy(ipc_port_t port); ipc_labelh_t labelh_duplicate(ipc_labelh_t old); ipc_labelh_t labelh_modify(ipc_labelh_t old); ipc_labelh_t labelh_new(void); kern_return_t labelh_new_user(ipc_space_t, struct label *, mach_port_name_t *); void labelh_release(ipc_labelh_t lh); ipc_labelh_t labelh_reference(ipc_labelh_t lh); -void lh_free(ipc_labelh_t lh); #define lh_reference(lh) ((lh)->lh_references++) -#define lh_release(lh) \ -MACRO_BEGIN \ - assert((lh)->lh_references > 0); \ - (lh)->lh_references--; \ +#define lh_release(lh) \ +MACRO_BEGIN \ + assert((lh)->lh_references > 0); \ + (lh)->lh_references--; \ MACRO_END extern zone_t ipc_labelh_zone; @@ -67,13 +67,21 @@ #define lh_lock io_lock #define lh_unlock io_unlock -#define lh_check_unlock(lh) \ -MACRO_BEGIN \ +/* + * Check the number of references the label handle a left. + * If there are 0 references and this is a kernel-allocated + * label handle, deallocate the associated port. The + * storage space for the label handle will be deallocated + * as part of the port destruction. User-allocated label + * handles are destroyed along with their ports. + */ +#define lh_check_unlock(lh) \ +MACRO_BEGIN \ _VOLATILE_ natural_t _refs = (lh)->lh_references; \ - \ - lh_unlock(lh); \ - if (_refs == 0) \ - lh_free(lh); \ + \ + lh_unlock(lh); \ + if (_refs == 0 && (lh)->lh_type == LABELH_TYPE_KERN) \ + ipc_port_dealloc_kernel((lh)->lh_port); \ MACRO_END #endif ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/ipc_kobject.c#4 (text+ko) ==== @@ -514,7 +514,7 @@ break; case IKOT_LABELH: - labelh_release(port->ip_kobject); + labelh_destroy(port); break; default: From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 16:49:12 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DFC6416A420 for ; Tue, 7 Mar 2006 16:49:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9E4643D49 for ; Tue, 7 Mar 2006 16:49:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A10D346BDC for ; Tue, 7 Mar 2006 11:48:50 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 10DAE55497; Tue, 7 Mar 2006 16:49:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0052716A423; Tue, 7 Mar 2006 16:49: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 CEAA016A420 for ; Tue, 7 Mar 2006 16:49:10 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9860943D49 for ; Tue, 7 Mar 2006 16:49:10 +0000 (GMT) (envelope-from millert@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 k27GnAbP013964 for ; Tue, 7 Mar 2006 16:49:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GnAL1013961 for perforce@freebsd.org; Tue, 7 Mar 2006 16:49:10 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:49:10 GMT Message-Id: <200603071649.k27GnAL1013961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92922 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 16:49:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=92922 Change 92922 by millert@millert_ibook on 2006/03/07 16:49:06 Add proc_has_security() and proc_has_system() for systems without per-thread ucred (like Darwin). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#34 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#34 (text+ko) ==== @@ -238,6 +238,20 @@ return (cred_has_security(td->td_proc->p_ucred, perm)); } +#else +int +proc_has_system(struct proc *p, access_vector_t perm) +{ + + return (cred_has_system(p->p_ucred, perm)); +} + +int +proc_has_security(struct proc *p, access_vector_t perm) +{ + + return (cred_has_security(p->p_ucred, perm)); +} #endif static __inline security_class_t ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#4 (text+ko) ==== @@ -121,19 +121,21 @@ if (error) return (error); -#if 0 if (req->newptr != NULL) { error = SYSCTL_IN(req, &enforcing, sizeof(enforcing)); if (error) return (error); - error = thread_has_system (curthread, SYSTEM__AVC_TOGGLE); +#ifdef APPLE + error = proc_has_system(current_proc(), SECURITY__SETENFORCE); +#else + error = thread_has_system(curthread, SECURITY__SETENFORCE); +#endif if (error) return error; selinux_enforcing = enforcing; } -#endif return (0); } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 16:52:17 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B2F416A423 for ; Tue, 7 Mar 2006 16:52:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C79543D53 for ; Tue, 7 Mar 2006 16:52:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 21EFB46BB3 for ; Tue, 7 Mar 2006 11:51:55 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 896CC559D8; Tue, 7 Mar 2006 16:52:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7626316A424; Tue, 7 Mar 2006 16:52: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 4A1E516A420 for ; Tue, 7 Mar 2006 16:52:15 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 017A443D53 for ; Tue, 7 Mar 2006 16:52:15 +0000 (GMT) (envelope-from millert@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 k27GqEsL014168 for ; Tue, 7 Mar 2006 16:52:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GqE2c014165 for perforce@freebsd.org; Tue, 7 Mar 2006 16:52:14 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:52:14 GMT Message-Id: <200603071652.k27GqE2c014165@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92923 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 16:52:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=92923 Change 92923 by millert@millert_ibook on 2006/03/07 16:51:39 In access(), do not pass uninitialized flags variable to mac_check_vnode_access(). Don't clobber non-zero error value from DAC check with a zero error value from the MAC check. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/vfs/vfs_syscalls.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/vfs/vfs_syscalls.c#3 (text+ko) ==== @@ -1792,8 +1792,8 @@ vp = nd.ni_vp; /* Flags == 0 means only check for existence. */ + flags = 0; if (uap->flags) { - flags = 0; if (uap->flags & R_OK) flags |= VREAD; if (uap->flags & W_OK) @@ -1804,7 +1804,17 @@ error = VOP_ACCESS(vp, flags, cred, p); } #ifdef MAC - error = mac_check_vnode_access(cred, vp, flags); + /* + * Override DAC error value with MAC error value unless + * MAC returns OK and DAC returns error. + */ + { + int mac_error; + + mac_error = mac_check_vnode_access(cred, vp, flags); + if (mac_error) + error = mac_error; + } #endif vput(vp); out1: From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 16:53:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F9F616A420 for ; Tue, 7 Mar 2006 16:53:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10DE443D49 for ; Tue, 7 Mar 2006 16:53:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id AF42746B28 for ; Tue, 7 Mar 2006 11:52:56 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2C4F555613; Tue, 7 Mar 2006 16:53:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1641E16A423; Tue, 7 Mar 2006 16:53: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 E354816A420 for ; Tue, 7 Mar 2006 16:53:16 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE8CA43D49 for ; Tue, 7 Mar 2006 16:53:16 +0000 (GMT) (envelope-from millert@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 k27GrG19014193 for ; Tue, 7 Mar 2006 16:53:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GrGnd014190 for perforce@freebsd.org; Tue, 7 Mar 2006 16:53:16 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:53:16 GMT Message-Id: <200603071653.k27GrGnd014190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92924 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 16:53:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=92924 Change 92924 by millert@millert_ibook on 2006/03/07 16:53:08 In file_mask_to_av() return FILE__ACCESS for an empty mask. That way a call to access() with flags == F_OK (aka 0) will map to the "access" permission rather than a zero access_vector_t (which confuses the avc). We don't allow a file mode of 0 in sebsd_check_vnode_open() but it is legal for sebsd_check_vnode_access(). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#35 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#35 (text+ko) ==== @@ -306,6 +306,10 @@ { access_vector_t av = 0; + /* per access(2), mask == 0 means only check for existence */ + if (mask == 0) + return FILE__ACCESS; + if (vt != VDIR) { if (mask & VEXEC) av |= FILE__EXECUTE; @@ -1701,14 +1705,12 @@ static int sebsd_check_vnode_access(struct ucred *cred, struct vnode *vp, - struct label *label, int acc_mode) + struct label *filelabel, int acc_mode) { - if (!acc_mode) - return 0; - + /* NOTE: acc_mode == 0 is legal for access(2) */ return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, acc_mode), - NULL)); + NULL)); } static int From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 17:06:03 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E39B16A420 for ; Tue, 7 Mar 2006 17:06:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF23343D6B for ; Tue, 7 Mar 2006 17:05:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5F3DD46B8D for ; Tue, 7 Mar 2006 12:05:27 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id EC25392498; Tue, 7 Mar 2006 17:05:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D69C316A423; Tue, 7 Mar 2006 17:05: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 AC05116A420 for ; Tue, 7 Mar 2006 17:05:32 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F32BB43D55 for ; Tue, 7 Mar 2006 17:05:31 +0000 (GMT) (envelope-from millert@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 k27H5VMn014694 for ; Tue, 7 Mar 2006 17:05:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27H5V54014691 for perforce@freebsd.org; Tue, 7 Mar 2006 17:05:31 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 17:05:31 GMT Message-Id: <200603071705.k27H5V54014691@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92925 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 17:06:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=92925 Change 92925 by millert@millert_ibook on 2006/03/07 17:05:30 Check for null space in mach_get_task_label_text() too. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/security.c#8 (text+ko) ==== @@ -58,15 +58,15 @@ return (KERN_SUCCESS); } + kern_return_t - mach_get_task_label_text( ipc_space_t space, labelstr_t policies, labelstr_t outl) { - if (space == IS_NULL) + if (space == IS_NULL || space->is_task == NULL) return KERN_INVALID_TASK; tasklabel_lock(space->is_task); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 19:22:15 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58B2716A420 for ; Tue, 7 Mar 2006 19:22:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1BEC43D45 for ; Tue, 7 Mar 2006 19:22:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E8A6C46C21 for ; Tue, 7 Mar 2006 14:21:50 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id F25A7557C9; Tue, 7 Mar 2006 19:22:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E242C16A423; Tue, 7 Mar 2006 19:22: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 9408416A420; Tue, 7 Mar 2006 19:22:10 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16FF043D4C; Tue, 7 Mar 2006 19:22:09 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k27JM3bH029291; Tue, 7 Mar 2006 14:22:07 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Todd Miller Date: Tue, 7 Mar 2006 12:49:07 -0500 User-Agent: KMail/1.9.1 References: <200603071649.k27GnAL1013961@repoman.freebsd.org> In-Reply-To: <200603071649.k27GnAL1013961@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200603071249.10153.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1317/Tue Mar 7 01:06:47 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED,AWL autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 92922 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 19:22:15 -0000 On Tuesday 07 March 2006 11:49, Todd Miller wrote: > http://perforce.freebsd.org/chv.cgi?CH=92922 > > Change 92922 by millert@millert_ibook on 2006/03/07 16:49:06 > > Add proc_has_security() and proc_has_system() for systems without > per-thread ucred (like Darwin). I thought the Darwin in Tiger does have per-thread ucreds? I guess the sedarwin branch is still on Panther though? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 01:15:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2CE6316A420 for ; Wed, 8 Mar 2006 01:15:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F54E43D4C for ; Wed, 8 Mar 2006 01:15:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 570ED46BB4 for ; Tue, 7 Mar 2006 20:14:43 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DB6B155B44; Wed, 8 Mar 2006 01:15:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CCAB616A423; Wed, 8 Mar 2006 01:15: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 9BCCE16A420 for ; Wed, 8 Mar 2006 01:15:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0689843D49 for ; Wed, 8 Mar 2006 01:15:02 +0000 (GMT) (envelope-from millert@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 k281F1Fe051966 for ; Wed, 8 Mar 2006 01:15:01 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k281F1gL051941 for perforce@freebsd.org; Wed, 8 Mar 2006 01:15:01 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 01:15:01 GMT Message-Id: <200603080115.k281F1gL051941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92948 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 01:15:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=92948 Change 92948 by millert@millert_g5tower on 2006/03/08 01:14:46 Sync with recent code changes. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/api.tex#2 edit .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/bsd.tex#2 edit .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/mach.tex#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/api.tex#2 (text+ko) ==== @@ -72,7 +72,7 @@ call, the user provides a reference to the object (such as a file descriptor), and the names of policies to retrieve the associated labels. -\begin{longtable}{|p{1.5in}|p{3in}|} +\begin{longtable}{|p{1.8in}|p{2.2in}|} \hline {\bf System Call} & {\bf Purpose} \\ \hline @@ -85,23 +85,25 @@ \endhead \hline \endfoot -mac\_set\_file(), mac\_set\_fd(), mac\_set\_link() & Change the label associated with a file. \\[3mm] +{\tt mac\_set\_file()}, {\tt mac\_set\_fd()}, {\tt mac\_set\_link()} & Change the label associated with a file. \\[3mm] \hline -mac()\_get\_file(), mac\_get\_fd(), mac\_get\_link() & Retrieve the label associated with a file. \\[3mm] +{\tt mac\_get\_file()}, {\tt mac\_get\_fd()}, {\tt mac\_get\_link()} & Retrieve the label associated with a file. \\[3mm] \hline -mac\_set\_proc() & Change the label of the current process. \\[3mm] +{\tt mac\_set\_proc()} & Change the label of the current process. \\[3mm] \hline -mac\_get\_pid(), mac\_get\_proc() & Retrieve the label on a process. \\[3mm] +{\tt mac\_get\_pid()}, {\tt mac\_get\_proc()} & Retrieve the label on a process. \\[3mm] \hline -mach\_get\_label\_text() & Retrieve the label on a port or label handle. \\[3mm] +{\tt mach\_get\_label\_text()} & Retrieve the label on a port as a label handle. \\[3mm] +{\tt mach\_get\_label\_text()} & Retrieve the label on a port or label handle in text form. \\[3mm] \hline -mach\_set\_port\_label() & Change the label on a port. \\[3mm] +{\tt mach\_set\_port\_label()} & Change the label on a port. \\[3mm] \hline -mach\_get\_task\_label\_text() & Retrieve the label on a task. \\[3mm] +{\tt mach\_get\_task\_label\_text()} & Retrieve the label on a task as a label handle. \\[3mm] +{\tt mach\_get\_task\_label\_text()} & Retrieve the label on a task in text form. \\[3mm] \hline -mac\_label\_new() & Create a new label handle. \\\\[3mm] +{\tt mac\_label\_new()} & Create a new label handle. \\[3mm] \hline -mac\_request\_label() & Compute a new label based on subject, object, service name. \\ +{\tt mac\_request\_label()} & Compute a new label based on subject, object, service name. \\ \end{longtable} \subsubsection{Secure Program Execution} ==== //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/bsd.tex#2 (text+ko) ==== @@ -20,13 +20,13 @@ The Darwin MAC Framework provides entry points for the same four process control checks that the FreeBSD MAC framework provides: -\footnote{On these, only mac\_check\_proc\_signal() is presently +\footnote{On these, only {\tt mac\_check\_proc\_signal()} is presently implemented by the SEDarwin module.} \begin{center} \begin{tabular}{ll} -mac\_check\_proc\_signal() & mac\_check\_proc\_sched() \\ -mac\_check\_proc\_debug() & mac\_check\_proc\_wait() \\ +{\tt mac\_check\_proc\_signal()} & {\tt mac\_check\_proc\_sched()} \\ +{\tt mac\_check\_proc\_debug()} & {\tt mac\_check\_proc\_wait()} \\ \end{tabular} \end{center} @@ -37,9 +37,9 @@ \begin{center} \begin{tabular}{ll} -mac\_check\_proc\_getaudit() & mac\_check\_proc\_setaudit() \\ -mac\_check\_proc\_getauid() & mac\_check\_proc\_setauid() \\ -mac\_check\_proc\_getlcid() & mac\_check\_proc\_setlcid() \\ +{\tt mac\_check\_proc\_getaudit()} & {\tt mac\_check\_proc\_setaudit()} \\ +{\tt mac\_check\_proc\_getauid()} & {\tt mac\_check\_proc\_setauid()} \\ +{\tt mac\_check\_proc\_getlcid()} & {\tt mac\_check\_proc\_setlcid()} \\ \end{tabular} \end{center} @@ -74,53 +74,53 @@ \begin{center} \begin{tabular}{ll} -mac\_check\_vnode\_access() -& mac\_check\_vnode\_chdir() \\ +{\tt mac\_check\_vnode\_access()} +& {\tt mac\_check\_vnode\_chdir()} \\ -mac\_check\_vnode\_chroot() -& mac\_check\_vnode\_create() \\ +{\tt mac\_check\_vnode\_chroot()} +& {\tt mac\_check\_vnode\_create()} \\ -mac\_check\_vnode\_delete() -& mac\_check\_vnode\_deleteextattr() \\ +{\tt mac\_check\_vnode\_delete()} +& {\tt mac\_check\_vnode\_deleteextattr()} \\ -mac\_check\_vnode\_exchangedata() -& mac\_check\_vnode\_exec() \\ +{\tt mac\_check\_vnode\_exchangedata()} +& {\tt mac\_check\_vnode\_exec()} \\ - mac\_check\_vnode\_getattrlist() -& mac\_check\_vnode\_getextattr() \\ +{\tt mac\_check\_vnode\_getattrlist()} +& {\tt mac\_check\_vnode\_getextattr()} \\ -mac\_check\_vnode\_link() -& mac\_check\_vnode\_listextattr() \\ +{\tt mac\_check\_vnode\_link()} +& {\tt mac\_check\_vnode\_listextattr()} \\ -mac\_check\_vnode\_lookup() -& mac\_check\_vnode\_mmap() \\ +{\tt mac\_check\_vnode\_lookup()} +& {\tt mac\_check\_vnode\_mmap()} \\ -mac\_check\_vnode\_mprotect() -& mac\_check\_vnode\_open() \\ +{\tt mac\_check\_vnode\_mprotect()} +& {\tt mac\_check\_vnode\_open()} \\ -mac\_check\_vnode\_poll() -& mac\_check\_vnode\_read() \\ +{\tt mac\_check\_vnode\_poll()} +& {\tt mac\_check\_vnode\_read()} \\ -mac\_check\_vnode\_readdir() -& mac\_check\_vnode\_readlink() \\ +{\tt mac\_check\_vnode\_readdir()} +& {\tt mac\_check\_vnode\_readlink()} \\ -mac\_check\_vnode\_rename\_from() -& mac\_check\_vnode\_rename\_to() \\ +{\tt mac\_check\_vnode\_rename\_from()} +& {\tt mac\_check\_vnode\_rename\_to()} \\ -mac\_check\_vnode\_revoke() -& mac\_check\_vnode\_select() \\ +{\tt mac\_check\_vnode\_revoke()} +& {\tt mac\_check\_vnode\_select()} \\ -mac\_check\_vnode\_setattrlist() -& mac\_check\_vnode\_setextattr() \\ +{\tt mac\_check\_vnode\_setattrlist()} +& {\tt mac\_check\_vnode\_setextattr()} \\ -mac\_check\_vnode\_setflags() -& mac\_check\_vnode\_setmode() \\ +{\tt mac\_check\_vnode\_setflags()} +& {\tt mac\_check\_vnode\_setmode()} \\ -mac\_check\_vnode\_setowner() -& mac\_check\_vnode\_setutimes() \\ +{\tt mac\_check\_vnode\_setowner()} +& {\tt mac\_check\_vnode\_setutimes()} \\ -mac\_check\_vnode\_stat() -& mac\_check\_vnode\_write() \\ +{\tt mac\_check\_vnode\_stat()} +& {\tt mac\_check\_vnode\_write()} \\ \end{tabular} \end{center} ==== //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/mach.tex#2 (text+ko) ==== @@ -99,8 +99,8 @@ whenever practical greatly reduces the development overhead of implementing messaging protocols. This is especially pertinent when developing kernel servers since the MiG generated code will handle -all of the necessary copyin(), copyout(), and basic message validation -tasks. +all of the necessary {\tt copyin()}, {\tt copyout()}, and basic message +validation tasks. \subsection{Mach Protection Primitives} @@ -157,16 +157,41 @@ Access control checks have been added to the Darwin Framework for message sending and receiving, port right transfers (both send and receive) as well as relabel operations for ports and tasks. The -full list of access control entry points is: +full list of access control entry points is as follows. -\begin{center} -\begin{tabular}{ll} -mac\_check\_port\_send() & mac\_check\_port\_make\_send() \\ -mac\_check\_port\_copy\_send() & mac\_check\_port\_move\_recieve() \\ -mac\_check\_port\_hold\_send() & mac\_check\_port\_hold\_recieve() \\ -mac\_check\_port\_receive() & mac\_check\_port\_relabel() \\ -\end{tabular} -\end{center} +\begin{longtable}{|p{2.2in}|p{2.3in}|} +\hline +{\bf Entry Point} & {\bf Called When} \\ +\hline +\hline +\endfirsthead +\hline +{\bf Entry Point} & {\bf Called When} \\ +\hline +\hline +\endhead +\hline +\endfoot +{\tt mac\_check\_port\_send()} & task attempts to send a message \\[3mm] +\hline +{\tt mac\_check\_port\_receive()} & task attempts to receive a message \\[3mm] +\hline +{\tt mac\_check\_port\_make\_send()} & task attempts to create a send right from a receive right \\[3mm] +{\tt mac\_check\_port\_make\_send\_once()} & task attempts to create a send-once right from a receive right \\[3mm] +\hline +{\tt mac\_check\_port\_copy\_send()} & task attempts to copy a send right to a task \\[3mm] +{\tt mac\_check\_port\_move\_send()} & task attempts to move a send right from one task to another \\[3mm] +{\tt mac\_check\_port\_move\_send\_once()} & task attempts to move a send-one right from one task to another \\[3mm] +\hline +{\tt mac\_check\_port\_move\_recieve()} & task attempts to move the receive right from one task another. \\[3mm] +\hline +{\tt mac\_check\_port\_hold\_send()} & task attempts to receive a send right \\[3mm] +{\tt mac\_check\_port\_hold\_send\_once()} & task attempts to receive a send-once right \\[3mm] +\hline +{\tt mac\_check\_port\_hold\_recieve()} & task attempts to receive a receive right \\[3mm] +\hline +{\tt mac\_check\_port\_relabel()} & task attempts to relabel a port or task \\[3mm] +\end{longtable} \subsection{Changes to the Mach Kernel} @@ -221,30 +246,35 @@ can request three trailer fields: a message sequence number, a security token (equivalent to the UNIX uid and gid), and an audit token (an opaque object which may be interpreted by the BSM audit -library). We have added two additional trailer types: the sender's -security labels and a policy access decision. +library). We have added two additional trailer types: +{\tt MACH\_RCV\_TRAILER\_LABELS} and {\tt MACH\_RCV\_TRAILER\_AV}. -When security labels are requested, a label handle is returned that -the caller may use to request access decisions from the security -server. For example, the bootstrap namespace server could ensure only a -privleged process can examine the namespace created by a different -loginwindow process. Note that the caller is responsible for freeing -requested label handles. +The {\tt MACH\_RCV\_TRAILER\_LABELS} trailer returns the sender's +security labels as part of the message trailer in the form of a +label handle. The caller may use the label handle to request access +decisions from the security server or convert the handle to text +form. For example, the bootstrap namespace server could ensure +only a privleged process can examine the namespace created by a +different loginwindow process. The returned label handle may be +deallocated using the standard Mach port API functions {\tt +mach\_port\_deallocate()} and {\tt mach\_port\_destroy()}. Label +handles are garbage collected upon task termination just like regular +Mach ports. -The policy access decision trailer provides similar functionality -to the DTOS mach\_msg\_secure() trap without requiring an extra trap -(and the requisite changes to the standard C library). -This trailer provides a single access decision as a boolean value -to the caller, computed by the loaded policies using subject, port, -subsystem, and routine name arguments Providing the full subsystem -vector (as in DTOS) is impractical with our abstract policy framework. -A complex policy would be required to compute decisions for the -entire subsystem even though only one decision was useful at that -time and the results of computation may not be usable for future -calls. An alternative is to cache access decisions in the policy -itself for rapid lookup, as FLASK does. Our extended trailers may -be use alone or in combination with any other trailers supported -by Darwin. +The {\tt MACH\_RCV\_TRAILER\_AV} trailer trailer provides similar +functionality to the DTOS {\tt mach\_msg\_secure()} trap without +requiring an extra trap (and the requisite changes to the standard +C library). This trailer provides a single access decision as a +boolean value to the caller, computed by the loaded policies using +subject, port, subsystem, and routine name arguments Providing the +full subsystem vector (as in DTOS) is impractical with our abstract +policy framework. A complex policy would be required to compute +decisions for the entire subsystem even though only one decision +was useful at that time and the results of computation may not be +usable for future calls. An alternative is to cache access decisions +in the policy itself for rapid lookup, as FLASK does. Our extended +trailers may be use alone or in combination with any other trailers +supported by Darwin. When the extended trailers are requested by a receiving task, calls are made to the loaded security policies and the result is copied @@ -256,8 +286,6 @@ precomputed access control decisions are cache in the ipc\_entry field of the sending task. -\textit{XXX: describe our 2 trailers in detail here} - Unlike the stock Darwin trailer fields, our additional trailers are not simply existing data that can be copied. The kernel must make additional calls to the MAC Framework to fill in the trailer data. @@ -313,3 +341,106 @@ the same message formats as the application; after decoding the arguments, the proxy server checks authorization with the security system. Depending on the result of the authorization check, the proxy server calls the application with the user's message. + + +\subsection{Sequence of Messaging Security Checks} + +Message security checks are performed at both the sending and +receiving ends. When sending, the kernel first calls the +{\tt mac\_check\_port\_send()} Framework entry point to permit or deny +the sending of the message. Next, each security policy is queried +for permission to transfer each port right contained in the message. +If any port right transfers are denied, the message is not sent. +Because memory objects are not currently labeled, no special check +is performed for transferring out-of-line memory. The sending +checks refer to the receiving port, not the receiving task, as the +receive right for the destination port could be in the process of +moving between tasks while the message is in-flight. On the receiving +end, the kernel calls the {\tt mac\_check\_port\_receive()} Framework +entry point to permit or deny receipt of the message. If the task +is permitted to receive the message, further checks are made to +verify that the task is permitted to hold the port rights contained +in the message. If any port right transfers are denied, the message +will not be delivered. + +\subsubsection{Message Life Cycle} + +\begin{enumerate} +\item {Message sent by task.} +The {\tt mach\_msg()} or {\tt mach\_msg\_send()} library function enters the +kernel via the {\tt mach\_msg\_trap()} syscall. + +\item {Kernel allocates space for the (kernel-private) message object.} +The {\tt mach\_msg\_trap()} syscall calls {\tt mach\_msg\_send()} which uses +{\tt ipc\_kmsg\_get()} to allocate a new kernel message object. + +\item {Framework entry point {\tt mac\_check\_port\_send()} is called.} +The {\tt mach\_msg\_send()} function calls {\tt ipc\_kmsg\_copyin()} +to copy the message from user space into the kernel. The message header +and an optional message body are copied separately. Before +copying the header in {\tt ipc\_kmsg\_copyin\_header()}, the +{\tt mac\_check\_port\_send()} Framework entry point is called to check +whether the task is permitted to send the message. + +\item {The message header is filled in from user space by {\tt ipc\_kmsg\_copyin\_header()}.} +If the header contains port rights, {\tt ipc\_right\_copyin()} is called +to update the capabilities from the user's task. Before port +rights are updated, the appropriate Framework entry point is +called. The entry points are {\tt mac\_check\_port\_make\_send()} for +new send (or send-once) rights, {\tt mac\_check\_port\_move\_receive()} +for receive rights, and {\tt mac\_check\_port\_copy\_send()} for copying +or moving send (or send-once) rights. + +\item {The message body (if any) is copied by {\tt ipc\_kmsg\_copyin\_body()}.} +The message body may contain additional port rights and inline +or out of line data (which may itself contain port rights). +Port rights (and their permission checks) are performed in the +same manner as the rights contained in the message header. +Space for memory regions (both inline and out of line) is +allocated from the kernel's ipc copy memory map (using copy on +write semantics). + +\item {The message object is placed in the port's message queue.} +The {\tt mach\_msg\_send()} function calls {\tt ipc\_kmsg\_send()} which in +turn uses {\tt ipc\_mqueue\_send()} to enqueue the message. + +\item {Message sent.} + +.... + +\item {Receiving task tries to pick up the message.} +The {\tt mach\_msg()} or {\tt mach\_msg\_receive()} library function enters +the kernel via the {\tt mach\_msg\_trap()} syscall. + +\item {Framework entry point {\tt mac\_check\_port\_receive()} is called.} +{\tt mach\_msg\_receive()} calls {\tt ipc\_mqueue\_receive()} which in turn +calls the Framework entry point {\tt mac\_check\_port\_receive()} to check +whether the task is permitted to receive the message. If the task +is permitted to receive it, the message is moved out of the receiving +port's message queue. If permission is denied, the message is dropped +and the in-kernel message object is deallocated. + +\item {MAC Trailers are filled in for the message if they were requested.} +{\tt mach\_msg\_receive()} checks for {\tt MACH\_RCV\_TRAILER\_AV} or +{\tt MACH\_RCV\_TRAILER\_LABELS}. + +\item {Message header is copied into the user's address space.} +{\tt ipc\_kmsg\_copyout()} calls {\tt ipc\_kmsg\_copyout\_header()}. +If the message contains ports rights they are copied via +{\tt ipc\_right\_copyout()} which first calls the appropriate Framework +entry point. The entry points are {\tt mac\_check\_port\_hold\_send()} +for send rights, {\tt mac\_check\_port\_hold\_send\_once()} for send-once +rights, and {\tt mac\_check\_port\_hold\_receive()} for receive rights. + +\item {Message body is copied into the user's address space.} +If the body contains ports rights (either inline or out of line) +they are copied in the same manner as rights contained in the +header. If the body contains memory regions they are +mapped into the calling task's address space by the Mach +virtual memory subsystem. + +\item {In-kernel message object is deallocated.} + +\item {Message received.} + +\end{enumerate} From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 15:59:02 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 625BD16A420 for ; Wed, 8 Mar 2006 15:59:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A70FA43D76 for ; Wed, 8 Mar 2006 15:58:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0544546BFE for ; Wed, 8 Mar 2006 10:58:27 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 27C2456FB0; Wed, 8 Mar 2006 15:58:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 15F4316A423; Wed, 8 Mar 2006 15:58: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 CAF8116A420 for ; Wed, 8 Mar 2006 15:58:46 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49A4743D69 for ; Wed, 8 Mar 2006 15:58:42 +0000 (GMT) (envelope-from millert@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 k28FwgLA010835 for ; Wed, 8 Mar 2006 15:58:42 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28FwgvV010832 for perforce@freebsd.org; Wed, 8 Mar 2006 15:58:42 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 15:58:42 GMT Message-Id: <200603081558.k28FwgvV010832@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92969 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 15:59:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=92969 Change 92969 by millert@millert_g5tower on 2006/03/08 15:58:17 Add a man page for mexec Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/mexec.8#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ include ../../../Makeconfig PROG= mexec -NOMAN= +MAN8= mexec.8 OBJS= mexec.o @@ -15,6 +15,7 @@ install: $(PROG) install -m 555 $(PROG) $(DESTDIR)/usr/bin + install -m 444 $(MAN8) $(DESTDIR)/usr/share/man/man8 clean: rm -f $(PROG) $(OBJS) From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 19:01:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ACA8A16A422 for ; Wed, 8 Mar 2006 19:01:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A43943D72 for ; Wed, 8 Mar 2006 19:01:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1C4AB46B7B for ; Wed, 8 Mar 2006 14:00:43 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B937756394; Wed, 8 Mar 2006 19:00:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A7C2916A423; Wed, 8 Mar 2006 19:00: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 7DC0316A420 for ; Wed, 8 Mar 2006 19:00: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 431E243D48 for ; Wed, 8 Mar 2006 19:00: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 k28J0RHM026486 for ; Wed, 8 Mar 2006 19:00: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 k28J0R08026483 for perforce@freebsd.org; Wed, 8 Mar 2006 19:00:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 19:00:27 GMT Message-Id: <200603081900.k28J0R08026483@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 92976 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 19:01:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92976 Change 92976 by rwatson@rwatson_peppercorn on 2006/03/08 18:59:31 Comment in HISTORY on adding test pieces. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#9 (text+ko) ==== @@ -27,6 +27,8 @@ - Universally, APIs now assume that IP addresses and ports are provided in network byte order. APIs now generally provide these types in network byte order when decoding. +- Beginnings of an OpenBSM test framework can now be found in openbsm/test. + This code is not built or installed by default. OpenBSM 1.0 alpha 5 @@ -154,4 +156,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#8 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#9 $ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:00:21 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 528CC16A422 for ; Wed, 8 Mar 2006 21:00:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8114643D7B for ; Wed, 8 Mar 2006 21:00:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2272346BA3 for ; Wed, 8 Mar 2006 15:59:44 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 518F157923; Wed, 8 Mar 2006 20:57:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FBC516A423; Wed, 8 Mar 2006 20:57: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 F01DC16A420 for ; Wed, 8 Mar 2006 20:57:50 +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 9E71343D45 for ; Wed, 8 Mar 2006 20:57:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k28Kvolj040162 for ; Wed, 8 Mar 2006 20:57:50 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 k28KvoPd040159 for perforce@freebsd.org; Wed, 8 Mar 2006 20:57:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 20:57:50 GMT Message-Id: <200603082057.k28KvoPd040159@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 92980 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 21:00:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=92980 Change 92980 by rwatson@rwatson_peppercorn on 2006/03/08 20:57:21 Minor style cleanups. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#22 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#17 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#22 (text+ko) ==== @@ -308,7 +308,7 @@ /* Access control checks. */ int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); -int mac_check_cap(struct ucred *cred, cap_value_t capv); +int mac_check_cap(struct ucred *cred, cap_value_t capv); int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); int mac_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m); @@ -361,9 +361,9 @@ int mac_check_kld_stat(struct ucred *cred); int mac_check_kld_unload(struct ucred *cred); int mac_check_mount(struct ucred *cred, struct vnode *dir, const char *vfc_name, - struct label *mount_arg_label); + struct label *mount_arg_label); int mac_check_remount(struct ucred *cred, struct mount *mp, - struct label *mount_arg_label); + struct label *mount_arg_label); int mac_check_umount(struct ucred *cred, struct mount *mp); int mac_check_mount_stat(struct ucred *cred, struct mount *mp); int mac_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp, ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#17 (text+ko) ==== @@ -360,9 +360,9 @@ int (*mpo_check_bpfdesc_receive)(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel); - int (*mpo_check_cap) (struct ucred *ucred, cap_value_t capv); + int (*mpo_check_cap) (struct ucred *ucred, cap_value_t capv); int (*mpo_check_cred_relabel)(struct ucred *cred, - struct label *newlabel); + struct label *newlabel); int (*mpo_check_cred_visible)(struct ucred *u1, struct ucred *u2); int (*mpo_check_file_create)(struct ucred *cred); int (*mpo_check_file_dup)(struct ucred *cred, struct file *fp, @@ -441,7 +441,7 @@ struct label *vlabel); int (*mpo_check_kld_stat)(struct ucred *cred); int (*mpo_check_kld_unload)(struct ucred *cred); - int (*mpo_check_mount)(struct ucred *cred, struct vnode *dir, + int (*mpo_check_mount)(struct ucred *cred, struct vnode *dir, struct label *dirlabel, const char *vfc_name, struct label *mount_arg_label); int (*mpo_check_remount)(struct ucred *cred, struct mount *mp, From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:02:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D49516A420 for ; Wed, 8 Mar 2006 21:02:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5F3E43D79 for ; Wed, 8 Mar 2006 21:00:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 72D7746C0E for ; Wed, 8 Mar 2006 15:59:51 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A24C456172; Wed, 8 Mar 2006 20:59:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A5DD16A423; Wed, 8 Mar 2006 20:59: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 32ED516A420 for ; Wed, 8 Mar 2006 20:59: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 D9F1A43D93 for ; Wed, 8 Mar 2006 20:59: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 k28KxroP040299 for ; Wed, 8 Mar 2006 20:59: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 k28Kxrn9040296 for perforce@freebsd.org; Wed, 8 Mar 2006 20:59:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 20:59:53 GMT Message-Id: <200603082059.k28Kxrn9040296@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 92981 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 21:02:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92981 Change 92981 by rwatson@rwatson_peppercorn on 2006/03/08 20:59:42 lmount() didn't survive the last SEBSD integration, and is now obsoleted by the use of nmount(). Complete deletion/disabling. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#16 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#28 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#17 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#16 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#17 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#17 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#17 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#16 (text+ko) ==== @@ -486,5 +486,4 @@ { SYF_MPSAFE | AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL }, /* 454 = _umtx_op */ { SYF_MPSAFE | AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL }, /* 455 = thr_new */ { SYF_MPSAFE | AS(__mac_get_fs_args), (sy_call_t *)__mac_get_fs, AUE_NULL }, /* 456 = __mac_get_fs */ - { AS(lmount_args), (sy_call_t *)nosys, AUE_NULL }, /* 457 = lmount */ }; ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#28 (text+ko) ==== @@ -1374,6 +1374,7 @@ return (ENOSYS); } +#if 0 int lmount(td, uap) struct thread *td; @@ -1381,5 +1382,6 @@ { return EINVAL; } +#endif #endif /* !MAC */ ==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#17 (text+ko) ==== @@ -464,5 +464,4 @@ "_umtx_op", /* 454 = _umtx_op */ "thr_new", /* 455 = thr_new */ "__mac_get_fs", /* 456 = __mac_get_fs */ - "lmount", /* 457 = lmount */ }; ==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#16 (text+ko) ==== @@ -792,9 +792,6 @@ int param_size); } 456 AUE_NULL MSTD { int __mac_get_fs(const char *path_p, \ struct mac *mac_p); } -457 AUE_MOUNT NOIMPL { int lmount(char *type, char *path, \ - int flags, caddr_t data, \ - struct mac *mac_p); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#17 (text+ko) ==== @@ -370,5 +370,4 @@ #define SYS__umtx_op 454 #define SYS_thr_new 455 #define SYS___mac_get_fs 456 -#define SYS_lmount 457 -#define SYS_MAXSYSCALL 458 +#define SYS_MAXSYSCALL 457 ==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#17 (text+ko) ==== @@ -311,5 +311,4 @@ auditctl.o \ _umtx_op.o \ thr_new.o \ - __mac_get_fs.o \ - lmount.o + __mac_get_fs.o ==== //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#17 (text+ko) ==== @@ -1357,13 +1357,6 @@ char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)]; char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; }; -struct lmount_args { - char type_l_[PADL_(char *)]; char * type; char type_r_[PADR_(char *)]; - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char data_l_[PADL_(caddr_t)]; caddr_t data; char data_r_[PADR_(caddr_t)]; - char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; -}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1672,7 +1665,6 @@ int _umtx_op(struct thread *, struct _umtx_op_args *); int thr_new(struct thread *, struct thr_new_args *); int __mac_get_fs(struct thread *, struct __mac_get_fs_args *); -int lmount(struct thread *, struct lmount_args *); #ifdef COMPAT_43 From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:02:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C2A216A423 for ; Wed, 8 Mar 2006 21:02:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E8E643D66 for ; Wed, 8 Mar 2006 21:02:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3E03D46BB2 for ; Wed, 8 Mar 2006 16:01:57 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 445BE56D2E; Wed, 8 Mar 2006 21:02:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 317EE16A42B; Wed, 8 Mar 2006 21:02: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 90C6F16A46F for ; Wed, 8 Mar 2006 21:02:12 +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 83FE943E13 for ; Wed, 8 Mar 2006 21:01: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 k28L1u1r040515 for ; Wed, 8 Mar 2006 21:01: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 k28L1uah040512 for perforce@freebsd.org; Wed, 8 Mar 2006 21:01:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:01:56 GMT Message-Id: <200603082101.k28L1uah040512@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 92982 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 21:02:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92982 Change 92982 by rwatson@rwatson_peppercorn on 2006/03/08 21:01:51 For the time being, ignore the label argument when mounting UFS. Future integrations will bring in the conversion of mount_ufs to nmount(). Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/mount/mount_ufs.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/mount/mount_ufs.c#6 (text+ko) ==== @@ -106,6 +106,7 @@ else args.export.ex_flags = 0; +#if 0 if (ltext) { mac_t mac; rc = mac_from_text(&mac, ltext); @@ -115,9 +116,9 @@ } rc = lmount("ufs", fs_name, mntflags, &args, mac); - } - else - rc = mount("ufs", fs_name, mntflags, &args); + } else +#endif + rc = mount("ufs", fs_name, mntflags, &args); if (rc < 0) { switch (errno) { From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:03:15 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 212B316A420 for ; Wed, 8 Mar 2006 21:03:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B009C43D6A for ; Wed, 8 Mar 2006 21:03:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B34DA46B9A for ; Wed, 8 Mar 2006 16:02:42 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6DD0C57628; Wed, 8 Mar 2006 21:03:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 59AAE16A423; Wed, 8 Mar 2006 21:03: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 3147816A420 for ; Wed, 8 Mar 2006 21:03: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 4E4B743D6B for ; Wed, 8 Mar 2006 21:02: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 k28L2w4U040543 for ; Wed, 8 Mar 2006 21:02: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 k28L2veG040540 for perforce@freebsd.org; Wed, 8 Mar 2006 21:02:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:02:57 GMT Message-Id: <200603082102.k28L2veG040540@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 92983 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 21:03:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=92983 Change 92983 by rwatson@rwatson_peppercorn on 2006/03/08 21:02:32 Minor style tweak. Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#11 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#11 (text+ko) ==== @@ -179,7 +179,7 @@ options = catopt(options, "noro"); break; case 'l': - ltext = strdup (optarg); + ltext = strdup(optarg); break; case '?': default: From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:06:00 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77C6B16A422 for ; Wed, 8 Mar 2006 21:06:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B89A43D78 for ; Wed, 8 Mar 2006 21:05:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EE81046BA3 for ; Wed, 8 Mar 2006 16:05:07 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6DDDD58088; Wed, 8 Mar 2006 21:05:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 53A5616A425; Wed, 8 Mar 2006 21:05: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 8D58816A423 for ; Wed, 8 Mar 2006 21:05: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 E387D43D66 for ; Wed, 8 Mar 2006 21:05:12 +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 k28L51ps040686 for ; Wed, 8 Mar 2006 21:05:01 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 k28L50ht040673 for perforce@freebsd.org; Wed, 8 Mar 2006 21:05:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:05:00 GMT Message-Id: <200603082105.k28L50ht040673@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 92984 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 21:06:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=92984 Change 92984 by rwatson@rwatson_peppercorn on 2006/03/08 21:04:44 Re-enable old UFS mount code for the time being, as the lmount() changes are not currently good. Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#12 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#12 (text+ko) ==== @@ -469,6 +469,17 @@ free(optbuf); return (1); case 0: /* Child. */ + /* + * XXXRW: In the new world order, nmount() is also used for + * UFS. With the SEBSD-local lmount changes, the following + * block of code was not used, as mount_ufs contained + * special support. + */ +#if 1 + if (strcmp(vfstype, "ufs") == 0) + exit(mount_ufs(argc, (char * const *) argv)); +#endif + /* Go find an executable. */ execvP(execname, _PATH_SYSPATH, (char * const *)argv); if (errno == ENOENT) { From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:12:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B969916A420 for ; Wed, 8 Mar 2006 21:12:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DD8B43D70 for ; Wed, 8 Mar 2006 21:12:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4827746BA4 for ; Wed, 8 Mar 2006 16:12:26 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CB2FE5737C; Wed, 8 Mar 2006 21:12:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BA7F916A423; Wed, 8 Mar 2006 21:12:46 +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 8F2B416A420 for ; Wed, 8 Mar 2006 21:12:46 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 577BC43D72 for ; Wed, 8 Mar 2006 21:12:39 +0000 (GMT) (envelope-from millert@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 k28LCd0K041020 for ; Wed, 8 Mar 2006 21:12:39 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28LCdXs041017 for perforce@freebsd.org; Wed, 8 Mar 2006 21:12:39 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 21:12:39 GMT Message-Id: <200603082112.k28LCdXs041017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92985 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 21:12:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=92985 Change 92985 by millert@millert_g5tower on 2006/03/08 21:11:39 Back out last revision. Old behavior was consistent with SELinux. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#36 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#36 (text+ko) ==== @@ -306,10 +306,6 @@ { access_vector_t av = 0; - /* per access(2), mask == 0 means only check for existence */ - if (mask == 0) - return FILE__ACCESS; - if (vt != VDIR) { if (mask & VEXEC) av |= FILE__EXECUTE; @@ -1243,8 +1239,6 @@ &osec->sid); } -extern int selinux_enforcing; - static int sebsd_check_ipc_method(struct label *subj, struct label *obj, int msgid) { @@ -1708,7 +1702,10 @@ struct label *filelabel, int acc_mode) { - /* NOTE: acc_mode == 0 is legal for access(2) */ + /* existence check (F_OK) */ + if (acc_mode == 0) + return 0; + return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, acc_mode), NULL)); } From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:29:51 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D88C616A429 for ; Wed, 8 Mar 2006 21:29:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC8CF43D98 for ; Wed, 8 Mar 2006 21:29:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2397C46BE0 for ; Wed, 8 Mar 2006 16:28:58 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7AF6F5B18D; Wed, 8 Mar 2006 21:29:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 69F3416A423; Wed, 8 Mar 2006 21:29: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 3A0D216A420 for ; Wed, 8 Mar 2006 21:29:18 +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 9275143D7B for ; Wed, 8 Mar 2006 21:29: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 k28LT2BW041599 for ; Wed, 8 Mar 2006 21:29: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 k28LSx8T041591 for perforce@freebsd.org; Wed, 8 Mar 2006 21:28:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:28:59 GMT Message-Id: <200603082128.k28LSx8T041591@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 92986 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 21:29:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92986 Change 92986 by rwatson@rwatson_peppercorn on 2006/03/08 21:28:14 Integrate TrustedBSD MAC branch from TrustedBSD base. See changes 92726 and 92749 for detailed list of merged changes. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#31 integrate .. //depot/projects/trustedbsd/mac/Makefile#37 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#63 integrate .. //depot/projects/trustedbsd/mac/README#6 integrate .. //depot/projects/trustedbsd/mac/UPDATING#53 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/NEWS#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/TODO#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/VERSION#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpclient.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_route.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_tree.def#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_ntp/snmp_ntp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/bsnmpd.1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/config.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/export.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/main.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpd.config#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.3#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/GNUmakefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/TODO#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/attrstack.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/attrstack.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/config.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/config.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/csup.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/detailer.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/detailer.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/diff.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/diff.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fattr.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fattr.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fixups.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fixups.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fnmatch.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/fnmatch.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/globtree.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/globtree.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/keyword.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/keyword.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/lister.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/lister.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/main.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/main.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/misc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/misc.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/mux.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/mux.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/parse.y#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/pathcomp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/pathcomp.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/proto.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/proto.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/queue.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/status.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/status.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/stream.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/stream.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/threads.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/threads.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/token.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/token.l#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/updater.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/updater.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/mkfilters.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/CHANGELOG#3 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/HISTORY#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/TODO#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/aclocal.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/autogen.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/praudit/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/praudit/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/praudit/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/compat/queue.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/config.guess#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/config.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/config.h.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/config.sub#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/depcomp#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/install-sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/ltmain.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/missing#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/configure#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/configure.ac#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_notify.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/etc/defaults/periodic.conf#15 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.x11-4.dist#11 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/trustedbsd/mac/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/trustedbsd/mac/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/trustedbsd/mac/etc/periodic/daily/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfw#11 integrate .. //depot/projects/trustedbsd/mac/etc/snmpd.config#4 integrate .. //depot/projects/trustedbsd/mac/include/printf.h#2 integrate .. //depot/projects/trustedbsd/mac/include/resolv.h#8 integrate .. //depot/projects/trustedbsd/mac/include/rpc/auth.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#21 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_net.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_net_ntop.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_net_pton.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_comp.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_debug.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_query.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_send.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_des.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_none.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_unix.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_dg.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_raw.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_simple.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_vc.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/getpublickey.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/key_call.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/mt_misc.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/mt_misc.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_com.h#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_generic.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_soc.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpcb_clnt.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_auth.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_dg.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_generic.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_raw.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_run.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_simple.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_vc.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf_quote.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/Makefile.inc#18 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/gettimeofday.2#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kldnext.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/pmc.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/amd64/amd64/context.S#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cond.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_nanosleep.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/librt/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/librt/aio.c#1 branch .. //depot/projects/trustedbsd/mac/lib/librt/mq.c#1 branch .. //depot/projects/trustedbsd/mac/lib/librt/sigev_thread.c#1 branch .. //depot/projects/trustedbsd/mac/lib/librt/sigev_thread.h#1 branch .. //depot/projects/trustedbsd/mac/lib/librt/timer.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/pidfile.3#3 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#31 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#17 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#84 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#25 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/sgml/release.ent#16 integrate .. //depot/projects/trustedbsd/mac/sbin/bsdlabel/bsdlabel.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/dmesg/dmesg.c#11 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/dump.8#24 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpon/dumpon.8#12 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk_pc98/fdisk.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk_pc98/fdisk.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/shsec/geom_shsec.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#33 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifieee80211.c#15 integrate .. //depot/projects/trustedbsd/mac/sbin/init/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sbin/kldunload/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/kldunload/kldunload.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/kldunload/kldunload.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.8#20 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.c#21 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#37 integrate .. //depot/projects/trustedbsd/mac/share/examples/ipfilter/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#58 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi.4#21 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/altq.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/cpufreq.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ddb.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/hwpmc.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/if_bridge.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/kbdmux.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_netflow.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/tdfx.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#36 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/periodic.conf.5#16 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/rc.subr.8#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/bus_dma.9#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/sleep.9#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/time.9#6 integrate .. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#25 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/ko_KR.eucKR.src#3 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/zh_CN.GBK.src#2 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/zh_CN.eucCN.src#3 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/zh_TW.Big5.src#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/intr_machdep.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/io_apic.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/apicvar.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/intr_machdep.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/mptable.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/isa/atpic.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/busdma_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/machdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/undefined.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/vm_machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/pmap.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/i80321_dma.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/bsm/audit.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_misc.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_sysent.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/syscalls.master#14 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#70 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#125 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#35 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#80 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.i386#31 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.pc98#31 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#29 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-queue.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_ath.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athvar.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/de/if_de.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/de/if_devar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iir/iir.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iir/iir.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iir/iir_pci.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/kbd/kbd.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/le/am7990.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/le/am79900.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_cnfg.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_ioc.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_type.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_debug.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_pci.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mse/mse.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/if_plip.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/lpt.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/ppi.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppc/ppc.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/puc/puc.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/puc/puc_ebus.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/puc/puc_sbus.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/re/if_re.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sio/sio.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/feeder.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sr/if_sr.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/syscons/syscons.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_bus.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_bus_ebus.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_dev_ns8250.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_dev_sab82532.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_dev_z8530.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_kbd_sun.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_tty.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ehci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ukbd.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uplcom.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_port.h#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_quirks.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_subr.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#43 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdivar.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vkbd/vkbd.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/deadfs/dead_vnops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_subr.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_ctl.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_io.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/label/g_label_ufs.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#60 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/PAE#13 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/XBOX#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/identcpu.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/intr_machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/io_apic.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/local_apic.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/apicvar.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/intr_machdep.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/mptable.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/xbox.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/atpic.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_ptrace.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/i386/xbox/xboxfb.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/isa/syscons_isa.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#70 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_kse.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_kthread.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mbuf.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_resource.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#52 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_time.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_timeout.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_prf.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_sleepqueue.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_process.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#70 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#67 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#80 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#125 integrate .. //depot/projects/trustedbsd/mac/sys/modules/3dfx/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#86 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ce/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/coda5/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/crypto/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/de/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_ef/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_ppp/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/sys/modules/kbdmux/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/uart/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/bridgestp.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_bridge.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/net/ppp_deflate.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_ioctl.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_output.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#62 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#29 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/mld6.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/opencrypto/crypto.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/opencrypto/cryptodev.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/cbus/fdc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/cbus/ppc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/cbus/sio.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#28 integrate .. //depot/projects/trustedbsd/mac/sys/pci/dc21040reg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/pci/if_de.c#24 delete .. //depot/projects/trustedbsd/mac/sys/pci/if_devar.h#11 delete .. //depot/projects/trustedbsd/mac/sys/security/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_process.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#93 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_types.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/sys/bio.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#43 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#68 integrate .. //depot/projects/trustedbsd/mac/sys/sys/queue.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/sys/serial.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sys/signalvar.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#70 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#69 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscallsubr.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#71 integrate .. //depot/projects/trustedbsd/mac/sys/sys/timers.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#78 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_alloc.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_rawread.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/softdep.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_quota.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufsmount.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#39 integrate .. //depot/projects/trustedbsd/mac/tools/tools/README#22 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ministat/ministat.c#6 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/acpi.c#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/acpidump.h#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/biosmptable.c#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/ncpus.c#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/netrate/http/http.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/netrate/httpd/httpd.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tbmaster.1#12 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tbmaster.pl#19 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tinderbox.1#9 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tinderbox.pl#14 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/www/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/www/index.cgi#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/Makefile#38 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.freebsd#40 integrate .. //depot/projects/trustedbsd/mac/usr.bin/csup/Makefile#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/finger/sprint.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/tree.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#46 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/hccontrol.h#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/info.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/link_control.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/util.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pmccontrol/pmccontrol.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/portsnap/portsnap/portsnap.8#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/quot/quot.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/anonFTP.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#25 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/devices.c#20 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/disks.c#23 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dist.c#27 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dmenu.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/http.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/index.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/installUpgrade.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/keymap.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/label.c#25 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/main.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/media.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/menus.c#41 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/options.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/package.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/sysinstall.h#29 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/system.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/tcpip.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/user.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/wizard.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslog.conf.5#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/mac/MAINTAINERS#31 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.128 2005/12/12 01:28:19 rodrigc Exp $ +$FreeBSD: src/MAINTAINERS,v 1.129 2006/03/04 14:24:32 rwatson Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -26,6 +26,8 @@ UFS EAs rwatson Pre-commit review requested. MAC Framework rwatson Pre-commit review requested. MAC Modules rwatson Pre-commit review requested. +contrib/openbsm rwatson Pre-commit review requested. +sys/security/audit rwatson Pre-commit review requested. ATA/IDE sos Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. ==== //depot/projects/trustedbsd/mac/Makefile#37 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.325 2005/11/28 11:14:36 ru Exp $ +# $FreeBSD: src/Makefile,v 1.326 2006/03/01 13:07:17 yar Exp $ # # The user-driven targets are: # @@ -93,11 +93,11 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ - ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \ + ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ - (in /etc/make.conf) or command-line variable. + (in make.conf(5)) or command-line variable. .endif MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} BINMAKE= \ ==== //depot/projects/trustedbsd/mac/Makefile.inc1#63 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -506,7 +506,7 @@ # Check for missing UIDs/GIDs. # CHECK_UIDS= -CHECK_GIDS= +CHECK_GIDS= audit .if !defined(NO_SENDMAIL) CHECK_UIDS+= smmsp CHECK_GIDS+= smmsp ==== //depot/projects/trustedbsd/mac/README#6 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.22 2003/03/08 10:01:26 markm Exp $ +$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -59,6 +59,8 @@ release Release building Makefile & associated tools. +rescue Build system for statically linked /rescue utilities. + sbin System commands. secure Cryptographic libraries and commands. ==== //depot/projects/trustedbsd/mac/UPDATING#53 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20060303: + The TDFX_LINUX kernel option was retired and replaced by the + tdfx_linux device. The latter can be loaded as a kernel module. + Loading it alone should suffice to get 3dfx support for Linux + apps because it will pull in tdfx.ko and linux.ko through its + dependencies. + 20060201: The kernel ABI to file system modules was changed on i386. Please make sure that your kernel and modules are in sync. @@ -510,4 +517,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ +$FreeBSD: src/UPDATING,v 1.440 2006/03/03 21:37:38 yar Exp $ ==== //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#9 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.25 2005/06/14 08:25:54 ru Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.26 2006/03/04 02:38:40 trhodes Exp $ .\" -.Dd May 14, 2005 +.Dd March 3, 2006 .Dt CHFLAGS 1 .Os .Sh NAME @@ -120,6 +120,39 @@ clear the nodump flag (owner or super-user only) .El .Pp +A few of the octal values include: +.Bl -tag -offset indent -width ".Ar 10" +.It Li 0 +Clear all file flags. +.It Li 1 +Translates to the +.Ar nodump +keyword. +.It Li 2 +Translates to the +.Ar uchg +keyword. +.It Li 3 +Translates to the +.Ar uchg , nodump +keywords. +.It Li 4 +Translates to the +.Ar uappnd +keyword. +.It Li 10 +Translates to the +.Ar opaque +keyword. +.It Li 20 +translates to the +uunlnk +keyword. +.El +.Pp +Other combinations of keywords may be placed by using +the octets assigned; however, these are the most notable. +.Pp Unless the .Fl H , .Fl L , @@ -140,6 +173,14 @@ command's actions are determined by the last one specified. .Pp You can use "ls -lo" to see the flags of existing files. +.Pp +Note that the ability to change certain flags is dependent +on the current kernel +.Em securelevel +setting. +See +.Xr security 7 +for more information on this setting. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO @@ -147,6 +188,7 @@ .Xr chflags 2 , .Xr stat 2 , .Xr fts 3 , +.Xr security 7 , .Xr symlink 7 .Sh HISTORY The ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/NEWS#9 (text+ko) ==== @@ -1,3 +1,29 @@ +1.12 + A couple of man page fixes from various submitters. + + Make default communities NULL for security. + + Fix a core dump when -d tracing suboption has no argument (thanks + to Shteryana Shopova). + + Fix bug in parsing the include path in the daemon. + + Fix an uninitialize structure field in gensnmptree (thanks to + jasone@freebsdorg) + + 64bit HC counters in the IF-MIB by polling the OS periodically. + + Fix link traps to be more RFC conform (thanks to glebius@freebsd.org) + + Add fallback definition for SA_SIZE() to support.h. + + Move the porting definitions for U?INT32_{MIN,MAX} into support.h. + + Include a sys/tree.h from FreeBSD-current and add autoconf + check for it. + +1.11a Fix build of modules when stdint.h is included after asn1.h + 1.11 Make the Mib2 routing table use red-black tree. This vastly reduces loading and access time. Load the table only every 10 minutes. In the meantime process message from the routing socket ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/TODO#3 (text+ko) ==== @@ -1,6 +1,3 @@ -snmpd_mibII: - - handle HC counters by periodically polling the kernel counters. - snmpd: - rethink transports a little bit: make them loadable and make a private subtree for transports: ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/VERSION#9 (text+ko) ==== @@ -1,1 +1,1 @@ -1.11 +1.12 ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.1#6 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.5 2005/06/15 11:31:25 brandt_h Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $ .\" -.Dd June 14, 2005 +.Dd February 27, 2006 .Dt GENSNMPTREE 1 .Os .Sh NAME @@ -45,7 +45,7 @@ utility is used to either generate C language tables and header files from a MIB description or to numeric OIDs from MIB descriptions. The first form is used only for maintaining the -.Xr snmpd 1 +.Xr bsnmpd 1 daemon or for module writers. The second form may be used by SNMP client program writers. .Pp @@ -57,7 +57,7 @@ C-file .Ar prefix Ns tree.c containing a table used by -.Xr snmpd 1 +.Xr bsnmpd 1 during PDU processing and a header file .Ar prefix Ns tree.h @@ -70,14 +70,19 @@ .Nm expects MIB variable names (only the last component) on its command line. It reads a MIB specification from standard input and for each MIB variable -name emits two C preprocessor defines on its standard output. -One define -.Va OID_ Ns Ar name -can be used as an array initialized to initialize a -.Va struct asn_oid . -The other define -.Va OIDLEN_ Ns Ar name -contains the length of the OID. +name emits three C preprocessor defines on its standard output: +.Bl -tag -width ".Va OIDLEN_ Ns Ar Name" +.It Va OIDX_ Ns Ar name +This define can be used to initialize a +.Va struct asn_oid +in the following way: +.Pp +.Dl const struct asn_oid oid_sysDescr = OIDX_sysDescr; +.It Va OIDLEN_ Ns Ar name +is the length of the OID. +.It Va OID_ Ns Ar name +is the last component of the OID. +.El .Pp The options are as follows: .Bl -tag -width ".Fl d Ar argument" @@ -88,7 +93,7 @@ .It Fl l Generate local preprocessor includes. This is used for bootstrapping -.Xr snmpd 1 . +.Xr bsnmpd 1 . .It Fl t Instead of normal output print the resulting tree. .It Fl p Ar prefix @@ -187,6 +192,6 @@ ) .Ed .Sh SEE ALSO -.Xr snmpd 1 +.Xr bsnmpd 1 .Sh AUTHORS .An Hartmut Brandt Aq harti@freebsd.org ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.43 2005/10/04 11:21:29 brandt_h Exp $ + * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.44 2006/02/14 09:04:17 brandt_h Exp $ * * Generate OID table from table description. * ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.c,v 1.29 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.31 2005/10/06 07:14:58 brandt_h Exp $ * * ASN.1 for SNMP. */ @@ -41,18 +41,10 @@ #include #endif #include + +#include "support.h" #include "asn1.h" -#if !defined(INT32_MIN) -#define INT32_MIN (-0x7fffffff-1) -#endif -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - static void asn_error_func(const struct asn_buf *, const char *, ...); void (*asn_error)(const struct asn_buf *, const char *, ...) = asn_error_func; ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.h,v 1.19 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.h,v 1.20 2005/10/05 16:43:11 brandt_h Exp $ * * ASN.1 for SNMP */ ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpclient.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/snmpclient.c,v 1.34 2005/10/04 14:32:42 brandt_h Exp $ + * $Begemot: bsnmp/lib/snmpclient.c,v 1.36 2005/10/06 07:14:58 brandt_h Exp $ * * Support functions for SNMP clients. */ @@ -64,14 +64,6 @@ #include "snmpclient.h" #include "snmppriv.h" -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - - /* global context */ struct snmp_client snmp_client; ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/support.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 + * Copyright (C) 2004-2005 * Hartmut Brandt. * All rights reserved. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/support.h,v 1.1 2004/08/06 08:47:59 brandt Exp $ + * $Begemot: bsnmp/lib/support.h,v 1.2 2005/10/06 07:14:59 brandt_h Exp $ * * Functions that are missing on certain systems. This header file is not * to be installed. @@ -68,4 +68,29 @@ #endif +/* + * For systems with missing stdint.h or inttypes.h + */ +#if !defined(INT32_MIN) +#define INT32_MIN (-0x7fffffff-1) +#endif +#if !defined(INT32_MAX) +#define INT32_MAX (0x7fffffff) +#endif +#if !defined(UINT32_MAX) +#define UINT32_MAX (0xffffffff) +#endif + +/* + * Systems missing SA_SIZE(). Taken from FreeBSD net/route.h:1.63 + */ +#ifndef SA_SIZE + +#define SA_SIZE(sa) \ + ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \ + sizeof(long) : \ + 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) ) + +#endif + #endif ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$Begemot: bsnmp/oid-list,v 1.3 2005/05/23 09:03:22 brandt_h Exp $ +$Begemot: bsnmp/oid-list,v 1.5 2006/02/27 09:55:45 brandt_h Exp $ This file documents the OID assignments under BSNMP's private OID. @@ -11,11 +11,12 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:30:45 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E5F616A420 for ; Wed, 8 Mar 2006 21:30:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5060F43DAF for ; Wed, 8 Mar 2006 21:30:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C9A4E46C4E for ; Wed, 8 Mar 2006 16:30:07 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id EA147932C2; Wed, 8 Mar 2006 21:30:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9287216A422; Wed, 8 Mar 2006 21:30: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 51DD016A427 for ; Wed, 8 Mar 2006 21:30:15 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD93443D6D for ; Wed, 8 Mar 2006 21:30:04 +0000 (GMT) (envelope-from millert@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 k28LU4k4042033 for ; Wed, 8 Mar 2006 21:30:04 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28LU3kn042025 for perforce@freebsd.org; Wed, 8 Mar 2006 21:30:03 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 21:30:03 GMT Message-Id: <200603082130.k28LU3kn042025@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92987 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 21:30:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=92987 Change 92987 by millert@millert_g5tower on 2006/03/08 21:29:56 Removed fixed bugs. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/ERRATA#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/ERRATA#4 (text+ko) ==== @@ -21,9 +21,6 @@ PowerBook G4, I see a kernel trap involving IOKit modules within 15 minutes. - 47: Setpmac-spawned processes hang on exit. The MLS policy does not - permit a lower-priority shell to wait(2) on the child process. - 52: The fdsec (filesystem) should have labels - The fdesc file system provides /dev/fd entries on darwin instead of implementing this within devfs. @@ -32,10 +29,6 @@ using extended attributes into a file system that is not using extended attributes, the system will eventually deadlock. - 89: SEDarwin policy rejecting access to /dev/null when it should - not. Is the general_file_write_access macro not being applied - to users? - 91: Users who create and attach new disk images cannot then access them. 93: After reboot, the first time a user logs in, after entering correct @@ -57,7 +50,7 @@ 109: Commands 'ls -Z' and 'ps -Z' fail when no mac config file present. If there is no MAC config file present (no /etc/mac.conf, and $MAC_CONFFILE not set), using the '-Z' flag on - the ls or ps command results in 'Bus error' + the ls or ps command results in 'Bus error'. Fixed in DSEP. 117: The mpo_check_port_relabel entry point does not hold the task label lock. Policies implmenting this entry point should @@ -89,8 +82,9 @@ label handle or text label can use the port label for access control. -239: The SLOT() macro may return NULL in the SEDarwin policy. This - causes a panic in sebsd_externalize_cred_label() when the port - that holds the label has already been destroyed. There appears - to be a missing lock or out of order operation since we should - not be trying to externalized a dead port. +XXX: Threads are not labeled, only tasks. We need to investigate + whether threads deserve their own labels. A task may create + a thread in any task it holds the kernel port for. This means + that the task that holds the control port for a thread may be + different from the task that actually contains the thread. + This may have security implicatons. From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:43:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D349B16A420 for ; Wed, 8 Mar 2006 21:43:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA5A643D55 for ; Wed, 8 Mar 2006 21:43:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 054DF46C4F for ; Wed, 8 Mar 2006 16:43:04 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CDDAC5571C; Wed, 8 Mar 2006 21:43:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BD72816A423; Wed, 8 Mar 2006 21:43: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 7C54E16A422 for ; Wed, 8 Mar 2006 21:43:24 +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 8B32243D5A for ; Wed, 8 Mar 2006 21:43:23 +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 k28LhNxV046706 for ; Wed, 8 Mar 2006 21:43:23 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 k28LhNa6046703 for perforce@freebsd.org; Wed, 8 Mar 2006 21:43:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:43:23 GMT Message-Id: <200603082143.k28LhNa6046703@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 92989 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 21:43:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92989 Change 92989 by rwatson@rwatson_peppercorn on 2006/03/08 21:43:17 Setting file flags via fcntl() doesn't allow changing the access mode flags tested by this #if 0'd block, since they are immediately cleared. As such, as don't actually need to check for permission here. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#62 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#62 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_compat.h" #include "opt_ddb.h" -#include "opt_mac.h" #include #include @@ -53,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -434,36 +432,6 @@ mtx_assert(&Giant, MA_OWNED); FILE_LOCK(fp); fhold_locked(fp); -#if 0 -#ifdef MAC - if (fp->f_type == DTYPE_VNODE) { - int fflag = (fp->f_flag & ~FCNTLFLAGS) | - (FFLAGS(uap->arg & ~O_ACCMODE) & FCNTLFLAGS); - mode_t mode = 0; - - if (fflag & FREAD) - mode |= VREAD; - if (fflag & FWRITE) - mode |= VWRITE; - if (fflag & O_APPEND) - mode |= VAPPEND; - vn_lock((struct vnode *)fp->f_data, LK_EXCLUSIVE | - LK_RETRY, td); - /* - * XXX: A seperate entry point should be used here - * to pass in both the old and the new flags, - * with authorization performed only on the delta. - */ - error = mac_check_vnode_open(td->td_ucred, - (struct vnode *)fp->f_data, mode); - VOP_UNLOCK((struct vnode *)fp->f_data, 0, td); - if (error) { - fdrop(fp, td); - break; - } - } -#endif /* MAC */ -#endif fp->f_flag &= ~FCNTLFLAGS; fp->f_flag |= FFLAGS(arg & ~O_ACCMODE) & FCNTLFLAGS; FILE_UNLOCK(fp); From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:47:33 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83F5F16A420 for ; Wed, 8 Mar 2006 21:47:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0345E43D49 for ; Wed, 8 Mar 2006 21:47:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 38B5E46C4E for ; Wed, 8 Mar 2006 16:47:11 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8141355417; Wed, 8 Mar 2006 21:47:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FF8F16A423; Wed, 8 Mar 2006 21:47:29 +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 48FFE16A420 for ; Wed, 8 Mar 2006 21:47:29 +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 EF1B843D4C for ; Wed, 8 Mar 2006 21:47:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k28LlSNB046896 for ; Wed, 8 Mar 2006 21:47:28 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 k28LlSZw046893 for perforce@freebsd.org; Wed, 8 Mar 2006 21:47:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:47:28 GMT Message-Id: <200603082147.k28LlSZw046893@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 92990 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 21:47:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=92990 Change 92990 by rwatson@rwatson_peppercorn on 2006/03/08 21:47:12 Comment on a comment. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#81 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#81 (text+ko) ==== @@ -916,6 +916,9 @@ #ifdef MAC mac_init_vnode(vp); /* + * XXXRW: This comment is probably false in the new devfs world + * order. + * * NULL mp indicates that this vnode is being used for the * mount device for the root file system. */ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 21:53:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D81A16A420 for ; Wed, 8 Mar 2006 21:53:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3795E43D72 for ; Wed, 8 Mar 2006 21:53:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 46B3B46C4D for ; Wed, 8 Mar 2006 16:53:09 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 28E185BABE; Wed, 8 Mar 2006 21:51:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 12F9416A424; Wed, 8 Mar 2006 21:51: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 C87F916A422 for ; Wed, 8 Mar 2006 21:51:42 +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 5AEAB43D7E for ; Wed, 8 Mar 2006 21:51: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 k28LpYd4047128 for ; Wed, 8 Mar 2006 21:51: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 k28LpY1b047125 for perforce@freebsd.org; Wed, 8 Mar 2006 21:51:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 Mar 2006 21:51:34 GMT Message-Id: <200603082151.k28LpY1b047125@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 92992 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 21:53:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=92992 Change 92992 by rwatson@rwatson_peppercorn on 2006/03/08 21:51:14 White space sync to CVS. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#99 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#99 (text+ko) ==== @@ -33,6 +33,7 @@ * * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.39 2005/10/31 15:41:28 rwatson Exp $ */ + /* * Developed by the TrustedBSD Project. * Low-watermark floating label mandatory integrity policy. From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 22:02:32 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2CF8016A422 for ; Wed, 8 Mar 2006 22:02:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FE7343D69 for ; Wed, 8 Mar 2006 22:02:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 75C1946C2B for ; Wed, 8 Mar 2006 17:02:03 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4A68D55A30; Wed, 8 Mar 2006 22:01:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 38D4B16A423; Wed, 8 Mar 2006 22:01: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 0C0B216A420 for ; Wed, 8 Mar 2006 22:01:48 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C60EE43D53 for ; Wed, 8 Mar 2006 22:01:47 +0000 (GMT) (envelope-from millert@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 k28M1laZ047513 for ; Wed, 8 Mar 2006 22:01:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28M1lSO047510 for perforce@freebsd.org; Wed, 8 Mar 2006 22:01:47 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 22:01:47 GMT Message-Id: <200603082201.k28M1lSO047510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92993 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 22:02:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=92993 Change 92993 by millert@millert_g5tower on 2006/03/08 22:01:27 Fix some style nits Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_base.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_base.c#7 (text+ko) ==== @@ -732,23 +732,23 @@ } int -mac_check_service_access (struct label *subj, struct label *obj, - const char *s, const char *p) +mac_check_service_access(struct label *subj, struct label *obj, + const char *s, const char *p) { - int error; + int error; - MAC_CHECK (check_service_access, subj, obj, s, p); - return (error); + MAC_CHECK(check_service_access, subj, obj, s, p); + return (error); } int mac_request_object_label(struct label *subj, struct label *obj, const char *s, struct label *out) { - int error; + int error; - MAC_CHECK (request_object_label, subj, obj, s, out); - return error; + MAC_CHECK (request_object_label, subj, obj, s, out); + return error; } int From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 22:04:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BC2E16A420 for ; Wed, 8 Mar 2006 22:04:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E705B43D45 for ; Wed, 8 Mar 2006 22:04:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1603946C40 for ; Wed, 8 Mar 2006 17:03:42 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 04CFA566D9; Wed, 8 Mar 2006 22:03:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E609C16A424; Wed, 8 Mar 2006 22:03: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 BBFED16A422 for ; Wed, 8 Mar 2006 22:03:51 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B09B443D45 for ; Wed, 8 Mar 2006 22:03:50 +0000 (GMT) (envelope-from millert@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 k28M3oCj047584 for ; Wed, 8 Mar 2006 22:03:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28M3oAa047581 for perforce@freebsd.org; Wed, 8 Mar 2006 22:03:50 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 22:03:50 GMT Message-Id: <200603082203.k28M3oAa047581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92994 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 22:04:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=92994 Change 92994 by millert@millert_g5tower on 2006/03/08 22:03:25 Cosmetic changes that improve readability (at least for me). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/BootX/bootx.tproj/sl.subproj/main.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/BootX/bootx.tproj/sl.subproj/main.c#3 (text+ko) ==== @@ -638,16 +638,14 @@ args->exdatalen = 0; char *prevname = "", propname[128]; - while (1) { - if (1 != NextProp (gOptionsPH, prevname, propname)) - break; + while (NextProp (gOptionsPH, prevname, propname) == 1) { prevname = propname; if (!strncmp (propname, "load_", 5)) { char pfilename[255]; - memset (pfilename, 0, 255); - size = GetProp(gOptionsPH, propname, pfilename, 255); + memset (pfilename, 0, sizeof(pfilename)); + size = GetProp(gOptionsPH, propname, pfilename, sizeof(pfilename)); - if (size > 0 && strlen(propname+4) < sizeof(int) * 4) { + if (size > 0 && strlen(propname+5) <= sizeof(int) * 4) { char datfile[512]; strcpy (datfile, gRootDir); strcat (datfile, pfilename); @@ -658,9 +656,9 @@ } else if (!strncmp (propname, "kenv_", 5)) { char pvar[255]; - size = GetProp(gOptionsPH, propname, pvar, 255); + size = GetProp(gOptionsPH, propname, pvar, sizeof(pvar)); - if (size > 0 && strlen(propname+4) < sizeof(int) * 4) + if (size > 0 && strlen(propname+5) <= sizeof(int) * 4) AddKernData (args, propname + 5, size, pvar); } } From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 22:05:01 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 44C9116A420 for ; Wed, 8 Mar 2006 22:05:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2D4E43D45 for ; Wed, 8 Mar 2006 22:05:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F02CE46BBA for ; Wed, 8 Mar 2006 17:04:38 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 370EE555B9; Wed, 8 Mar 2006 22:04:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 26B2816A423; Wed, 8 Mar 2006 22:04:53 +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 C5FDD16A420 for ; Wed, 8 Mar 2006 22:04:52 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 776AC43D46 for ; Wed, 8 Mar 2006 22:04:52 +0000 (GMT) (envelope-from millert@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 k28M4q2x047625 for ; Wed, 8 Mar 2006 22:04:52 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28M4qr5047622 for perforce@freebsd.org; Wed, 8 Mar 2006 22:04:52 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 22:04:52 GMT Message-Id: <200603082204.k28M4qr5047622@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92995 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 22:05:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=92995 Change 92995 by millert@millert_g5tower on 2006/03/08 22:04:18 Add usage(), use err(3). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/mexec.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/mexec.c#3 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2006 SPARTA, Inc. * Copyright (c) 2004 Networks Associates Technology, Inc. * All rights reserved. * @@ -26,24 +27,35 @@ #include #include +#include +#include +#include #include +void +usage(void) +{ + extern char *__progname; + + fprintf(stderr, "usage: %s label command_path [command args]\n", + __progname); + exit(1); +} + int main(int argc, char *argv[]) { mac_t exl; - /* XXXRW: Shouldn't there be an (argc>=3) usage check here? */ - if (mac_prepare(&exl, "sebsd")) { - perror("mexec"); - return (1); - } - if (mac_from_text(&exl, argv[1])) { - perror(argv[1]); - return (1); - } - argv+=2; + if (argc < 3) + usage(); + + if (mac_prepare(&exl, "sebsd")) + err(1, "sebsd"); + if (mac_from_text(&exl, argv[1])) + err(1, argv[1]); + argv += 2; if (mac_execve(argv[0], argv, NULL, exl)) - perror("mexec"); - return (1); + perror(argv[0]); + exit(1); } From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 8 22:07:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62C8D16A422 for ; Wed, 8 Mar 2006 22:07:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BCD243D4C for ; Wed, 8 Mar 2006 22:06:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 134CB46C44 for ; Wed, 8 Mar 2006 17:06:34 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E61AC5796B; Wed, 8 Mar 2006 22:05:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D376616A424; Wed, 8 Mar 2006 22:05: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 AF1D416A420 for ; Wed, 8 Mar 2006 22:05:54 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3789743D45 for ; Wed, 8 Mar 2006 22:05:54 +0000 (GMT) (envelope-from millert@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 k28M5sbJ047805 for ; Wed, 8 Mar 2006 22:05:54 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28M5rrJ047802 for perforce@freebsd.org; Wed, 8 Mar 2006 22:05:53 GMT (envelope-from millert@freebsd.org) Date: Wed, 8 Mar 2006 22:05:53 GMT Message-Id: <200603082205.k28M5rrJ047802@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 92996 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2006 22:07:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=92996 Change 92996 by millert@millert_g5tower on 2006/03/08 22:05:25 Allow ipc between user_d and login_d to fix a problem when using tcsh as the login shell. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#8 (text+ko) ==== @@ -357,6 +357,7 @@ #logind rules allow_notify_ipc(login_d); allow_mach_ipc(lookupd_d,login_d); +allow_mach_ipc(user_d,login_d); # test rule to allow talking to unlabeled_t stuff allow_notify_ipc(unlabeled_t); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 00:44:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B15D516A420 for ; Thu, 9 Mar 2006 00:44:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0BA9D43D4C for ; Thu, 9 Mar 2006 00:44:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C10B846C41 for ; Wed, 8 Mar 2006 19:44:14 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4CB7956AC0; Thu, 9 Mar 2006 00:43:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2954F16A423; Thu, 9 Mar 2006 00:43: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 C6F9C16A420 for ; Thu, 9 Mar 2006 00:43: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 1B19543D49 for ; Thu, 9 Mar 2006 00:43: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 k290hG0g057612 for ; Thu, 9 Mar 2006 00:43: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 k290fnfV056558 for perforce@freebsd.org; Thu, 9 Mar 2006 00:41:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 00:41:49 GMT Message-Id: <200603090041.k290fnfV056558@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 93005 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 00:44:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=93005 Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 First pass attempt to update SEBSD through @92986 of the TrustedBSD MAC branch. Probably doesn't compile, and certainly doesn't run (yet). Affected files ... .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch .. //depot/projects/trustedbsd/sebsd/README#4 integrate .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 01:20:11 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0BF5216A422 for ; Thu, 9 Mar 2006 01:20:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 913A543D4C for ; Thu, 9 Mar 2006 01:20:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A578246BF4 for ; Wed, 8 Mar 2006 20:19:44 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C3DD95557B; Thu, 9 Mar 2006 01:20:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B1F3D16A423; Thu, 9 Mar 2006 01:20: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 4E45316A420 for ; Thu, 9 Mar 2006 01:20:04 +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 EEEA543D4C for ; Thu, 9 Mar 2006 01:20:03 +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 k291K3Kg095872 for ; Thu, 9 Mar 2006 01:20:03 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 k291K3bL095869 for perforce@freebsd.org; Thu, 9 Mar 2006 01:20:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 01:20:03 GMT Message-Id: <200603090120.k291K3bL095869@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 93007 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 01:20:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=93007 Change 93007 by rwatson@rwatson_peppercorn on 2006/03/09 01:19:06 For reasons unknown, possibly the file was deleted and re-added, ppp in the SEBSD branch unnecessarily diverged from its parent branch. Forceably integrate and resolve it back to the parent branch contents. Affected files ... .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ppp#3 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/etc/rc.d/ppp#3 (text+ko) ==== @@ -1,67 +1,48 @@ #!/bin/sh # -# $NetBSD: ppp,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ppp,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.11 2005/10/29 05:00:25 yar Exp $ # # PROVIDE: ppp -# REQUIRE: mountcritremote syslogd -# BEFORE: SERVERS -# -# Note that this means that syslogd will not be listening on -# any PPP addresses. This is considered a feature. -# +# REQUIRE: netif isdnd +# KEYWORD: nojail . /etc/rc.subr name="ppp" -start_cmd="ppp_start" -stop_cmd="ppp_stop" -sig_stop="-INT" -sig_hup="-HUP" -hup_cmd="ppp_hup" -extra_commands="hup" +rcvar=`set_rcvar` +command="/usr/sbin/${name}" +start_precmd="ppp_precmd" +start_postcmd="ppp_postcmd" -ppp_start() +ppp_precmd() { - # /etc/ppp/peers and $ppp_peers contain boot configuration - # information for pppd. each value in $ppp_peers that has a - # file in /etc/ppp/peers of the same name, will be run as - # `pppd call '. + # Establish ppp mode. # - if [ -n "$ppp_peers" ]; then - set -- $ppp_peers - echo -n "Starting pppd:" - while [ $# -ge 1 ]; do - peer=$1 - shift - if [ -f /etc/ppp/peers/$peer ]; then - pppd call $peer - echo -n " $peer" - fi - done - echo "." + if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \ + -a "${ppp_mode}" != "dedicated" \ + -a "${ppp_mode}" != "background" ]; then + ppp_mode="auto" fi -} + + rc_flags="$rc_flags -quiet -${ppp_mode}" + + # Switch on NAT mode? + # + case ${ppp_nat} in + [Yy][Ee][Ss]) + rc_flags="$rc_flags -nat" + ;; + esac -ppp_hup() -{ - pids="`check_process pppd`" - if [ -n "$pids" ]; then - for pid in $pids; do - kill $sig_hup $pid - done - fi + rc_flags="$rc_flags ${ppp_profile}" } -ppp_stop() +ppp_postcmd() { - pids="`check_process pppd`" - if [ -n "$pids" ]; then - for pid in $pids; do - kill $sig_stop $pid - done - fi + # Re-Sync ipfilter so it picks up any new network interfaces + # + /etc/rc.d/ipfilter resync } load_rc_config $name From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 01:29:46 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4557E16A420 for ; Thu, 9 Mar 2006 01:29:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47F1243D75 for ; Thu, 9 Mar 2006 01:29:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4F03646C0E for ; Wed, 8 Mar 2006 20:29:13 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 618A358FE6; Thu, 9 Mar 2006 01:29:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F3BB16A423; Thu, 9 Mar 2006 01:29: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 27D2D16A420 for ; Thu, 9 Mar 2006 01:29:16 +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 07DFD43D4C for ; Thu, 9 Mar 2006 01:29: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 k291TEj8002351 for ; Thu, 9 Mar 2006 01:29:14 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 k291TE8J002345 for perforce@freebsd.org; Thu, 9 Mar 2006 01:29:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 01:29:14 GMT Message-Id: <200603090129.k291TE8J002345@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 93008 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 01:29:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=93008 Change 93008 by rwatson@rwatson_peppercorn on 2006/03/09 01:29:01 Temporarily disable label handling in mount due to it not being quite ready for nmount(). Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#14 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#14 (text+ko) ==== @@ -458,7 +458,7 @@ int mountfs(const char *vfstype, const char *spec, const char *name, int flags, - const char *options, const char *mntopts) + const char *options, const char *mntopts, __unused const char *ltext) { char *argv[100]; struct statfs sf; @@ -500,11 +500,16 @@ mangle(optbuf, &argc, argv); argv[argc++] = strdup(spec); argv[argc++] = strdup(name); +#if 0 + /* + * XXXRW: Temporarily disabled due to nmount conversion. + */ if (ltext != NULL) { argv[argc++] = "-l"; argv[argc++] = ltext; } argv[argc] = NULL; +#endif if (debug) { (void)printf("exec: mount_%s", vfstype); @@ -519,7 +524,6 @@ } else { ret = mount_fs(vfstype, argc, argv); } -#endif free(optbuf); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 02:07:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C32CA16A422 for ; Thu, 9 Mar 2006 02:07:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50DA543D70 for ; Thu, 9 Mar 2006 02:07:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7F4D046C39 for ; Wed, 8 Mar 2006 21:07:05 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5270E56B46; Thu, 9 Mar 2006 02:05:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CE8816A423; Thu, 9 Mar 2006 02:05: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 A3C3B16A420; Thu, 9 Mar 2006 02:05:22 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from bastille.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D88343D49; Thu, 9 Mar 2006 02:05:17 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (bastille.local [127.0.0.1]) by bastille.optimhosts.com (Postfix) with ESMTP id AA7B68C8496; Thu, 9 Mar 2006 10:00:19 +0800 (PHT) Received: from bastille.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 56440-02; Thu, 9 Mar 2006 09:59:39 +0800 (PHT) Received: from [192.168.2.106] (unknown [210.213.197.144]) by bastille.optimhosts.com (Postfix) with ESMTP id 451428C84A8; Thu, 9 Mar 2006 09:59:36 +0800 (PHT) From: Dingo To: Robert Watson In-Reply-To: <200603090041.k290fnfV056558@repoman.freebsd.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> Content-Type: text/plain Date: Thu, 09 Mar 2006 10:04:30 +0000 Message-Id: <1141898670.34657.10.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 02:07:43 -0000 Well this would bring us to a more current snapshot off of FreeBSD, Ill get to work on both Trees, though I need to "fix" the sebsd2 integration, I went with the email you sent, though John Baldwin replied to the integration and stated it should have been done from all the other TrustedBSD branches are branched from the 'trustedbsd' base branch in //depot/projects/trustedbsd/base/... For example, the audit3 branch's view is: View: //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... Wherease the sebsd2 branch's view is: View: //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... Though i see you have now synched the trustedbsd/base also so i need to change the view. and basically fix sebsd2. On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=93005 > > Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 > > First pass attempt to update SEBSD through @92986 of the TrustedBSD > MAC branch. Probably doesn't compile, and certainly doesn't run > (yet). > > Affected files ... > > .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate > .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch > .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch > .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate > .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate > .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate > .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch > .. //depot/projects/trustedbsd/sebsd/README#4 integrate > .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate > .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate > .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate > .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch > .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch > .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate > .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate > .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch > .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate > > >>> TRUNCATED FOR MAIL (1000 lines) <<< > _______________________________________________ > trustedbsd-cvs@FreeBSD.org mailing list > http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs > To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 02:25:46 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0195A16A420 for ; Thu, 9 Mar 2006 02:25:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79FE343D66 for ; Thu, 9 Mar 2006 02:25:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1D01846BD5 for ; Wed, 8 Mar 2006 21:25:14 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A8A8D55966; Thu, 9 Mar 2006 02:25:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 987C916A422; Thu, 9 Mar 2006 02:25: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 45FFC16A423 for ; Thu, 9 Mar 2006 02:25: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 9EBC643D48 for ; Thu, 9 Mar 2006 02:25: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 k292PO2d047659 for ; Thu, 9 Mar 2006 02:25: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 k292POSt047656 for perforce@freebsd.org; Thu, 9 Mar 2006 02:25:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 02:25:24 GMT Message-Id: <200603090225.k292POSt047656@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 93011 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 02:25:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=93011 Change 93011 by rwatson@rwatson_peppercorn on 2006/03/09 02:24:57 Move __mac_get_fs() to the bottom of the system call table so as not to conflict with other allocated system calls now merged from FreeBSD. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#18 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#19 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#18 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#19 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#19 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#19 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#18 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.210 2006/03/01 06:49:38 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -494,4 +494,5 @@ { SYF_MPSAFE | AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 462 = kmq_unlink */ { SYF_MPSAFE | AS(abort2_args), (sy_call_t *)abort2, AUE_NULL }, /* 463 = abort2 */ { SYF_MPSAFE | AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL }, /* 464 = thr_set_name */ + { SYF_MPSAFE | AS(__mac_get_fs_args), (sy_call_t *)__mac_get_fs, AUE_NULL }, /* 465 = __mac_get_fs */ }; ==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#19 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.194 2006/03/01 06:49:38 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -472,4 +472,5 @@ "kmq_unlink", /* 462 = kmq_unlink */ "abort2", /* 463 = abort2 */ "thr_set_name", /* 464 = thr_set_name */ + "__mac_get_fs", /* 465 = __mac_get_fs */ }; ==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#18 (text+ko) ==== @@ -798,8 +798,6 @@ long id, void *uaddr, void *uaddr2); } 455 AUE_NULL MSTD { int thr_new(struct thr_param *param, \ int param_size); } -456 AUE_NULL MSTD { int __mac_get_fs(const char *path_p, \ - struct mac *mac_p); } 456 AUE_NULL MSTD { int sigqueue(pid_t pid, int signum, void *value); } 457 AUE_NULL MNOSTD { int kmq_open(const char *path, int flags, \ mode_t mode, const struct mq_attr *attr); } @@ -819,5 +817,7 @@ 462 AUE_NULL MNOSTD { int kmq_unlink(const char *path); } 463 AUE_NULL MSTD { int abort2(const char *why, int nargs, void **args); } 464 AUE_NULL MSTD { int thr_set_name(long id, const char *name); } +465 AUE_NULL MSTD { int __mac_get_fs(const char *path_p, \ + struct mac *mac_p); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#19 (text+ko) ==== @@ -2,6 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -387,4 +388,5 @@ #define SYS_kmq_unlink 462 #define SYS_abort2 463 #define SYS_thr_set_name 464 -#define SYS_MAXSYSCALL 465 +#define SYS___mac_get_fs 465 +#define SYS_MAXSYSCALL 466 ==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#19 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.146 2006/03/01 06:49:38 davidxu Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp MIASM = \ syscall.o \ @@ -329,4 +329,5 @@ kmq_notify.o \ kmq_unlink.o \ abort2.o \ - thr_set_name.o + thr_set_name.o \ + __mac_get_fs.o ==== //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#19 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.191 2006/03/01 06:49:38 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.212 2006/03/01 06:29:34 davidxu Exp */ @@ -1443,6 +1443,10 @@ char id_l_[PADL_(long)]; long id; char id_r_[PADR_(long)]; char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; }; +struct __mac_get_fs_args { + char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)]; + char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1769,6 +1773,7 @@ int kmq_unlink(struct thread *, struct kmq_unlink_args *); int abort2(struct thread *, struct abort2_args *); int thr_set_name(struct thread *, struct thr_set_name_args *); +int __mac_get_fs(struct thread *, struct __mac_get_fs_args *); #ifdef COMPAT_43 From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 10:51:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7744116A420 for ; Thu, 9 Mar 2006 10:51:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF10C43D4C for ; Thu, 9 Mar 2006 10:51:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CCD7546C09 for ; Thu, 9 Mar 2006 05:51:20 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 954E65599F; Thu, 9 Mar 2006 10:51:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 84EBF16A423; Thu, 9 Mar 2006 10:51: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 4AF3816A420 for ; Thu, 9 Mar 2006 10:51:40 +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 F333843D4C for ; Thu, 9 Mar 2006 10:51:39 +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 k29ApdXC081761 for ; Thu, 9 Mar 2006 10:51:39 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 k29ApdMi081758 for perforce@freebsd.org; Thu, 9 Mar 2006 10:51:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 10:51:39 GMT Message-Id: <200603091051.k29ApdMi081758@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 93031 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 10:51:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=93031 Change 93031 by rwatson@rwatson_peppercorn on 2006/03/09 10:50:39 Devfs now relies on sx locks. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#38 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#38 (text+ko) ==== @@ -60,6 +60,7 @@ #include #include #include +#include #include From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 10:55:22 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83DF216A422 for ; Thu, 9 Mar 2006 10:55:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51ADA43D48 for ; Thu, 9 Mar 2006 10:55:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6B0C246BA4 for ; Thu, 9 Mar 2006 05:54:58 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 432BD56396; Thu, 9 Mar 2006 10:55:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 31C1F16A424; Thu, 9 Mar 2006 10:55: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 3695416A422 for ; Thu, 9 Mar 2006 10:55:17 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E06F43D48 for ; Thu, 9 Mar 2006 10:55:15 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 32F8B46C0A; Thu, 9 Mar 2006 05:54:53 -0500 (EST) Date: Thu, 9 Mar 2006 10:55:35 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Dingo In-Reply-To: <1141898670.34657.10.camel@localhost.localdomain> Message-ID: <20060309105315.M52152@fledge.watson.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 10:55:22 -0000 On Thu, 9 Mar 2006, Dingo wrote: 5B > Well this would bring us to a more current snapshot off of FreeBSD, Ill get > to work on both Trees, though I need to "fix" the sebsd2 integration, I went > with the email you sent, though John Baldwin replied to the integration and > stated it should have been done from Yes, sorry about that! John is right, really we should have parented sebsd2 from the base branch, as this makes diffing easier, and avoids having to deal with mac/sebsd branch interactions You may find the easiest thing to do is p4 delete / submit the current sebsd2 subtree, then update the branch and re-integrate. P4 should be able to reparent it via integration, but there is some trickiness to it and just deleting and reintegrating with the new view should avoid that. Right now with the SEBSD branch, my goal is basically to get it compiling and booting, not to get it working, so hands to work on it are still very welcome! Robert N M Watson > > all the other TrustedBSD branches are branched > from the 'trustedbsd' base branch > in //depot/projects/trustedbsd/base/... > For example, the audit3 branch's view is: > > View: > //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... > > Wherease the sebsd2 branch's view is: > > View: > //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... > > Though i see you have now synched the trustedbsd/base also so i need to > change the view. and basically fix sebsd2. > > On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: >> http://perforce.freebsd.org/chv.cgi?CH=93005 >> >> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 >> >> First pass attempt to update SEBSD through @92986 of the TrustedBSD >> MAC branch. Probably doesn't compile, and certainly doesn't run >> (yet). >> >> Affected files ... >> >> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate >> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch >> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch >> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate >> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate >> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate >> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch >> .. //depot/projects/trustedbsd/sebsd/README#4 integrate >> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate >> >>>>> TRUNCATED FOR MAIL (1000 lines) <<< >> _______________________________________________ >> trustedbsd-cvs@FreeBSD.org mailing list >> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs >> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" > > From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 11:10:16 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BDF816A428 for ; Thu, 9 Mar 2006 11:10:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D054743D4C for ; Thu, 9 Mar 2006 11:10:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8DCB746C04 for ; Thu, 9 Mar 2006 06:09:53 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8FF69559EF; Thu, 9 Mar 2006 11:10:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8026916A423; Thu, 9 Mar 2006 11:10: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 34A8116A420 for ; Thu, 9 Mar 2006 11:10:14 +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 C13D043D4C for ; Thu, 9 Mar 2006 11:10:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k29BADwE082455 for ; Thu, 9 Mar 2006 11:10:13 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 k29BAD3E082452 for perforce@freebsd.org; Thu, 9 Mar 2006 11:10:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 11:10:13 GMT Message-Id: <200603091110.k29BAD3E082452@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 93032 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 11:10:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=93032 Change 93032 by rwatson@rwatson_peppercorn on 2006/03/09 11:09:13 - Handle VMARKER in vnode access control switch by panicking: we should not see access control checks on marker vnodes. - Rename sysv_sem entry points to their new, more consistent naming scheme. - Remove sebsd_create_root_mount(), it was unused, and now isn't defined in the MPO API. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#39 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#39 (text+ko) ==== @@ -198,6 +198,8 @@ case VNON: case VBAD: return SECCLASS_FILE; + case VMARKER: + panic("vnode_type_to_security_class: VMARKER"); } return SECCLASS_FILE; @@ -582,7 +584,7 @@ } static void -sebsd_create_sysv_sema(struct ucred *cred, struct semid_kernel *semakptr, +sebsd_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel) { struct task_security_struct *tsec; @@ -874,13 +876,6 @@ } } -static void -sebsd_create_root_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) -{ - -} - static int sebsd_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *parent, struct label *parentlabel, @@ -2373,7 +2368,7 @@ .mpo_init_ifnet_label = sebsd_init_network_label, .mpo_init_sysv_msgmsg_label = sebsd_init_sysv_label, .mpo_init_sysv_msgqueue_label = sebsd_init_sysv_label, - .mpo_init_sysv_sema_label = sebsd_init_sysv_label, + .mpo_init_sysv_sem_label = sebsd_init_sysv_label, .mpo_init_sysv_shm_label = sebsd_init_sysv_label, .mpo_init_ipq_label = sebsd_init_network_label_waitcheck, .mpo_init_mbuf_label = sebsd_init_network_label_waitcheck, @@ -2393,7 +2388,7 @@ .mpo_destroy_ifnet_label = sebsd_destroy_label, .mpo_destroy_sysv_msgmsg_label = sebsd_destroy_label, .mpo_destroy_sysv_msgqueue_label = sebsd_destroy_label, - .mpo_destroy_sysv_sema_label = sebsd_destroy_label, + .mpo_destroy_sysv_sem_label = sebsd_destroy_label, .mpo_destroy_sysv_shm_label = sebsd_destroy_label, .mpo_destroy_ipq_label = sebsd_destroy_label, .mpo_destroy_mbuf_label = sebsd_destroy_label, @@ -2453,7 +2448,7 @@ .mpo_create_file = sebsd_create_file, .mpo_create_sysv_msgmsg = sebsd_create_sysv_msgmsg, .mpo_create_sysv_msgqueue = sebsd_create_sysv_msgqueue, - .mpo_create_sysv_sema = sebsd_create_sysv_sema, + .mpo_create_sysv_sem = sebsd_create_sysv_sem, .mpo_create_sysv_shm = sebsd_create_sysv_shm, /* .mpo_create_mbuf_from_socket = sebsd_create_mbuf_from_socket, */ .mpo_create_mount = sebsd_create_mount, @@ -2461,7 +2456,6 @@ .mpo_create_posix_sem = sebsd_create_posix_sem, .mpo_create_proc0 = sebsd_create_proc0, .mpo_create_proc1 = sebsd_create_proc1, - .mpo_create_root_mount = sebsd_create_root_mount, /* .mpo_create_socket = sebsd_create_socket, */ /* .mpo_create_socket_from_socket = sebsd_create_socket_from_socket, */ .mpo_create_vnode_extattr = sebsd_create_vnode_extattr, @@ -2572,7 +2566,7 @@ /*.mpo_set_socket_peer_from_socket = sebsd_set_socket_peer_from_socket,*/ .mpo_cleanup_sysv_msgmsg = sebsd_cleanup_sysv_label, .mpo_cleanup_sysv_msgqueue = sebsd_cleanup_sysv_label, - .mpo_cleanup_sysv_sema = sebsd_cleanup_sysv_label, + .mpo_cleanup_sysv_sem = sebsd_cleanup_sysv_label, .mpo_cleanup_sysv_shm = sebsd_cleanup_sysv_label, .mpo_syscall = sebsd_syscall, }; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 12:48:09 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE43816A424 for ; Thu, 9 Mar 2006 12:48:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5830843D66 for ; Thu, 9 Mar 2006 12:47:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 19DEC46BBA for ; Thu, 9 Mar 2006 07:47:26 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B5B0E55835; Thu, 9 Mar 2006 12:47:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D7CF816A446; Thu, 9 Mar 2006 12:46: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 3B55D16A425; Thu, 9 Mar 2006 12:46:58 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from bastille.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2503143D5A; Thu, 9 Mar 2006 12:46:55 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (bastille.local [127.0.0.1]) by bastille.optimhosts.com (Postfix) with ESMTP id 3D7658C8490; Thu, 9 Mar 2006 20:42:03 +0800 (PHT) Received: from bastille.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 60185-07; Thu, 9 Mar 2006 20:41:21 +0800 (PHT) Received: from [192.168.2.106] (unknown [210.213.197.144]) by bastille.optimhosts.com (Postfix) with ESMTP id 9E71A8C847D; Thu, 9 Mar 2006 20:08:45 +0800 (PHT) From: Dingo To: Robert Watson In-Reply-To: <20060309105315.M52152@fledge.watson.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> Content-Type: text/plain Date: Thu, 09 Mar 2006 20:13:35 +0000 Message-Id: <1141935215.797.2.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 12:48:09 -0000 Ok well im doing a sebsd build now to see how far off it is ... ill let you know my findings when the build completes, ill get some testing on it, and ill also fix up the sebsd2 branch, though now that you synched sebsd the audit pieces are kinda there, ill double check them. what you did today may negate the need for an sebsd2 branch, but ill test it all out. On Thu, 2006-03-09 at 10:55 +0000, Robert Watson wrote: > On Thu, 9 Mar 2006, Dingo wrote: 5B > > > Well this would bring us to a more current snapshot off of FreeBSD, Ill get > > to work on both Trees, though I need to "fix" the sebsd2 integration, I went > > with the email you sent, though John Baldwin replied to the integration and > > stated it should have been done from > > Yes, sorry about that! John is right, really we should have parented sebsd2 > from the base branch, as this makes diffing easier, and avoids having to deal > with mac/sebsd branch interactions > > You may find the easiest thing to do is p4 delete / submit the current sebsd2 > subtree, then update the branch and re-integrate. P4 should be able to > reparent it via integration, but there is some trickiness to it and just > deleting and reintegrating with the new view should avoid that. Right now > with the SEBSD branch, my goal is basically to get it compiling and booting, > not to get it working, so hands to work on it are still very welcome! > > Robert N M Watson > > > > > all the other TrustedBSD branches are branched > > from the 'trustedbsd' base branch > > in //depot/projects/trustedbsd/base/... > > For example, the audit3 branch's view is: > > > > View: > > //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... > > > > Wherease the sebsd2 branch's view is: > > > > View: > > //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... > > > > Though i see you have now synched the trustedbsd/base also so i need to > > change the view. and basically fix sebsd2. > > > > On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=93005 > >> > >> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 > >> > >> First pass attempt to update SEBSD through @92986 of the TrustedBSD > >> MAC branch. Probably doesn't compile, and certainly doesn't run > >> (yet). > >> > >> Affected files ... > >> > >> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch > >> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch > >> .. //depot/projects/trustedbsd/sebsd/README#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate > >> > >>>>> TRUNCATED FOR MAIL (1000 lines) <<< > >> _______________________________________________ > >> trustedbsd-cvs@FreeBSD.org mailing list > >> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs > >> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" > > > > From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 12:55:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49B1616A422 for ; Thu, 9 Mar 2006 12:55:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F41A543D48 for ; Thu, 9 Mar 2006 12:55:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 462A046BA4 for ; Thu, 9 Mar 2006 07:55:26 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5701B55E1D; Thu, 9 Mar 2006 12:55:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 428F416A424; Thu, 9 Mar 2006 12:55: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 E724D16A420; Thu, 9 Mar 2006 12:55:44 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from bastille.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBF5C43D45; Thu, 9 Mar 2006 12:55:42 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (bastille.local [127.0.0.1]) by bastille.optimhosts.com (Postfix) with ESMTP id 6976D8C8490; Thu, 9 Mar 2006 20:50:51 +0800 (PHT) Received: from bastille.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 60185-09; Thu, 9 Mar 2006 20:50:09 +0800 (PHT) Received: from [192.168.2.106] (unknown [210.213.197.144]) by bastille.optimhosts.com (Postfix) with ESMTP id 1EF8B8C847D; Thu, 9 Mar 2006 20:50:07 +0800 (PHT) From: Dingo To: Robert Watson In-Reply-To: <20060309105315.M52152@fledge.watson.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> Content-Type: text/plain Date: Thu, 09 Mar 2006 20:54:53 +0000 Message-Id: <1141937697.797.7.camel@pavilion.optimlabs.com> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 12:55:54 -0000 Well seems build world works fine, doing a kernel now, then ill do some testing to see how functional it all is, also note this build was done on amd64. I set a DESTDIR for /private/build and it builds and installs fine, ill move the code to a crash test box and see what its like on booting and useability. but for compiling, well at least it builds. On Thu, 2006-03-09 at 10:55 +0000, Robert Watson wrote: > On Thu, 9 Mar 2006, Dingo wrote: 5B > > > Well this would bring us to a more current snapshot off of FreeBSD, Ill get > > to work on both Trees, though I need to "fix" the sebsd2 integration, I went > > with the email you sent, though John Baldwin replied to the integration and > > stated it should have been done from > > Yes, sorry about that! John is right, really we should have parented sebsd2 > from the base branch, as this makes diffing easier, and avoids having to deal > with mac/sebsd branch interactions > > You may find the easiest thing to do is p4 delete / submit the current sebsd2 > subtree, then update the branch and re-integrate. P4 should be able to > reparent it via integration, but there is some trickiness to it and just > deleting and reintegrating with the new view should avoid that. Right now > with the SEBSD branch, my goal is basically to get it compiling and booting, > not to get it working, so hands to work on it are still very welcome! > > Robert N M Watson > > > > > all the other TrustedBSD branches are branched > > from the 'trustedbsd' base branch > > in //depot/projects/trustedbsd/base/... > > For example, the audit3 branch's view is: > > > > View: > > //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... > > > > Wherease the sebsd2 branch's view is: > > > > View: > > //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... > > > > Though i see you have now synched the trustedbsd/base also so i need to > > change the view. and basically fix sebsd2. > > > > On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=93005 > >> > >> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 > >> > >> First pass attempt to update SEBSD through @92986 of the TrustedBSD > >> MAC branch. Probably doesn't compile, and certainly doesn't run > >> (yet). > >> > >> Affected files ... > >> > >> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch > >> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch > >> .. //depot/projects/trustedbsd/sebsd/README#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate > >> > >>>>> TRUNCATED FOR MAIL (1000 lines) <<< > >> _______________________________________________ > >> trustedbsd-cvs@FreeBSD.org mailing list > >> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs > >> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" > > > > From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 13:21:13 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C2EEF16A420 for ; Thu, 9 Mar 2006 13:21:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CD9043D48 for ; Thu, 9 Mar 2006 13:21:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id AF04046C18 for ; Thu, 9 Mar 2006 08:20:47 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BAB6355AB3; Thu, 9 Mar 2006 13:21:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AA08A16A423; Thu, 9 Mar 2006 13:21: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 478AA16A420; Thu, 9 Mar 2006 13:21:07 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from bastille.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id D90E643D46; Thu, 9 Mar 2006 13:21:04 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (bastille.local [127.0.0.1]) by bastille.optimhosts.com (Postfix) with ESMTP id 425B28C84AA; Thu, 9 Mar 2006 21:16:13 +0800 (PHT) Received: from bastille.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 60572-08; Thu, 9 Mar 2006 21:15:29 +0800 (PHT) Received: from [192.168.2.106] (unknown [210.213.197.144]) by bastille.optimhosts.com (Postfix) with ESMTP id BFA958C847D; Thu, 9 Mar 2006 21:15:27 +0800 (PHT) From: Dingo To: Robert Watson In-Reply-To: <1141937697.797.7.camel@pavilion.optimlabs.com> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> <1141937697.797.7.camel@pavilion.optimlabs.com> Content-Type: text/plain Date: Thu, 09 Mar 2006 21:20:17 +0000 Message-Id: <1141939218.797.11.camel@pavilion.optimlabs.com> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 13:21:14 -0000 on i386 MAC kernel builds fine, though on amd64 MAC kernel fails with -------------------------------------------------------------- >>> stage 3.2: building everything -------------------------------------------------------------- cd /usr/obj/private/work/sebsd/sys/MAC; MAKEOBJDIRPREFIX=/usr/obj MACHINE_ARCH=amd64 MACHINE=amd64 CPUTYPE= GROFF_BIN_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/bin GROFF_FONT_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/share/groff_font GROFF_TMAC_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/share/tmac _SHLIBDIRPREFIX=/usr/obj/private/work/sebsd/tmp INSTALL="sh /private/work/sebsd/tools/install.sh" PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/sbin:/usr/obj/private/work/sebsd/tmp/legacy/usr/bin:/usr/obj/private/work/sebsd/tmp/legacy/usr/games:/usr/obj/private/work/sebsd/tmp/usr/sbin:/usr/obj/private/work/sebsd/tmp/usr/bin:/usr/obj/private/work/sebsd/tmp/usr/games:/sbin:/bin:/usr/sbin:/usr/bin make KERNEL=kernel all -DNO_MODULES_OBJ cc -c -O2 -frename-registers -pipe -fno-strict-aliasing -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions -std=c99 -g -nostdinc -I- -I. -I/private/work/sebsd/sys -I/private/work/sebsd/sys/contrib/altq -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -Werror /private/work/sebsd/sys/amd64/amd64/machdep.c /private/work/sebsd/sys/amd64/amd64/machdep.c: In function `set_dbregs': /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: warning: implicit declaration of function `cap_check' /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: warning: nested extern declaration of `cap_check' /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: `CAP_SYS_RAWIO' undeclared (first use in this function) /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: (Each undeclared identifier is reported only once /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: for each function it appears in.) On Thu, 2006-03-09 at 20:54 +0000, Dingo wrote: > Well seems build world works fine, doing a kernel now, then ill do some > testing to see how functional it all is, also note this build was done > on amd64. I set a DESTDIR for /private/build and it builds and installs > fine, ill move the code to a crash test box and see what its like on > booting and useability. but for compiling, well at least it builds. > > On Thu, 2006-03-09 at 10:55 +0000, Robert Watson wrote: > > On Thu, 9 Mar 2006, Dingo wrote: 5B > > > > > Well this would bring us to a more current snapshot off of FreeBSD, Ill get > > > to work on both Trees, though I need to "fix" the sebsd2 integration, I went > > > with the email you sent, though John Baldwin replied to the integration and > > > stated it should have been done from > > > > Yes, sorry about that! John is right, really we should have parented sebsd2 > > from the base branch, as this makes diffing easier, and avoids having to deal > > with mac/sebsd branch interactions > > > > You may find the easiest thing to do is p4 delete / submit the current sebsd2 > > subtree, then update the branch and re-integrate. P4 should be able to > > reparent it via integration, but there is some trickiness to it and just > > deleting and reintegrating with the new view should avoid that. Right now > > with the SEBSD branch, my goal is basically to get it compiling and booting, > > not to get it working, so hands to work on it are still very welcome! > > > > Robert N M Watson > > > > > > > > all the other TrustedBSD branches are branched > > > from the 'trustedbsd' base branch > > > in //depot/projects/trustedbsd/base/... > > > For example, the audit3 branch's view is: > > > > > > View: > > > //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... > > > > > > Wherease the sebsd2 branch's view is: > > > > > > View: > > > //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... > > > > > > Though i see you have now synched the trustedbsd/base also so i need to > > > change the view. and basically fix sebsd2. > > > > > > On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: > > >> http://perforce.freebsd.org/chv.cgi?CH=93005 > > >> > > >> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 > > >> > > >> First pass attempt to update SEBSD through @92986 of the TrustedBSD > > >> MAC branch. Probably doesn't compile, and certainly doesn't run > > >> (yet). > > >> > > >> Affected files ... > > >> > > >> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch > > >> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate > > >> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate > > >> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate > > >> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/README#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch > > >> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate > > >> > > >>>>> TRUNCATED FOR MAIL (1000 lines) <<< > > >> _______________________________________________ > > >> trustedbsd-cvs@FreeBSD.org mailing list > > >> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs > > >> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" > > > > > > > > _______________________________________________ > trustedbsd-cvs@FreeBSD.org mailing list > http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs > To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 13:36:23 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCA5116A420 for ; Thu, 9 Mar 2006 13:36:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C70C43D96 for ; Thu, 9 Mar 2006 13:35:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EBD9D46B16 for ; Thu, 9 Mar 2006 08:35:21 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C6E5A5C428; Thu, 9 Mar 2006 13:33:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B5D6E16A423; Thu, 9 Mar 2006 13:33: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 4DE6816A420 for ; Thu, 9 Mar 2006 13:33:11 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 024E743D48 for ; Thu, 9 Mar 2006 13:33:09 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id D3B1C46B1A; Thu, 9 Mar 2006 08:32:47 -0500 (EST) Date: Thu, 9 Mar 2006 13:33:30 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Dingo In-Reply-To: <1141937697.797.7.camel@pavilion.optimlabs.com> Message-ID: <20060309132840.P13591@fledge.watson.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> <1141937697.797.7.camel@pavilion.optimlabs.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 13:36:23 -0000 On Thu, 9 Mar 2006, Dingo wrote: > Well seems build world works fine, doing a kernel now, then ill do some > testing to see how functional it all is, also note this build was done on > amd64. I set a DESTDIR for /private/build and it builds and installs fine, > ill move the code to a crash test box and see what its like on booting and > useability. but for compiling, well at least it builds. I'm pretty sure it will crash, and as such, likely be quite unusable :-). However, bug fixes would be welcome. Robert N M Watson > > On Thu, 2006-03-09 at 10:55 +0000, Robert Watson wrote: >> On Thu, 9 Mar 2006, Dingo wrote: 5B >> >>> Well this would bring us to a more current snapshot off of FreeBSD, Ill get >>> to work on both Trees, though I need to "fix" the sebsd2 integration, I went >>> with the email you sent, though John Baldwin replied to the integration and >>> stated it should have been done from >> >> Yes, sorry about that! John is right, really we should have parented sebsd2 >> from the base branch, as this makes diffing easier, and avoids having to deal >> with mac/sebsd branch interactions >> >> You may find the easiest thing to do is p4 delete / submit the current sebsd2 >> subtree, then update the branch and re-integrate. P4 should be able to >> reparent it via integration, but there is some trickiness to it and just >> deleting and reintegrating with the new view should avoid that. Right now >> with the SEBSD branch, my goal is basically to get it compiling and booting, >> not to get it working, so hands to work on it are still very welcome! >> >> Robert N M Watson >> >>> >>> all the other TrustedBSD branches are branched >>> from the 'trustedbsd' base branch >>> in //depot/projects/trustedbsd/base/... >>> For example, the audit3 branch's view is: >>> >>> View: >>> //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... >>> >>> Wherease the sebsd2 branch's view is: >>> >>> View: >>> //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... >>> >>> Though i see you have now synched the trustedbsd/base also so i need to >>> change the view. and basically fix sebsd2. >>> >>> On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: >>>> http://perforce.freebsd.org/chv.cgi?CH=93005 >>>> >>>> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 >>>> >>>> First pass attempt to update SEBSD through @92986 of the TrustedBSD >>>> MAC branch. Probably doesn't compile, and certainly doesn't run >>>> (yet). >>>> >>>> Affected files ... >>>> >>>> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch >>>> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate >>>> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate >>>> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate >>>> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/README#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch >>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate >>>> >>>>>>> TRUNCATED FOR MAIL (1000 lines) <<< >>>> _______________________________________________ >>>> trustedbsd-cvs@FreeBSD.org mailing list >>>> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs >>>> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" >>> >>> > > From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 13:39:09 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECC9A16A420 for ; Thu, 9 Mar 2006 13:39:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 470C843D5D for ; Thu, 9 Mar 2006 13:38:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0E4CF46B1A for ; Thu, 9 Mar 2006 08:38:31 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B53FE56789; Thu, 9 Mar 2006 13:38:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A4D5B16A423; Thu, 9 Mar 2006 13:38: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 7E9CA16A420 for ; Thu, 9 Mar 2006 13:38:51 +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 C287143D62 for ; Thu, 9 Mar 2006 13:38:40 +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 k29DcdvB096951 for ; Thu, 9 Mar 2006 13:38:39 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 k29Dcdar096948 for perforce@freebsd.org; Thu, 9 Mar 2006 13:38:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 13:38:39 GMT Message-Id: <200603091338.k29Dcdar096948@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 93041 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 13:39:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=93041 Change 93041 by rwatson@rwatson_peppercorn on 2006/03/09 13:37:54 Include capability.h for definition of CAP_SYS_RAWIO. Submitted by: Dingo Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/machdep.c#13 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/machdep.c#13 (text+ko) ==== @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 13:39:47 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5700E16A420 for ; Thu, 9 Mar 2006 13:39:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8193743D73 for ; Thu, 9 Mar 2006 13:39:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C0F6146B16 for ; Thu, 9 Mar 2006 08:39:14 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 834E8570AC; Thu, 9 Mar 2006 13:39:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 72E9D16A423; Thu, 9 Mar 2006 13:39: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 3A8DF16A420 for ; Thu, 9 Mar 2006 13:39:35 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3850E43D60 for ; Thu, 9 Mar 2006 13:39:30 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 4F67F46B1E; Thu, 9 Mar 2006 08:39:08 -0500 (EST) Date: Thu, 9 Mar 2006 13:39:51 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Dingo In-Reply-To: <1141939218.797.11.camel@pavilion.optimlabs.com> Message-ID: <20060309133905.C13591@fledge.watson.org> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> <1141937697.797.7.camel@pavilion.optimlabs.com> <1141939218.797.11.camel@pavilion.optimlabs.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 13:39:47 -0000 On Thu, 9 Mar 2006, Dingo wrote: > on i386 MAC kernel builds fine, though on amd64 MAC kernel fails with I've not tested amd64 at all since it's not a hardware platform I have hardware for. I've submitted a change to add an include of capability.h to machdep.c, which will probably fix it. Feel free to submit fixes along that line, as I don't doubt there will be more amd64 nits. Robert N M Watson > > -------------------------------------------------------------- >>>> stage 3.2: building everything > -------------------------------------------------------------- > cd /usr/obj/private/work/sebsd/sys/MAC; MAKEOBJDIRPREFIX=/usr/obj > MACHINE_ARCH=amd64 MACHINE=amd64 CPUTYPE= > GROFF_BIN_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/bin > GROFF_FONT_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/share/groff_font GROFF_TMAC_PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/share/tmac _SHLIBDIRPREFIX=/usr/obj/private/work/sebsd/tmp INSTALL="sh /private/work/sebsd/tools/install.sh" PATH=/usr/obj/private/work/sebsd/tmp/legacy/usr/sbin:/usr/obj/private/work/sebsd/tmp/legacy/usr/bin:/usr/obj/private/work/sebsd/tmp/legacy/usr/games:/usr/obj/private/work/sebsd/tmp/usr/sbin:/usr/obj/private/work/sebsd/tmp/usr/bin:/usr/obj/private/work/sebsd/tmp/usr/games:/sbin:/bin:/usr/sbin:/usr/bin make KERNEL=kernel all -DNO_MODULES_OBJ > cc -c -O2 -frename-registers -pipe -fno-strict-aliasing -Wall > -Wredundant-decls -Wnested-externs -Wstrict-prototypes > -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual > -fformat-extensions -std=c99 -g -nostdinc -I- -I. > -I/private/work/sebsd/sys -I/private/work/sebsd/sys/contrib/altq > -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common > -finline-limit=8000 --param inline-unit-growth=100 --param > large-function-growth=1000 -fno-omit-frame-pointer -mcmodel=kernel > -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow > -msoft-float -fno-asynchronous-unwind-tables -ffreestanding > -Werror /private/work/sebsd/sys/amd64/amd64/machdep.c > /private/work/sebsd/sys/amd64/amd64/machdep.c: In function `set_dbregs': > /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: warning: implicit > declaration of function `cap_check' > /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: warning: nested > extern declaration of `cap_check' > /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: > `CAP_SYS_RAWIO' undeclared (first use in this function) > /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: (Each > undeclared identifier is reported only once > /private/work/sebsd/sys/amd64/amd64/machdep.c:1764: error: for each > function it appears in.) > > > On Thu, 2006-03-09 at 20:54 +0000, Dingo wrote: >> Well seems build world works fine, doing a kernel now, then ill do some >> testing to see how functional it all is, also note this build was done >> on amd64. I set a DESTDIR for /private/build and it builds and installs >> fine, ill move the code to a crash test box and see what its like on >> booting and useability. but for compiling, well at least it builds. >> >> On Thu, 2006-03-09 at 10:55 +0000, Robert Watson wrote: >>> On Thu, 9 Mar 2006, Dingo wrote: 5B >>> >>>> Well this would bring us to a more current snapshot off of FreeBSD, Ill get >>>> to work on both Trees, though I need to "fix" the sebsd2 integration, I went >>>> with the email you sent, though John Baldwin replied to the integration and >>>> stated it should have been done from >>> >>> Yes, sorry about that! John is right, really we should have parented sebsd2 >>> from the base branch, as this makes diffing easier, and avoids having to deal >>> with mac/sebsd branch interactions >>> >>> You may find the easiest thing to do is p4 delete / submit the current sebsd2 >>> subtree, then update the branch and re-integrate. P4 should be able to >>> reparent it via integration, but there is some trickiness to it and just >>> deleting and reintegrating with the new view should avoid that. Right now >>> with the SEBSD branch, my goal is basically to get it compiling and booting, >>> not to get it working, so hands to work on it are still very welcome! >>> >>> Robert N M Watson >>> >>>> >>>> all the other TrustedBSD branches are branched >>>> from the 'trustedbsd' base branch >>>> in //depot/projects/trustedbsd/base/... >>>> For example, the audit3 branch's view is: >>>> >>>> View: >>>> //depot/projects/trustedbsd/base/... //depot/projects/trustedbsd/audit3/... >>>> >>>> Wherease the sebsd2 branch's view is: >>>> >>>> View: >>>> //depot/vendor/freebsd/src/... //depot/projects/trustedbsd/sebsd2/... >>>> >>>> Though i see you have now synched the trustedbsd/base also so i need to >>>> change the view. and basically fix sebsd2. >>>> >>>> On Thu, 2006-03-09 at 00:41 +0000, Robert Watson wrote: >>>>> http://perforce.freebsd.org/chv.cgi?CH=93005 >>>>> >>>>> Change 93005 by rwatson@rwatson_peppercorn on 2006/03/09 00:40:26 >>>>> >>>>> First pass attempt to update SEBSD through @92986 of the TrustedBSD >>>>> MAC branch. Probably doesn't compile, and certainly doesn't run >>>>> (yet). >>>>> >>>>> Affected files ... >>>>> >>>>> .. //depot/projects/trustedbsd/sebsd/COPYRIGHT#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/LOCKS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/MACREADME#4 branch >>>>> .. //depot/projects/trustedbsd/sebsd/MAINTAINERS#8 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/Makefile#12 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#12 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/README#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/UPDATING#12 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/cp.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/extern.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#8 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/USD.doc/csh.2#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/config.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/config_p.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/bin/csh/iconv_stub.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/bin/date/date.1#8 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/dd/dd.1#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.1#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/kenv/kenv.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.1#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ln/ln.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/cmp.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/extern.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#10 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#10 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ls/util.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/mv/mv.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/ps/print.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.1#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#9 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/rmail/Makefile#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/rmdir/rmdir.1#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/setfacl/setfacl.1#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/Makefile#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/alias.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith.y#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/arith_lex.l#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/bltin/bltin.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/builtins.def#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/error.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/eval.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/exec.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/expand.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/histedit.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/jobs.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mail.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/main.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/memalloc.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/miscbltin.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkbuiltins#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mkinit.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/mksyntax.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/options.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/output.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/parser.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/sh.1#8 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/show.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/trap.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sh/var.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/bin/sleep/sleep.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amd/amd.8#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/amq.8#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/amq/pawd.1#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fixmount/fixmount.8#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/hlfsd/hlfsd.8#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/scripts/amd.conf.5#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/amd/wire-test/wire-test.8#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bc/bc/main.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/CHANGES#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FAQ.xml#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Xlist#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/README#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkconf.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/check/named-checkzone.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.1#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dig.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/dighost.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.1#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/host.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.1#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dig/nslookup.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/aclconf.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/client.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/control.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/client.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/log.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/lwresd.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/main.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.5#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.docbook#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.conf.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/named.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/query.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/server.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/unix/os.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/update.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/xfrout.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/named/zoneconf.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.8#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/bin/rndc/rndc.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/config.threads.in#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/configure.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/isc.color.gif#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/arm/validate.sh.in#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/misc/options#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/index#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3757.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc3901.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4025.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4033.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4034.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4035.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4074.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/doc/rfc/rfc4159.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/Makefile.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/config.h.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/configure.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/dst/support.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_after.h.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/port_before.h.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/check.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/bind9/getaddresses.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/adb.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/cache.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/forward.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/gen-unix.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/journal.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/key.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/message.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/name.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbt.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rbtdb.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/resolver.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tkey.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/tsig.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/validator.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/xfrin.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/dns/zone.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/print.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/inet_pton.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/lfsr.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/mem.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/quota.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/result.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/rwlock.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/timer.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/entropy.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/net.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/os.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/socket.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/isccfg/namedconf.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/Makefile.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/api#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/getipnode.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwconfig.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/print.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/lib/lwres/strtoul.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/make/rules.in#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bind9/version#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/binutils/opcodes/sparc-opc.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/NEWS#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/TODO#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/VERSION#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/asn1.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpagent.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmpclient.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/bsnmplib.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmp.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpagent.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/snmpclient.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/lib/support.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/oid-list#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/.gdbinit#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/config.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/export.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/main.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpd.config#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.3#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/snmpmod.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trans_udp.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/snmpd/trap.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/bzip2/bzip2.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/com_err/compile_et.1#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ABOUT-NLS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/AUTHORS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/COPYING.LIB#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/ChangeLog#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/FREEBSD-upgrade#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/INSTALL#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/NEWS#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/README#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/THANKS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/TODO#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/alloca.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyin.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copyout.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/copypass.c#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.1#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpio.texi#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/cpiohdr.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/defer.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dirname.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.1#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/doc/cpio.texi#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/dstring.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/error.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/extern.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filemode.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/filetypes.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/global.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/idcache.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/alloca_.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-ba.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-eexst.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fmtstream.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-fs-xinl.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-help.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-namefrob.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-parse.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pv.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-pvh.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp-xinl.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/argp.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/basename.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/dirname.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/error.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exit.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/exitfail.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/full-write.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt1.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/getopt_int.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/gettext.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/localedir.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/mempcpy.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rmt.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/rtapelib.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-read.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/safe-write.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/savedir.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strcase.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strchrnul.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/stripslash.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strndup.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/strnlen.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/system.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/unlocked-io.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc-die.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xalloc.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/lib/xmalloc.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/main.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/makepath.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rmt.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/rtapelib.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/safe-stat.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyin.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copyout.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/copypass.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpio.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/cpiohdr.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/defer.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/dstring.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/extern.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filemode.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/filetypes.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/global.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/idcache.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/main.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/makepath.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/safe-stat.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tar.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/tarhdr.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/userspec.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/src/util.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/stripslash.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/system.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.c#3 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tar.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/tarhdr.h#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/userspec.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/util.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/version.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xmalloc.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cpio/xstrdup.c#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/README#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/attrstack.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/detailer.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/diff.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_bsd.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr_posix.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fixups.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/fnmatch.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/keyword.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/mux.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/parse.y#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/pathcomp.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/queue.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/status.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/stream.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/threads.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/cvs/src/cvsbug.in#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/diff/diff.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ChangeLog#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/Makefile.in#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/attribs.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/builtins.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-common.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-decl.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-format.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-opts.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-parse.in#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-ppoutput.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-semantics.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-typeck.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/c.opt#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/calls.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfglayout.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cfgrtl.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/collect2.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/combine.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/common.opt#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.gcc#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config.in#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/alpha.md#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/qrnnd.asm#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/t-osf4#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-protos.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm.md#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-netbsd#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-rtems#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin-protos.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/darwin.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd-spec.h#8 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/freebsd.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/cygwin1.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/darwin.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/emmintrin.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/gthr-win32.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-modes.def#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386-protos.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/i386.md#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-rtems-i386#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/xmmintrin.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/ia64.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/t-hpux#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix41.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix43.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/aix52.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/altivec.md#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/beos.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/darwin.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/eabi.asm#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/freebsd.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux-unwind.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/linux64.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rs6000.md#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/rtems.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.h#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/spe.md#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/sysv4.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix43#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-aix52#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-linux64#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-newas#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/t-rtems#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/s390.md#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/tpf.h#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sparc.md#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/t-elf#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-libunwind-elf#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-darwin#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-slibgcc-sld#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/configure.ac#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp-demangle.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/ChangeLog#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/Make-lang.in#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/call.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/class.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cp-tree.h#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cvt.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/cxx-pretty-print.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/decl2.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/error.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/except.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/g++spec.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/init.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mangle.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/method.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/name-lookup.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/parser.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/pt.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/search.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/semantics.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/tree.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/typeck2.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppfiles.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cpplib.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cppmacro.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/crtstuff.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cse.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/cselib.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dbxout.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/defaults.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/extend.texi#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/include/gcc-common.texi#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/invoke.texi#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/md.texi#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/tm.texi#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/trouble.texi#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dojump.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/dwarf2out.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/emit-rtl.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/explow.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expmed.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/expr.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/ChangeLog#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/bld.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/malloc.c#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/news.texi#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/flow.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/fold-const.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcov-io.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcse.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ginclude/stddef.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/gthr-win32.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/hooks.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/ifcvt.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/jump.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-darwin.ver#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc-std.ver#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/libgcc2.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop-unroll.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/loop.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mkheaders.in#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/mklibgcc.in#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/objc/objc-act.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.def#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/params.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/postreload.c#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/predict.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/real.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reg-stack.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regclass.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regrename.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/regs.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/reload1.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/rtl.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/sibcall.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/simplify-rtx.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target-def.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/target.h#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/toplev.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree-inline.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/tree.h#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-compat.h#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-compat.c#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/unwind-dw2.c#6 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/varasm.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/gcc/version.c#7 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/COPYING#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.115#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.116#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.117#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/ChangeLog.118#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FDL#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/FREEBSD-upgrade#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/INSTALL.gen#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/LICENSE#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MANIFEST#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/MORE.STUFF#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.ccpg#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.comm#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.cpg#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.in#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.init#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/Makefile.sub#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/NEWS#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROBLEMS#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/PROJECTS#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.MinGW#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/README.WIN32#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/REVISION#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/TODO#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/aclocal.m4#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/configure.ac#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/README#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file1#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/file2#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/ChangeLog#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/Makefile.sub#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/README_SH#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/TODO#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.man#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer.sh#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/groffer/groffer2.sh#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/ChangeLog#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/groff_mm.man#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/m.tmac#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mm/mmroff.pl#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/BUGS#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/ChangeLog#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/Makefile.sub#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/NEWS#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/TODO#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/copyright#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.mom#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/README.txt#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/macros.mom#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typeset.mom#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/groff_mom.man#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/color.html#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docelement.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/docprocessing.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/goodies.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/inlines.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/intro.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/refer.html#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/reserved.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/toc.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/typesetting.html#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/momdoc/using.html#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/mom/om.tmac#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/ChangeLog#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/README#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/TODO#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/cover.ms#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/contrib/pic2graph/pic2graph.sh#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.in#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/Makefile.sub#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fdl.texi#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/fixinfo.sh#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-1#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-10#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-11#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-2#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-3#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-4#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-5#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-6#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-7#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-8#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff-9#4 delete >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.css#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/groff.texinfo#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/meref.me#3 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/pic.ms#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/texinfo.tex#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/doc/webpage.ms#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devdvi/generate/Makefile#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/DESC.proto#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/Makefile.sub#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devhtml/R.proto#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AB#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ABI#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AI#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/ALBR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AOR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/AR#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CLARENDON#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CORONET#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/CR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/GR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/LGR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/MARIGOLD#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/Makefile.sub#2 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/OR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/S#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/SYMBOL#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRB#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRBI#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRI#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TNRR#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/TR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCB#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCBI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UCR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UI#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/UR#4 integrate >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/WINGDINGS#1 branch >>>>> .. //depot/projects/trustedbsd/sebsd/contrib/groff/font/devlj4/generate/Makefile#2 integrate >>>>> >>>>>>>> TRUNCATED FOR MAIL (1000 lines) <<< >>>>> _______________________________________________ >>>>> trustedbsd-cvs@FreeBSD.org mailing list >>>>> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs >>>>> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" >>>> >>>> >> >> _______________________________________________ >> trustedbsd-cvs@FreeBSD.org mailing list >> http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs >> To unsubscribe, send any mail to "trustedbsd-cvs-unsubscribe@FreeBSD.org" > > From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 14:11:23 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ADF1616A438 for ; Thu, 9 Mar 2006 14:11:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EA2043D45 for ; Thu, 9 Mar 2006 14:11:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 70C4746C0B for ; Thu, 9 Mar 2006 09:11:00 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 14E185C947; Thu, 9 Mar 2006 14:11:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0340E16A423; Thu, 9 Mar 2006 14:11: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 CC14616A420 for ; Thu, 9 Mar 2006 14:11:20 +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 63DAC43D45 for ; Thu, 9 Mar 2006 14:11:20 +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 k29EBK6k098345 for ; Thu, 9 Mar 2006 14:11:20 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 k29EBKlU098342 for perforce@freebsd.org; Thu, 9 Mar 2006 14:11:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 14:11:20 GMT Message-Id: <200603091411.k29EBKlU098342@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 93043 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 14:11:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=93043 Change 93043 by rwatson@rwatson_peppercorn on 2006/03/09 14:11:06 Minor style tweaks. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.h#4 (text+ko) ==== @@ -43,21 +43,22 @@ #define SEBSD_MAC_EXTATTR_NAME "sebsd" #define SEBSD_MAC_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM -extern int avc_debug_always_allow; +extern int avc_debug_always_allow; #ifdef _KERNEL #ifndef _M_SEBSD_DEF MALLOC_DECLARE(M_SEBSD); -#define _M_SEBSD_DEF +#define _M_SEBSD_DEF #endif extern int sebsd_verbose; -extern int security_init(void); -extern int sebsd_syscall(struct thread *td, int call, void *args); -extern int thread_has_system(struct thread *td, access_vector_t perm); -extern int thread_has_security(struct thread *td, access_vector_t perm); +extern int security_init(void); +extern int sebsd_syscall(struct thread *td, int call, void *args); +extern int thread_has_system(struct thread *td, access_vector_t perm); +extern int thread_has_security(struct thread *td, access_vector_t perm); + #endif /* _KERNEL */ #endif /* _SYS_SECURITY_SEBSD_H */ From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 14:42:20 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 351D116A420 for ; Thu, 9 Mar 2006 14:42:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEC1943D5D for ; Thu, 9 Mar 2006 14:42:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C7B5A46B3E for ; Thu, 9 Mar 2006 09:41:53 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 09FAD57BB9; Thu, 9 Mar 2006 14:41:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EDF9816A423; Thu, 9 Mar 2006 14:41: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 AE2EB16A420 for ; Thu, 9 Mar 2006 14:41: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 5CC3D43D49 for ; Thu, 9 Mar 2006 14:41: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 k29EfwuY099461 for ; Thu, 9 Mar 2006 14:41: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 k29EfvTH099458 for perforce@freebsd.org; Thu, 9 Mar 2006 14:41:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 14:41:57 GMT Message-Id: <200603091441.k29EfvTH099458@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 93045 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 14:42:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=93045 Change 93045 by rwatson@rwatson_peppercorn on 2006/03/09 14:41:48 Copyright update. Convert sebsd_destroy() call to printf() into panic(), as SEBSD is unable to unload. A moderate amount of style(9)ism. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#40 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#40 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002, 2003 Networks Associates Technology, Inc. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by NAI Labs, the @@ -8,7 +8,7 @@ * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * CHATS research program. * - * This software was enhanced by SPARTA ISSO under SPAWAR contract + * This software was enhanced by SPARTA ISSO under SPAWAR contract * N66001-04-C-6019 ("SEFOS"). * * Redistribution and use in source and binary forms, with or without @@ -73,7 +73,7 @@ #include #include -int sebsd_verbose = 0; +int sebsd_verbose = 0; static int slot; #define SLOT(l) ((void *)LABEL_TO_SLOT((l), slot).l_ptr) @@ -94,7 +94,7 @@ sebsd_destroy(struct mac_policy_conf *mpc) { - printf("sebsd:: destroy\n"); + panic("sebsd_destroy"); } /* @@ -180,55 +180,57 @@ static __inline security_class_t vnode_type_to_security_class(enum vtype vt) { + switch (vt) { case VREG: - return SECCLASS_FILE; + return (SECCLASS_FILE); case VDIR: - return SECCLASS_DIR; + return (SECCLASS_DIR); case VBLK: - return SECCLASS_BLK_FILE; + return (SECCLASS_BLK_FILE); case VCHR: - return SECCLASS_CHR_FILE; + return (SECCLASS_CHR_FILE); case VLNK: - return SECCLASS_LNK_FILE; + return (SECCLASS_LNK_FILE); case VSOCK: - return SECCLASS_SOCK_FILE; + return (SECCLASS_SOCK_FILE); case VFIFO: - return SECCLASS_FIFO_FILE; + return (SECCLASS_FIFO_FILE); case VNON: case VBAD: - return SECCLASS_FILE; + return (SECCLASS_FILE); case VMARKER: panic("vnode_type_to_security_class: VMARKER"); } - return SECCLASS_FILE; + return (SECCLASS_FILE); } static __inline security_class_t dirent_type_to_security_class(__uint8_t type) { + switch (type) { case DT_REG: - return SECCLASS_FILE; + return (SECCLASS_FILE); case DT_DIR: - return SECCLASS_DIR; + return (SECCLASS_DIR); case DT_BLK: - return SECCLASS_BLK_FILE; + return (SECCLASS_BLK_FILE); case DT_CHR: - return SECCLASS_CHR_FILE; + return (SECCLASS_CHR_FILE); case DT_LNK: - return SECCLASS_LNK_FILE; + return (SECCLASS_LNK_FILE); case DT_SOCK: - return SECCLASS_SOCK_FILE; + return (SECCLASS_SOCK_FILE); case DT_FIFO: - return SECCLASS_FIFO_FILE; + return (SECCLASS_FIFO_FILE); case DT_UNKNOWN: case DT_WHT: - return SECCLASS_FILE; + return (SECCLASS_FILE); } - return SECCLASS_FILE; + return (SECCLASS_FILE); } static __inline access_vector_t @@ -246,7 +248,6 @@ av |= FILE__APPEND; else if (mask & VWRITE) av |= FILE__WRITE; - } else { if (mask & VEXEC) av |= DIR__SEARCH; @@ -256,7 +257,7 @@ av |= DIR__READ; } - return av; + return (av); } static int @@ -282,11 +283,11 @@ file->sclass = vnode_type_to_security_class(vp->v_type); if (file->sclass == 0) { printf("vnode_has_perm:: Giving up\n"); - return 1; /* TBD: debugging */ + return (1); /* TBD: debugging */ } } - return avc_has_perm_ref_audit(task->sid, file->sid, file->sclass, - perm, aeref ? aeref : &file->avcr, &ad); + return (avc_has_perm_ref_audit(task->sid, file->sid, file->sclass, + perm, aeref ? aeref : &file->avcr, &ad)); } static int @@ -302,7 +303,7 @@ * TBD: No audit information yet */ - return(avc_has_perm_ref(task->sid, file->sid, file->sclass, + return (avc_has_perm_ref(task->sid, file->sid, file->sclass, perm, &file->avcr)); } @@ -456,19 +457,18 @@ context_len = sizeof(context); /* TBD: bad fixed length */ error = vn_extattr_get(vp, IO_NODELOCKED, - SEBSD_MAC_EXTATTR_NAMESPACE, - SEBSD_MAC_EXTATTR_NAME, - &context_len, context, curthread); + SEBSD_MAC_EXTATTR_NAMESPACE, SEBSD_MAC_EXTATTR_NAME, + &context_len, context, curthread); if (error == ENOATTR || error == EOPNOTSUPP) { vsec->sid = SECINITSID_UNLABELED; /* Use the default label */ - /* +#if 0 struct vattr va; (void)VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); printf("sebsd_update_vnode_from_extattr: no label for " "inode=%ld, fsid=%d\n", va.va_fileid, va.va_fsid); - */ +#endif goto dosclass; } if (error) { @@ -489,22 +489,21 @@ if (error) { printf("sebsd_update_vnode_from_extattr: ERROR mapping " "context to sid: %.*s\n", context_len, context); - return (0); /* TBD bad, bad, bad */ + return (0); /* TBD bad, bad, bad */ } dosclass: /* TBD: */ vsec->sclass = vnode_type_to_security_class(vp->v_type); - if (vsec->sclass == 0) { + if (vsec->sclass == 0) printf("sebsd_update_vnode_from_extattr:: sclass is 0\n"); - } return (0); } static void sebsd_associate_vnode_singlelabel(struct mount *mp, struct label *fslabel, - struct vnode *vp, struct label *vlabel) + struct vnode *vp, struct label *vlabel) { struct mount_fs_security_struct *sbsec; struct vnode_security_struct *vsec; @@ -526,8 +525,6 @@ /* Default to using the attributes from the parent process */ task->osid = parent->osid; task->sid = parent->sid; - - return; } static void @@ -557,10 +554,11 @@ bzero(msgsec, sizeof(*msgsec)); msgsec->sclass = SECCLASS_MSG; - /* XXX should we return an error if security_transition_sid, - * Or, should we assign the msg object the thread sid? + /* + * XXX should we return an error if security_transition_sid, or, + * should we assign the msg object the thread sid? */ - if(security_transition_sid(tsec->sid, msqsec->sid, + if (security_transition_sid(tsec->sid, msqsec->sid, SECCLASS_MSG, &msgsec->sid) < 0) { printf("Warning: security_transition_sid failed on" "create_sysv_msgmsg\n"); @@ -623,7 +621,6 @@ ipcsec->sid = tsec->sid; ipcsec->sclass = SECCLASS_POSIX_SEM; - } static void @@ -661,10 +658,12 @@ if (cr != NULL) { struct task_security_struct *task = SLOT(cr->cr_label); - /* XXX: uses the type specified by genfs instead of the parent directory - like it should! */ - int error = security_transition_sid(task->sid, dirent->sid, dirent->sclass, - &newsid); + /* + * XXX: uses the type specified by genfs instead of the + * parent directory like it should! + */ + int error = security_transition_sid(task->sid, dirent->sid, + dirent->sclass, &newsid); if (error == 0) dirent->sid = newsid; } @@ -680,8 +679,8 @@ } static void -sebsd_create_devfs_directory(struct mount *mp, char *dirname, - int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label, +sebsd_create_devfs_directory(struct mount *mp, char *dirname, int dirnamelen, + struct devfs_dirent *devfs_dirent, struct label *label, const char *fullpath) { char *path; @@ -722,7 +721,6 @@ struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel, const char *fullpath) { - char *path; int rc; security_id_t newsid; @@ -760,8 +758,8 @@ } /* - * Use the allocating task SID to label pipes. On Linux, pipes reside - * in a pseudo filesystem. + * Use the allocating task SID to label pipes. On Linux, pipes reside in a + * pseudo filesystem. */ static void sebsd_create_pipe(struct ucred *cred, struct pipepair *pipe, @@ -785,7 +783,7 @@ task = SLOT(cred->cr_label); task->osid = task->sid = SECINITSID_KERNEL; printf("sebsd_create_proc0:: using SECINITSID_KERNEL = %d\n", - SECINITSID_KERNEL); + SECINITSID_KERNEL); } static void @@ -797,12 +795,13 @@ task->osid = SECINITSID_KERNEL; task->sid = SECINITSID_INIT; printf("sebsd_create_proc1:: using SICINITSID_INIT = %d\n", - SECINITSID_INIT); + SECINITSID_INIT); } static void sebsd_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel, struct label *mount_arg_label) + struct label *mntlabel, struct label *fslabel, + struct label *mount_arg_label) { struct mount_security_struct *sbsec, *mntsec; struct mount_fs_security_struct *sbfssec; @@ -823,14 +822,17 @@ } else { sbfssec->sid = sbsec->sid; /* TBD: debugging only */ - printf("sebsd_create_mount: security_fs_use(%s) behavior %d, sid %d\n", - mp->mnt_vfc->vfc_name, behavior, sbsec->sid); + printf("sebsd_create_mount: security_fs_use(%s) behavior " + "%d, sid %d\n", mp->mnt_vfc->vfc_name, behavior, + sbsec->sid); } switch (behavior) { case SECURITY_FS_USE_XATTR: - /* PSIDs only work for persistent file systems with - unique and persistent inode numbers. */ + /* + * PSIDs only work for persistent file systems with unique + * and persistent inode numbers. + */ sbsec->uses_psids = 1; /* @@ -840,27 +842,35 @@ break; case SECURITY_FS_USE_TRANS: - /* Transition SIDs are used for pseudo filesystems like - devpts and tmpfs where you want the SID to be derived - from the SID of the creating process and the SID of - the filesystem. */ + /* + * Transition SIDs are used for pseudo filesystems like + * devpts and tmpfs where you want the SID to be derived + * from the SID of the creating process and the SID of the + * filesystem. + */ sbsec->uses_trans = 1; break; case SECURITY_FS_USE_TASK: - /* Task SIDs are used for pseudo filesystems like pipefs - and sockfs where you want the objects to be labeled - with the SID of the creating process. */ + /* + * Task SIDs are used for pseudo filesystems like pipefs and + * sockfs where you want the objects to be labeled with the + * SID of the creating process. + */ sbsec->uses_task = 1; break; case SECURITY_FS_USE_GENFS: - /* genfs_contexts handles everything else, like devfs, - usbdevfs, driverfs, and portions of proc. */ + /* + * genfs_contexts handles everything else, like devfs, + * usbdevfs, driverfs, and portions of proc. + */ sbsec->uses_genfs = 1; break; case SECURITY_FS_USE_NONE: - /* No labeling support configured for this filesystem type. - Don't appear to require labeling for binfmt_misc, bdev, - or rootfs. */ + /* + * No labeling support configured for this filesystem type. + * Don't appear to require labeling for binfmt_misc, bdev, + * or rootfs. + */ break; default: printf("%s: security_fs_use(%s) returned unrecognized " @@ -919,14 +929,14 @@ } static int -sebsd_check_cap (struct ucred *cred, cap_value_t capv) +sebsd_check_cap(struct ucred *cred, cap_value_t capv) { - return cred_has_capability (cred, capv); + + return (cred_has_capability (cred, capv)); } /* - * SEBSD does not support the relabeling of processes without - * transitioning. + * SEBSD does not support the relabeling of processes without transitioning. */ static int sebsd_check_cred_relabel(struct ucred *cred, struct label *newlabel) @@ -936,8 +946,8 @@ nsec = SLOT(newlabel); tsec = SLOT(cred->cr_label); if (nsec != NULL && nsec->sid != tsec->sid) - return EPERM; - return 0; + return (EPERM); + return (0); } static int @@ -956,7 +966,7 @@ rc = vnode_has_perm (cred, vp, FILE__MOUNTON, NULL); if (rc) - return rc; + return (rc); if (mntlabel) { sbsec = SLOT(mntlabel); @@ -965,18 +975,17 @@ rc = avc_has_perm_ref_audit (task->sid, sid, SECCLASS_FILE, COMMON_FILE__RELABELTO, NULL, NULL); if (rc) - return rc; - } - else { + return (rc); + } else { rc = security_fs_use (vfc_name, &behavior, &sid); if (rc) - return rc; + return (rc); } rc = avc_has_perm_ref_audit (task->sid, sid, SECCLASS_FILESYSTEM, FILESYSTEM__MOUNT, NULL, NULL); - return rc; + return (rc); } static int @@ -988,11 +997,11 @@ } static int -sebsd_check_remount(struct ucred *cred, struct mount *mp, struct label *mntlabel, - struct label *mount_arg_label) +sebsd_check_remount(struct ucred *cred, struct mount *mp, + struct label *mntlabel, struct label *mount_arg_label) { - /* cannot change labels on filesystems */ + /* Cannot change labels on filesystems. */ if (mount_arg_label) { struct mount_security_struct *mla = SLOT(mntlabel); struct mount_security_struct *mlb = SLOT(mount_arg_label); @@ -1003,7 +1012,8 @@ } static int -sebsd_check_umount(struct ucred *cred, struct mount *mp, struct label *mntlabel) +sebsd_check_umount(struct ucred *cred, struct mount *mp, + struct label *mntlabel) { return (mount_has_perm(cred, mp, FILESYSTEM__UNMOUNT, NULL)); @@ -1063,7 +1073,7 @@ FILESYSTEM__ASSOCIATE, &ad); */ - return(rc); + return (rc); } static int @@ -1140,13 +1150,12 @@ * So just make the transition. */ ntask->osid = otask->sid; - if (execlabel == NULL) { + if (execlabel == NULL) (void)security_transition_sid(otask->sid, file->sid, - SECCLASS_PROCESS, &ntask->sid); - } else { + SECCLASS_PROCESS, &ntask->sid); + else ntask->sid = ((struct task_security_struct *) SLOT(execlabel))->sid; - } if (otask->sid != ntask->sid) { /* @@ -1155,8 +1164,6 @@ * permission check if the parent was waiting. */ } - - return; } static int @@ -1178,13 +1185,12 @@ * Should have already checked all the permissions, so just see if * the SIDS are going to match. */ - if (execlabel == NULL) { + if (execlabel == NULL) (void)security_transition_sid(task->sid, file->sid, - SECCLASS_PROCESS, &newsid); - } else { + SECCLASS_PROCESS, &newsid); + else newsid = ((struct task_security_struct *) SLOT(execlabel))->sid; - } return (newsid != task->sid); } @@ -1261,6 +1267,7 @@ source = SLOT(newlabel); dest = SLOT(pipelabel); + /* XXXRW: Should be KASSERT's? */ if (!source) { printf("sebsd_relabel_pipe:: source is NULL!\n"); return; @@ -1282,6 +1289,7 @@ source = SLOT(label); dest = SLOT(vnodelabel); + /* XXXRW: Should be KASSERT's? */ if (!source) { printf("sebsd_relabel_vnode:: source is NULL!\n"); return; @@ -1306,14 +1314,13 @@ newlabel = SLOT(intlabel); error = security_sid_to_context(newlabel->sid, &context, - &context_len); + &context_len); if (error) return (error); error = vn_extattr_set(vp, IO_NODELOCKED, - SEBSD_MAC_EXTATTR_NAMESPACE, - SEBSD_MAC_EXTATTR_NAME, - context_len, context, curthread); + SEBSD_MAC_EXTATTR_NAMESPACE, SEBSD_MAC_EXTATTR_NAME, + context_len, context, curthread); security_free_context(context); return (error); } @@ -1324,10 +1331,10 @@ { if (!acc_mode) - return 0; + return (0); - return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, acc_mode), - NULL)); + return (vnode_has_perm(cred, vp, + file_mask_to_av(vp->v_type, acc_mode), NULL)); } static int @@ -1346,7 +1353,7 @@ /* TBD: Incomplete, SELinux also check capability(CAP_SYS_CHROOT)) */ /* MAY_EXEC ~= DIR__SEARCH */ - return vnode_has_perm(cred, dvp, DIR__SEARCH, NULL); + return (vnode_has_perm(cred, dvp, DIR__SEARCH, NULL)); } static int @@ -1370,29 +1377,31 @@ ad.u.fs.vp = dvp; rc = avc_has_perm_ref_audit(task->sid, dir->sid, SECCLASS_DIR, - DIR__ADD_NAME | DIR__SEARCH, - &dir->avcr, &ad); + DIR__ADD_NAME | DIR__SEARCH, &dir->avcr, &ad); if (rc) - return rc; + return (rc); rc = security_transition_sid(task->sid, dir->sid, tclass, &newsid); if (rc) - return rc; + return (rc); rc = avc_has_perm_audit(task->sid, newsid, tclass, FILE__CREATE, &ad); if (rc) - return rc; + return (rc); if (dvp->v_mount) { - /* XXX: mpo_check_vnode_create should probably pass the mntlabel */ + /* + * XXX: mpo_check_vnode_create should probably pass the + * mntlabel. + */ sbsec = SLOT (dvp->v_mount->mnt_mntlabel); - rc = avc_has_perm_audit(newsid, sbsec->sid, SECCLASS_FILESYSTEM, - FILESYSTEM__ASSOCIATE, &ad); + rc = avc_has_perm_audit(newsid, sbsec->sid, + SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, &ad); if (rc) - return rc; + return (rc); } - return 0; + return (0); } static int @@ -1415,7 +1424,6 @@ rc = avc_has_perm_ref_audit(task->sid, dir->sid, SECCLASS_DIR, DIR__SEARCH | DIR__REMOVE_NAME, &dir->avcr, &ad); - if (rc) return (rc); @@ -1454,11 +1462,10 @@ rc = security_transition_sid(task->sid, file->sid, SECCLASS_PROCESS, &newsid); if (rc) - return EACCES; - } else { + return (EACCES); + } else newsid = ((struct task_security_struct *) SLOT(execlabel))->sid; - } AVC_AUDIT_DATA_INIT(&ad, FS); ad.u.fs.vp = vp; @@ -1466,23 +1473,18 @@ if (newsid == task->sid) { rc = avc_has_perm_audit(task->sid, file->sid, SECCLASS_FILE, FILE__EXECUTE_NO_TRANS, &ad); - if (rc) - return EACCES; - + return (EACCES); } else { /* Check permissions for the transition. */ rc = avc_has_perm_audit(task->sid, newsid, SECCLASS_PROCESS, PROCESS__TRANSITION, &ad); - if (rc) - return EACCES; - + return (EACCES); rc = avc_has_perm_audit(newsid, file->sid, SECCLASS_FILE, FILE__ENTRYPOINT, &ad); - if (rc) - return EACCES; + return (EACCES); /* * TBD: Check ptrace permission between the parent and @@ -1536,7 +1538,7 @@ rc = avc_has_perm_ref_audit(task->sid, dir->sid, SECCLASS_DIR, DIR__SEARCH | DIR__ADD_NAME, &dir->avcr, &ad); if (rc) - return rc; + return (rc); rc = avc_has_perm_ref_audit(task->sid, file->sid, file->sclass, FILE__LINK, &file->avcr, &ad); @@ -1559,10 +1561,10 @@ { if (!acc_mode) - return 0; + return (0); - return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, acc_mode), - NULL)); + return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, + acc_mode), NULL)); } static int @@ -1570,7 +1572,7 @@ struct vnode *vp, struct label *label) { - return vnode_has_perm(cred, vp, FILE__POLL, NULL); + return (vnode_has_perm(cred, vp, FILE__POLL, NULL)); } static int @@ -1578,7 +1580,7 @@ struct vnode *vp, struct label *label) { - return vnode_has_perm(cred, vp, FILE__READ, NULL); + return (vnode_has_perm(cred, vp, FILE__READ, NULL)); } static int @@ -1586,7 +1588,7 @@ struct label *dlabel) { - return vnode_has_perm(cred, dvp, DIR__READ, NULL); + return (vnode_has_perm(cred, dvp, DIR__READ, NULL)); } static int @@ -1594,7 +1596,7 @@ struct label *label) { - return vnode_has_perm(cred, vp, FILE__READ, NULL); + return (vnode_has_perm(cred, vp, FILE__READ, NULL)); } static int @@ -1617,29 +1619,31 @@ if (old->sclass == 0) { printf("vnode_relabel:: ERROR, sid=%d, sclass=0, v_type=%d\n", old->sid, vp->v_type); - return 0; /* TBD: debugging */ + return (0); /* TBD: debugging */ } rc = avc_has_perm_ref_audit(task->sid, old->sid, old->sclass, - FILE__RELABELFROM, &old->avcr, &ad); + FILE__RELABELFROM, &old->avcr, &ad); if (rc) return (rc); rc = avc_has_perm_audit(task->sid, new->sid, old->sclass, - FILE__RELABELTO, &ad); - + FILE__RELABELTO, &ad); if (rc) return (rc); if (vp->v_mount) { - /* XXX: mpo_check_vnode_relabel should probably pass the mntlabel */ + /* + * XXX: mpo_check_vnode_relabel should probably pass the + * mntlabel. + */ sbsec = SLOT (vp->v_mount->mnt_mntlabel); - rc = avc_has_perm_audit (new->sid, sbsec->sid, SECCLASS_FILESYSTEM, - FILESYSTEM__ASSOCIATE, &ad); + rc = avc_has_perm_audit (new->sid, sbsec->sid, + SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, &ad); if (rc) - return rc; + return (rc); } - return 0; + return (0); } static int @@ -1659,19 +1663,17 @@ AVC_AUDIT_DATA_INIT(&ad, FS); rc = avc_has_perm_ref_audit(task->sid, old_dir->sid, SECCLASS_DIR, - DIR__REMOVE_NAME | DIR__SEARCH, - &old_dir->avcr, &ad); + DIR__REMOVE_NAME | DIR__SEARCH, &old_dir->avcr, &ad); if (rc) return (rc); if (old_file->sclass == 0) { printf("vnode_rename_from:: ERROR, sid=%d, sclass=0, " - "v_type=%d\n", old_file->sid, vp->v_type); - return 0; /* TBD: debugging */ + "v_type=%d\n", old_file->sid, vp->v_type); + return (0); /* TBD: debugging */ } rc = avc_has_perm_ref_audit(task->sid, old_file->sid, - old_file->sclass, FILE__RENAME, - &old_file->avcr, &ad); + old_file->sclass, FILE__RENAME, &old_file->avcr, &ad); if (rc) return (rc); @@ -1699,8 +1701,7 @@ */ if (vp->v_type == VDIR && !samedir) { rc = avc_has_perm_ref(task->sid, old_file->sid, - old_file->sclass, DIR__REPARENT, - &old_file->avcr); + old_file->sclass, DIR__REPARENT, &old_file->avcr); if (rc) return (rc); } @@ -1714,7 +1715,7 @@ ad.u.fs.vp = vp; rc = avc_has_perm_ref(task->sid, new_dir->sid, SECCLASS_DIR, - av, &new_dir->avcr); + av, &new_dir->avcr); if (rc) return (rc); @@ -1723,17 +1724,14 @@ if (new_file->sclass == 0) { printf("vnode_relabel_to:: ERROR, sid=%d, sclass=0, " "v_type=%d\n", new_file->sid, vp->v_type); - return 0; /* TBD: debugging */ + return (0); /* TBD: debugging */ } - if (vp->v_type == VDIR) { + if (vp->v_type == VDIR) rc = avc_has_perm_ref(task->sid, new_file->sid, - new_file->sclass, - DIR__RMDIR, &new_file->avcr); - } else { + new_file->sclass, DIR__RMDIR, &new_file->avcr); + else rc = avc_has_perm_ref(task->sid, new_file->sid, - new_file->sclass, - FILE__UNLINK, &new_file->avcr); - } + new_file->sclass, FILE__UNLINK, &new_file->avcr); if (rc) return (rc); } @@ -1747,7 +1745,7 @@ { /* TBD: Not Implemented */ - return 0; + return (0); } static int @@ -1755,7 +1753,7 @@ struct label *label, acl_type_t type, struct acl *acl) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1763,7 +1761,7 @@ struct label *label, int attrnamespace, const char *name, struct uio *uio) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1771,7 +1769,7 @@ struct label *label, u_long flags) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1779,7 +1777,7 @@ struct label *label, mode_t mode) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1787,7 +1785,7 @@ struct label *label, uid_t uid, gid_t gid) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1795,7 +1793,7 @@ struct label *label, struct timespec atime, struct timespec mtime) { - return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__SETATTR, NULL)); } static int @@ -1803,7 +1801,7 @@ struct vnode *vp, struct label *vnodelabel) { - return vnode_has_perm(cred, vp, FILE__GETATTR, NULL); + return (vnode_has_perm(cred, vp, FILE__GETATTR, NULL)); } @@ -1823,7 +1821,7 @@ struct label *vnodelabel) { - return vnode_has_perm(cred, vp, FILE__SWAPON, NULL); + return (vnode_has_perm(cred, vp, FILE__SWAPON, NULL)); } static int @@ -1831,7 +1829,7 @@ struct label *vnodelabel) { - return vnode_has_perm(cred, vp, FILE__SWAPON, NULL); + return (vnode_has_perm(cred, vp, FILE__SWAPON, NULL)); } /* @@ -1842,7 +1840,7 @@ void *arg1, int arg2, struct sysctl_req *req) { - return (0); + return (0); } static int @@ -1850,11 +1848,11 @@ struct vnode *vp, struct label *label) { - return vnode_has_perm(cred, vp, FILE__WRITE, NULL); + return (vnode_has_perm(cred, vp, FILE__WRITE, NULL)); } /* - * Also registered for MAC_CHECK_VNODE_MPROTECT + * Also registered for MAC_CHECK_VNODE_MPROTECT. */ static int sebsd_check_vnode_mmap(struct ucred *cred, struct vnode *vp, @@ -2086,7 +2084,7 @@ * TBD: No audit information yet */ - return(avc_has_perm_ref(task->sid, ipcsec->sid, ipcsec->sclass, + return (avc_has_perm_ref(task->sid, ipcsec->sid, ipcsec->sclass, perm, &ipcsec->avcr)); } @@ -2095,7 +2093,7 @@ struct label *msglabel) { - return(ipc_has_perm(cred, msglabel, MSG__RECEIVE)); + return (ipc_has_perm(cred, msglabel, MSG__RECEIVE)); } static int @@ -2103,7 +2101,7 @@ struct label *msglabel) { - return(ipc_has_perm(cred, msglabel, MSG__DESTROY)); + return (ipc_has_perm(cred, msglabel, MSG__DESTROY)); } static int @@ -2111,7 +2109,7 @@ struct label *msqklabel) { - return(ipc_has_perm(cred, msqklabel, MSGQ__ASSOCIATE)); + return (ipc_has_perm(cred, msqklabel, MSGQ__ASSOCIATE)); } static int @@ -2120,7 +2118,7 @@ { /* Can this process write to the queue? */ - return(ipc_has_perm(cred, msqklabel, MSGQ__WRITE)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 15:56:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1CF516A420 for ; Thu, 9 Mar 2006 15:56:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2EFF43D79 for ; Thu, 9 Mar 2006 15:56:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B868246B4D for ; Thu, 9 Mar 2006 10:56:07 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BBBC357761; Thu, 9 Mar 2006 15:52:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AAAE116A423; Thu, 9 Mar 2006 15:52: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 694E616A422 for ; Thu, 9 Mar 2006 15:52:40 +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 9944343D58 for ; Thu, 9 Mar 2006 15:52:39 +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 k29FqdJK002589 for ; Thu, 9 Mar 2006 15:52:39 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 k29Fqdq5002586 for perforce@freebsd.org; Thu, 9 Mar 2006 15:52:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 15:52:39 GMT Message-Id: <200603091552.k29Fqdq5002586@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 93049 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 15:56:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=93049 Change 93049 by rwatson@rwatson_peppercorn on 2006/03/09 15:52:36 style(9). Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscalls.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_sysctl.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#8 (text+ko) ==== @@ -51,10 +51,9 @@ #include #include -struct lp_args -{ - void *data; - size_t len; +struct lp_args { + void *data; + size_t len; }; static int @@ -80,13 +79,17 @@ static int sebsd_get_bools(struct thread *td, struct sebsd_get_bools *gb) { - char *out = NULL; + char *out; + int err; + if (gb->out) out = malloc(gb->len, M_SEBSD, M_WAITOK); - int err = security_get_bool_string(&gb->len, out); - if (out && err == 0) + else + out = NULL; + err = security_get_bool_string(&gb->len, out); + if (out != NULL && err == 0) err = copyout(out, gb->out, gb->len); - if (out) + if (out != NULL) free(out, M_SEBSD); return (err); } @@ -94,13 +97,15 @@ int sebsd_syscall(struct thread *td, int call, void *args) { - int err = EINVAL; struct lp_args p; struct sebsd_get_bools gb; + int active, err, pending; + char str[128], *strp; - switch(call) { + err = EINVAL; + switch (call) { case SEBSDCALL_LOAD_POLICY: - if (copyin (args, &p, sizeof (struct lp_args))) + if (copyin(args, &p, sizeof (struct lp_args))) return (EFAULT); err = sys_load_policy (td, p.data, p.len); break; @@ -114,47 +119,39 @@ break; case SEBSDCALL_GET_BOOL: - { - char str[128]; - int active, pending; - err = copyinstr(args,str, 128, NULL); + err = copyinstr(args, str, 128, NULL); if (err) return (err); security_get_bool(str, &active, &pending); *td->td_retval = active | (pending << 1); return (0); - } case SEBSDCALL_SET_BOOL: - { - char *str; - err = thread_has_security(td, SECURITY__SETBOOL); if (err) return (err); if (copyin(args, &p, sizeof (struct lp_args))) return (EFAULT); - str = malloc(p.len, M_SEBSD, M_WAITOK); + strp = malloc(p.len, M_SEBSD, M_WAITOK); if (!str) return (ENOMEM); - if (copyin(p.data, str, p.len)) { + if (copyin(p.data, strp, p.len)) { free(str, M_SEBSD); return (EFAULT); } - str[p.len-1] = 0; - err = security_set_bool(str+1, str[0]-'0'); - free(str, M_SEBSD); + strp[p.len-1] = 0; + err = security_set_bool(str+1, strp[0]-'0'); + free(strp, M_SEBSD); break; - } case SEBSDCALL_COMMIT_BOOLS: err = thread_has_security(td, SECURITY__SETBOOL); if (err) return (err); - return security_commit_pending_bools(); + return (security_commit_pending_bools()); default: err = EINVAL; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscalls.h#7 (text+ko) ==== @@ -1,41 +1,39 @@ #ifndef _SEBSD_SYSCALLS_H_ -#define _SEBSD_SYSCALLS_H_ +#define _SEBSD_SYSCALLS_H_ #include /* * TBD: Should we really try to line up with SELinux? */ -#define SEBSDCALL_LOAD_POLICY 7 -#define SEBSDCALL_GET_BOOLS 8 -#define SEBSDCALL_GET_BOOL 9 -#define SEBSDCALL_SET_BOOL 10 -#define SEBSDCALL_COMMIT_BOOLS 11 +#define SEBSDCALL_LOAD_POLICY 7 +#define SEBSDCALL_GET_BOOLS 8 +#define SEBSDCALL_GET_BOOL 9 +#define SEBSDCALL_SET_BOOL 10 +#define SEBSDCALL_COMMIT_BOOLS 11 -#define SEBSDCALL_NUM 7 +#define SEBSDCALL_NUM 7 -/* Structure definitions for compute_av call */ +/* Structure definitions for compute_av call. */ struct security_query { - char *scontext; - char *tcontext; - security_class_t tclass; - access_vector_t requested; + char *scontext; + char *tcontext; + security_class_t tclass; + access_vector_t requested; }; struct security_response { - access_vector_t allowed; - access_vector_t decided; - access_vector_t auditallow; - access_vector_t auditdeny; - access_vector_t notify; - u32 seqno; + access_vector_t allowed; + access_vector_t decided; + access_vector_t auditallow; + access_vector_t auditdeny; + access_vector_t notify; + u32 seqno; }; struct sebsd_get_bools { - int len; - char *out; + int len; + char *out; }; - #endif /* _SEBSD_SYSCALLS_H_ */ - ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_sysctl.c#10 (text+ko) ==== @@ -8,7 +8,7 @@ * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * CHATS research program. * - * This software was enhanced by SPARTA ISSO under SPAWAR contract + * This software was enhanced by SPARTA ISSO under SPAWAR contract * N66001-04-C-6019 ("SEFOS"). * * Redistribution and use in source and binary forms, with or without @@ -82,10 +82,10 @@ for (i = 0; i < SIDTAB_SIZE; i++) { cur = sidtab.htable[i]; while (cur != NULL && count > 0) { - error = security_sid_to_context(cur->sid, &scontext, - &scontext_len); + error = security_sid_to_context(cur->sid, &scontext, + &scontext_len); len = snprintf(buffer, linesize, "%7d %s\n", - cur->sid, scontext); + cur->sid, scontext); security_free_context(scontext); error = SYSCTL_OUT(req, buffer, len); if (error) @@ -124,9 +124,9 @@ * Treat ability to set audit status as equivilent to * changing enforcement status. */ - error = thread_has_system (curthread, SECURITY__SETENFORCE); + error = thread_has_system(curthread, SECURITY__SETENFORCE); if (error) - return error; + return (error); selinux_auditing = auditing; } @@ -135,8 +135,8 @@ } /* - * Sysctl handler for security.mac.sebsd.enforcing - * Get and/or set whether the avc is in enforcement mode. + * Sysctl handler for security.mac.sebsd.enforcing. Get and/or set whether + * the avc is in enforcement mode. */ static int sysctl_sebsd_enforcing(SYSCTL_HANDLER_ARGS) @@ -154,7 +154,7 @@ if (error) return (error); - error = thread_has_system (curthread, SECURITY__SETENFORCE); + error = thread_has_system(curthread, SECURITY__SETENFORCE); if (error) return error; @@ -165,9 +165,8 @@ } /* - * Sysctl handler for security.mac.sebsd.user_sids - * Lists the SIDs currently available for transition to by a given - * "context\0username\0" + * Sysctl handler for security.mac.sebsd.user_sids. Lists the SIDs currently + * available for transition to by a given "context\0username\0". */ static int sysctl_user_sids(SYSCTL_HANDLER_ARGS) @@ -183,7 +182,7 @@ if (req->newlen > 512) /* arbitrary */ return (ENAMETOOLONG); context = sebsd_malloc(req->newlen, M_SEBSD, M_WAITOK); - error = SYSCTL_IN(req, context, req->newlen); + error = SYSCTL_IN(req, context, req->newlen); if (error) goto out; if (context[req->newlen - 1] != '\0') { @@ -242,7 +241,7 @@ if (req->newlen > 512) /* arbitrary */ return (ENAMETOOLONG); scontext = sebsd_malloc(req->newlen, M_SEBSD, M_WAITOK); - error = SYSCTL_IN(req, scontext, req->newlen); + error = SYSCTL_IN(req, scontext, req->newlen); if (error) goto out; if (scontext[req->newlen - (1 + sizeof(tclass))] != '\0') { @@ -278,8 +277,8 @@ } /* - * Sysctl handler for security.mac.sebsd.compute_av - * Compute access vectors given input "scontext\0tcontext\0",tclass,av + * Sysctl handler for security.mac.sebsd.compute_av. Compute access vectors + * given input "scontext\0tcontext\0", tclass, av. */ static int sysctl_compute_av(SYSCTL_HANDLER_ARGS) @@ -296,10 +295,11 @@ if (req->newlen > 512) /* arbitrary */ return (ENAMETOOLONG); scontext = sebsd_malloc(req->newlen, M_SEBSD, M_WAITOK); - error = SYSCTL_IN(req, scontext, req->newlen); + error = SYSCTL_IN(req, scontext, req->newlen); if (error) goto out; - if (scontext[req->newlen - (1 + sizeof(tclass) + sizeof(av))] != '\0') { + if (scontext[req->newlen - (1 + sizeof(tclass) + sizeof(av))] != + '\0') { error = EINVAL; goto out; } @@ -333,26 +333,27 @@ SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, sebsd, CTLFLAG_RW, 0, - "Security Enhanced BSD policy controls"); + "Security Enhanced BSD policy controls"); SYSCTL_INT(_security_mac_sebsd, OID_AUTO, verbose, CTLFLAG_RW, - &sebsd_verbose, 0, " SEBSD Verbose Debug Stuff"); + &sebsd_verbose, 0, " SEBSD Verbose Debug Stuff"); TUNABLE_INT("security.mac.sebsd.verbose", &sebsd_verbose); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, sids, CTLTYPE_STRING|CTLFLAG_RD, - NULL, 0, sysctl_list_sids, "A", "SEBSD SIDs"); + NULL, 0, sysctl_list_sids, "A", "SEBSD SIDs"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, user_sids, CTLTYPE_STRING | - CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_user_sids, "A", - "SEBSD transitionable user SIDs"); + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_user_sids, "A", + "SEBSD transitionable user SIDs"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, change_sid, CTLTYPE_STRING | - CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_change_sid, "A", - "SEBSD (tty) SID relabel to perform along with transition"); + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_change_sid, "A", + "SEBSD (tty) SID relabel to perform along with transition"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_av, CTLTYPE_STRING | - CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_av, "A", - "SEBSD access vector decision query"); -SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, auditing, CTLTYPE_INT | CTLFLAG_RW, - NULL, 0, sysctl_sebsd_auditing, "I", "SEBSD avc auditing"); + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_av, "A", + "SEBSD access vector decision query"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, auditing, CTLTYPE_INT | + CTLFLAG_RW, NULL, 0, sysctl_sebsd_auditing, "I", "SEBSD avc auditing"); TUNABLE_INT("security.mac.sebsd.auditing", &selinux_auditing); -SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, enforcing, CTLTYPE_INT | CTLFLAG_RW, - NULL, 0, sysctl_sebsd_enforcing, "I", "SEBSD avc enforcement"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, enforcing, CTLTYPE_INT | + CTLFLAG_RW, NULL, 0, sysctl_sebsd_enforcing, "I", + "SEBSD avc enforcement"); TUNABLE_INT("security.mac.sebsd.enforcing", &selinux_enforcing); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 16:57:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1354316A420 for ; Thu, 9 Mar 2006 16:57:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE40843D45 for ; Thu, 9 Mar 2006 16:57:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5AF2746BDB for ; Thu, 9 Mar 2006 11:57:00 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C927C55F6E; Thu, 9 Mar 2006 16:57:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B7BF616A423; Thu, 9 Mar 2006 16:57: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 70E1F16A420; Thu, 9 Mar 2006 16:57:20 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from bastille.optimhosts.com (bastille.optimhosts.com [203.177.161.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74FA443D58; Thu, 9 Mar 2006 16:57:19 +0000 (GMT) (envelope-from dingo@microbsd.net) Received: from localhost (bastille.local [127.0.0.1]) by bastille.optimhosts.com (Postfix) with ESMTP id E43468C84AC; Fri, 10 Mar 2006 00:52:28 +0800 (PHT) Received: from bastille.optimhosts.com ([127.0.0.1]) by localhost (bastille.optimhosts.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 66989-03; Fri, 10 Mar 2006 00:52:00 +0800 (PHT) Received: from [192.168.2.106] (unknown [210.213.197.144]) by bastille.optimhosts.com (Postfix) with ESMTP id DC3BC8C84A7; Fri, 10 Mar 2006 00:51:22 +0800 (PHT) From: Dingo To: Robert Watson In-Reply-To: <1141939218.797.11.camel@pavilion.optimlabs.com> References: <200603090041.k290fnfV056558@repoman.freebsd.org> <1141898670.34657.10.camel@localhost.localdomain> <20060309105315.M52152@fledge.watson.org> <1141937697.797.7.camel@pavilion.optimlabs.com> <1141939218.797.11.camel@pavilion.optimlabs.com> Content-Type: text/plain Date: Fri, 10 Mar 2006 00:56:12 +0000 Message-Id: <1141952172.797.21.camel@pavilion.optimlabs.com> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at bastille.optimhosts.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93005 for review - sebsd_create_mount X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 16:57:25 -0000 MAC kernel builds fine, but when booting i recieve sebsd_create_mount: security_fs_use(devfs) behavior 4, sid28 Fatal trap 12: page fault while in kernel mode ill dig into it in the morning as its 1AM here. On Thu, 2006-03-09 at 21:20 +0000, Dingo wrote: > on i386 MAC kernel builds fine, though on amd64 MAC kernel fails with From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 18:40:17 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B195E16A420 for ; Thu, 9 Mar 2006 18:40:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3553843D48 for ; Thu, 9 Mar 2006 18:40:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1ECEA46BEE for ; Thu, 9 Mar 2006 13:39:52 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C8DA555F53; Thu, 9 Mar 2006 18:40:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B72DD16A423; Thu, 9 Mar 2006 18:40:09 +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 901EC16A420 for ; Thu, 9 Mar 2006 18:40:09 +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 5AB9643D46 for ; Thu, 9 Mar 2006 18:40:09 +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 k29Ie9Bv017284 for ; Thu, 9 Mar 2006 18:40:09 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 k29Ie8QS017281 for perforce@freebsd.org; Thu, 9 Mar 2006 18:40:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 18:40:08 GMT Message-Id: <200603091840.k29Ie8QS017281@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 93060 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 18:40:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=93060 Change 93060 by rwatson@rwatson_peppercorn on 2006/03/09 18:39:50 SEBSD is not properly connected to the build tools section of the build, so interacts poorly with mergemaster. For now, use the installed system sebsd_* tools, rather than trying to run from DESTDIR where they may not exist. In the future, we'll need to attach the SEBSD tool set to the build tool set so it can run in the build/install environment. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#23 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#23 (text+ko) ==== @@ -18,9 +18,9 @@ FLASKDIR = flask/ PREFIX = /usr -LOADPOLICY = $(DESTDIR)/usr/sbin/sebsd_loadpolicy -CHECKPOLICY = $(DESTDIR)/sbin/sebsd_checkpolicy -SETFILES = $(DESTDIR)/sbin/sebsd_setfiles +LOADPOLICY = /usr/sbin/sebsd_loadpolicy +CHECKPOLICY = /sbin/sebsd_checkpolicy +SETFILES = /sbin/sebsd_setfiles .if (POLICYVERCOMPAT) POLICYVERTMP = $(POLICYVERCOMPAT) POLICYVERCOMPATARGS = -c $(POLICYVERCOMPAT) From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 12 13:00:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFB4B16A441 for ; Sun, 12 Mar 2006 13:00:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F7BC43D48 for ; Sun, 12 Mar 2006 13:00:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4F91146BD6 for ; Sun, 12 Mar 2006 07:59:53 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 874C655C93; Sun, 12 Mar 2006 13:00:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 734B516A403; Sun, 12 Mar 2006 13:00: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 347B116A400 for ; Sun, 12 Mar 2006 13:00: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 D6F8343D45 for ; Sun, 12 Mar 2006 13:00:14 +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 k2CD0Es2002133 for ; Sun, 12 Mar 2006 13:00:14 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 k2CD0DXF002130 for perforce@freebsd.org; Sun, 12 Mar 2006 13:00:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 Mar 2006 13:00:13 GMT Message-Id: <200603121300.k2CD0DXF002130@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 93190 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Mar 2006 13:00:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=93190 Change 93190 by rwatson@rwatson_zoo on 2006/03/12 13:00:05 Integrate trustedbsd_audit3 branch from trustedbsd_base, bringing in updates from @92749: - OpenBSM 1.0 alpha 5 loop back. - dwmalone's structural improvements to mac_bsdextended. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/autogen.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/queue.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.guess#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/depcomp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/install-sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/missing#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#2 (text+ko) ==== @@ -124,4 +124,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#1 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#2 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#2 $ # SUBDIRS = \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/aclocal.m4#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/autogen.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/autogen.sh#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/autogen.sh#2 $ # libtoolize --copy --force ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#2 $ # SUBDIRS = \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#2 $ # openbsmdir = $(includedir)/bsm ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/queue.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * @(#)queue.h 8.5 (Berkeley) 8/20/94 * * Derived from FreeBSD src/sys/sys/queue.h:1.63. - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/queue.h#1 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/queue.h#2 $ */ #ifndef _COMPAT_QUEUE_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.guess#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.sub#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/depcomp#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/install-sh#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/missing#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#2 (xtext) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#2 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#1 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#2 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.am#2 $ # man2_MANS = \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#2 $ # srcdir = @srcdir@ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#8 (text+ko) ==== From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 12 15:25:17 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52F9316A481 for ; Sun, 12 Mar 2006 15:25:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90A3C43D48 for ; Sun, 12 Mar 2006 15:25:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6060B46C26 for ; Sun, 12 Mar 2006 10:24:50 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 772F2581C2; Sun, 12 Mar 2006 15:25:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C87116A404; Sun, 12 Mar 2006 15:25: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 0E2C916A401 for ; Sun, 12 Mar 2006 15:25: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 B24ED43D48 for ; Sun, 12 Mar 2006 15:25:10 +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 k2CFPAnN007438 for ; Sun, 12 Mar 2006 15:25:10 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 k2CFPAmm007435 for perforce@freebsd.org; Sun, 12 Mar 2006 15:25:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 Mar 2006 15:25:10 GMT Message-Id: <200603121525.k2CFPAmm007435@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 93194 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Mar 2006 15:25:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=93194 Change 93194 by rwatson@rwatson_zoo on 2006/03/12 15:24:27 Add a top-level security.audit sysctl node, which will be present regardless of audit compiled in. User space applications will be able to test for the node to decide whether or not to invoke audit system calls, which may improve the behavior of applications like login when running on older kernels (unsupported, but often used configuration). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#9 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -39,6 +40,10 @@ #include #include +SYSCTL_DECL(_security); +SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0, + "TrustedBSD audit controls"); + #ifdef AUDIT /* From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 12 15:25:31 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BAB7A16A413 for ; Sun, 12 Mar 2006 15:25:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2154343D46 for ; Sun, 12 Mar 2006 15:25:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9529646C2E for ; Sun, 12 Mar 2006 10:25:04 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AEAA65B6EB; Sun, 12 Mar 2006 15:25:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D1A916A471; Sun, 12 Mar 2006 15:25: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 56B3A16A402 for ; Sun, 12 Mar 2006 15:25: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 087B343D49 for ; Sun, 12 Mar 2006 15:25: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 k2CFPAef007444 for ; Sun, 12 Mar 2006 15:25:10 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 k2CFPAxF007441 for perforce@freebsd.org; Sun, 12 Mar 2006 15:25:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 Mar 2006 15:25:10 GMT Message-Id: <200603121525.k2CFPAxF007441@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 93195 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Mar 2006 15:25:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=93195 Change 93195 by rwatson@rwatson_zoo on 2006/03/12 15:24:39 Add $FreeBSD$. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_trigger.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_trigger.c#8 (text+ko) ==== @@ -24,6 +24,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #include From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 12 15:27:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2308116A465 for ; Sun, 12 Mar 2006 15:27:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AA4543D9B for ; Sun, 12 Mar 2006 15:27:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id ED99246BB6 for ; Sun, 12 Mar 2006 10:27:16 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 355875B526; Sun, 12 Mar 2006 15:27:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2828416A403; Sun, 12 Mar 2006 15:27: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 3E7B716A409 for ; Sun, 12 Mar 2006 15:27: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 0481543D46 for ; Sun, 12 Mar 2006 15:27:14 +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 k2CFRD9I007574 for ; Sun, 12 Mar 2006 15:27:13 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 k2CFRDSN007571 for perforce@freebsd.org; Sun, 12 Mar 2006 15:27:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 Mar 2006 15:27:13 GMT Message-Id: <200603121527.k2CFRDSN007571@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 93196 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Mar 2006 15:27:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=93196 Change 93196 by rwatson@rwatson_zoo on 2006/03/12 15:26:44 Add $FreeBSD$. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#12 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#14 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#4 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#12 (text+ko) ==== @@ -25,6 +25,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ */ /* ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#14 (text+ko) ==== @@ -25,6 +25,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#4 (text+ko) ==== @@ -26,6 +26,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#10 (text+ko) ==== @@ -25,6 +25,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ */ #include From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 12 15:39:09 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 53C9C16A404 for ; Sun, 12 Mar 2006 15:39:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33B5F43D48 for ; Sun, 12 Mar 2006 15:39:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9E5E146BAA for ; Sun, 12 Mar 2006 10:38:43 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BCBA05BF32; Sun, 12 Mar 2006 15:38:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CD3016A547; Sun, 12 Mar 2006 15:37: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 9338416A4EA for ; Sun, 12 Mar 2006 15:37: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 A578F43D45 for ; Sun, 12 Mar 2006 15:37: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 k2CFbQ1C008114 for ; Sun, 12 Mar 2006 15:37: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 k2CFbQxk008111 for perforce@freebsd.org; Sun, 12 Mar 2006 15:37:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 Mar 2006 15:37:26 GMT Message-Id: <200603121537.k2CFbQxk008111@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 93199 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Mar 2006 15:39:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=93199 Change 93199 by rwatson@rwatson_zoo on 2006/03/12 15:36:37 Change send_trigger() prototype to return an int, so that user space callers can tell if the message was successfully placed in the trigger queue. This isn't quite the same as it being successfully received, but is close enough that we can generate a more useful warning message in audit(8). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#17 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#20 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#11 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_trigger.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#17 (text+ko) ==== @@ -307,7 +307,7 @@ * then kindly suggest to the audit daemon to do something. */ if (mnt_stat->f_bfree < AUDIT_HARD_LIMIT_FREE_BLOCKS) { - send_trigger(AUDIT_TRIGGER_NO_SPACE); + (void)send_trigger(AUDIT_TRIGGER_NO_SPACE); /* Hopefully userspace did something about all the previous * triggers that were sent prior to this critical condition. * If fail-stop is set, then we're done; goodnight Gracie. @@ -330,7 +330,7 @@ temp = mnt_stat->f_blocks / (100 / audit_qctrl.aq_minfree); if (mnt_stat->f_bfree < temp) - send_trigger(AUDIT_TRIGGER_LOW_SPACE); + (void)send_trigger(AUDIT_TRIGGER_LOW_SPACE); } /* Check if the current log file is full; if so, call for @@ -342,7 +342,7 @@ (audit_file_rotate_wait == 0) && (vattr.va_size >= audit_fstat.af_filesz)) { audit_file_rotate_wait = 1; - send_trigger(AUDIT_TRIGGER_OPEN_NEW); + (void)send_trigger(AUDIT_TRIGGER_OPEN_NEW); } /* ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#20 (text+ko) ==== @@ -295,7 +295,7 @@ * asynchronously. */ void audit_trigger_init(void); -void send_trigger(unsigned int trigger); +int send_trigger(unsigned int trigger); /* * General audit related functions. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#11 (text+ko) ==== @@ -340,7 +340,7 @@ if ((udata.au_trigger < AUDIT_TRIGGER_MIN) || (udata.au_trigger > AUDIT_TRIGGER_MAX)) return (EINVAL); - send_trigger(udata.au_trigger); + return (send_trigger(udata.au_trigger)); break; } /* Copy data back to userspace for the GET comands */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_trigger.c#9 (text+ko) ==== @@ -122,14 +122,14 @@ return (EOPNOTSUPP); } -void +int send_trigger(unsigned int trigger) { struct trigger_info *ti; /* If nobody's listening, we ain't talking. */ if (!audit_isopen) - return; + return (ENODEV); /* * XXXAUDIT: Use a condition variable instead of msleep/wakeup? @@ -140,6 +140,7 @@ TAILQ_INSERT_TAIL(&trigger_list, ti, list); wakeup(&trigger_list); mtx_unlock(&audit_trigger_mtx); + return (0); } static struct cdevsw audit_cdevsw = { From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 14 16:34:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6903616A401 for ; Tue, 14 Mar 2006 16:34:53 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95EB843D45 for ; Tue, 14 Mar 2006 16:34:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id AEC4146C14 for ; Tue, 14 Mar 2006 11:34:27 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7A61955D56; Tue, 14 Mar 2006 16:34:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 738A016A422; Tue, 14 Mar 2006 16:34:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 354FF16A41F for ; Tue, 14 Mar 2006 16:34:50 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E205B43D49 for ; Tue, 14 Mar 2006 16:34:49 +0000 (GMT) (envelope-from millert@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 k2EGYnHO062958 for ; Tue, 14 Mar 2006 16:34:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2EGYnBA062955 for perforce@freebsd.org; Tue, 14 Mar 2006 16:34:49 GMT (envelope-from millert@freebsd.org) Date: Tue, 14 Mar 2006 16:34:49 GMT Message-Id: <200603141634.k2EGYnBA062955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93294 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Mar 2006 16:34:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=93294 Change 93294 by millert@millert_p3 on 2006/03/14 16:34:36 Remove obsolete file. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/services_private.h#3 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 14 21:34:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 944EC16A400 for ; Tue, 14 Mar 2006 21:34:59 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E0E543D48 for ; Tue, 14 Mar 2006 21:34:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CA0D146C05 for ; Tue, 14 Mar 2006 16:34:34 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4E902555A2; Tue, 14 Mar 2006 21:34:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4969A16A422; Tue, 14 Mar 2006 21:34:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 259B616A400 for ; Tue, 14 Mar 2006 21:34:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD96343D49 for ; Tue, 14 Mar 2006 21:34:56 +0000 (GMT) (envelope-from millert@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 k2ELYu2Q089962 for ; Tue, 14 Mar 2006 21:34:56 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2ELYuXX089959 for perforce@freebsd.org; Tue, 14 Mar 2006 21:34:56 GMT (envelope-from millert@freebsd.org) Date: Tue, 14 Mar 2006 21:34:56 GMT Message-Id: <200603142134.k2ELYuXX089959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93307 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Mar 2006 21:34:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=93307 Change 93307 by millert@millert_p3 on 2006/03/14 21:34:02 Remove duplicate mac.h inclusion Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#16 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#16 (text+ko) ==== @@ -68,7 +68,6 @@ #include #include #include -#include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 15 18:03:03 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 333DD16A42A for ; Wed, 15 Mar 2006 18:03:03 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FE3543D55 for ; Wed, 15 Mar 2006 18:03:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2DCEA46C48 for ; Wed, 15 Mar 2006 13:02:38 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2AD3963DC5; Wed, 15 Mar 2006 18:03:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 23AB516A424; Wed, 15 Mar 2006 18:03:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB4F016A422 for ; Wed, 15 Mar 2006 18:03:00 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98B0C43D4C for ; Wed, 15 Mar 2006 18:03:00 +0000 (GMT) (envelope-from millert@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 k2FI30io074965 for ; Wed, 15 Mar 2006 18:03:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2FI30vG074962 for perforce@freebsd.org; Wed, 15 Mar 2006 18:03:00 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Mar 2006 18:03:00 GMT Message-Id: <200603151803.k2FI30vG074962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93353 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2006 18:03:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=93353 Change 93353 by millert@millert_g5tower on 2006/03/15 18:02:08 Don't call mac_check_vnode_access() for the existence check (flags == 0) as it is just a no-op. This is consistent with what FreeBSD does and makes for a simpler diff against the vendor code. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/vfs/vfs_syscalls.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/vfs/vfs_syscalls.c#4 (text+ko) ==== @@ -1792,30 +1792,22 @@ vp = nd.ni_vp; /* Flags == 0 means only check for existence. */ - flags = 0; if (uap->flags) { + flags = 0; if (uap->flags & R_OK) flags |= VREAD; if (uap->flags & W_OK) flags |= VWRITE; if (uap->flags & X_OK) flags |= VEXEC; +#ifdef MAC + error = mac_check_vnode_access(cred, vp, flags); + if (error) + return (error); +#endif if ((flags & VWRITE) == 0 || (error = vn_writechk(vp)) == 0) error = VOP_ACCESS(vp, flags, cred, p); } -#ifdef MAC - /* - * Override DAC error value with MAC error value unless - * MAC returns OK and DAC returns error. - */ - { - int mac_error; - - mac_error = mac_check_vnode_access(cred, vp, flags); - if (mac_error) - error = mac_error; - } -#endif vput(vp); out1: cred->cr_uid = t_uid; From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 15 19:23:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EBFFE16A400 for ; Wed, 15 Mar 2006 19:23:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C4CF43D5E for ; Wed, 15 Mar 2006 19:23:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 76A8D46B96 for ; Wed, 15 Mar 2006 14:23:29 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A8EFBCF929; Wed, 15 Mar 2006 19:23:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 78DC016A465; Wed, 15 Mar 2006 19:23:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F49916A463 for ; Wed, 15 Mar 2006 19:23:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B406D43D83 for ; Wed, 15 Mar 2006 19:23:40 +0000 (GMT) (envelope-from millert@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 k2FJNeW8079183 for ; Wed, 15 Mar 2006 19:23:40 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2FJNeQh079180 for perforce@freebsd.org; Wed, 15 Mar 2006 19:23:40 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Mar 2006 19:23:40 GMT Message-Id: <200603151923.k2FJNeQh079180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93358 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2006 19:23:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=93358 Change 93358 by millert@millert_p3 on 2006/03/15 19:23:08 Convert policy lock from sx lock to rw lock. We can't use an sx lock since the proc lock is held and you are not allowed to hold a mutex while getting an sx lock. It looks like an rw lock is what was desired in the first place but they were not available at the time. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/services.c#12 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/services.c#12 (text+ko) ==== @@ -39,16 +39,16 @@ #ifdef _KERNEL -#include +#include #include -static struct sx policy_rwlock; -#define POLICY_RDLOCK sx_slock(&policy_rwlock) -#define POLICY_WRLOCK sx_xlock(&policy_rwlock) -#define POLICY_RDUNLOCK sx_sunlock(&policy_rwlock) -#define POLICY_WRUNLOCK sx_xunlock(&policy_rwlock) +static struct rwlock policy_rwlock; +#define POLICY_RDLOCK rw_rlock(&policy_rwlock) +#define POLICY_WRLOCK rw_wlock(&policy_rwlock) +#define POLICY_RDUNLOCK rw_runlock(&policy_rwlock) +#define POLICY_WRUNLOCK rw_wunlock(&policy_rwlock) -SX_SYSINIT(policy_rwlock, &policy_rwlock, "SEBSD policy lock"); +RW_SYSINIT(policy_rwlock, &policy_rwlock, "SEBSD policy lock"); static struct mtx load_sem; #define LOAD_LOCK mtx_lock(&load_sem) From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 15 19:25:46 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 795C316A41F for ; Wed, 15 Mar 2006 19:25:46 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC49D43D45 for ; Wed, 15 Mar 2006 19:25:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1E14646B4C for ; Wed, 15 Mar 2006 14:25:21 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 63AF557B85; Wed, 15 Mar 2006 19:25:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C29916A426; Wed, 15 Mar 2006 19:25:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2250F16A423 for ; Wed, 15 Mar 2006 19:25:44 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F33843D48 for ; Wed, 15 Mar 2006 19:25:43 +0000 (GMT) (envelope-from millert@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 k2FJPhFo079330 for ; Wed, 15 Mar 2006 19:25:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2FJPhDE079327 for perforce@freebsd.org; Wed, 15 Mar 2006 19:25:43 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Mar 2006 19:25:43 GMT Message-Id: <200603151925.k2FJPhDE079327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93359 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2006 19:25:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=93359 Change 93359 by millert@millert_p3 on 2006/03/15 19:25:00 SEBSD policy lock is an rw lock now. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/subr_witness.c#17 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/subr_witness.c#17 (text+ko) ==== @@ -293,7 +293,7 @@ { "SEBSD AVC", &lock_class_mtx_sleep }, { "SEBSD message lock", &lock_class_mtx_sleep }, - { "SEBSD policy lock", &lock_class_sx }, + { "SEBSD policy lock", &lock_class_rw }, { NULL, NULL }, /* From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 15 19:52:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A7A516A401 for ; Wed, 15 Mar 2006 19:52:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0FCC43D53 for ; Wed, 15 Mar 2006 19:52:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B940546B4C for ; Wed, 15 Mar 2006 14:52:30 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 86F74CF5D2; Wed, 15 Mar 2006 19:52:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 813D316A429; Wed, 15 Mar 2006 19:52:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4033916A401 for ; Wed, 15 Mar 2006 19:52:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C425943D48 for ; Wed, 15 Mar 2006 19:52:29 +0000 (GMT) (envelope-from millert@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 k2FJqTJA083588 for ; Wed, 15 Mar 2006 19:52:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2FJqSNx083526 for perforce@freebsd.org; Wed, 15 Mar 2006 19:52:28 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Mar 2006 19:52:28 GMT Message-Id: <200603151952.k2FJqSNx083526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93364 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2006 19:52:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=93364 Change 93364 by millert@millert_p3 on 2006/03/15 19:51:56 Add sebsd_update_devfsdirent(). Check for fullpath == NULL in devfs functions that have it as a parameter. This is overkill as we really only need to do this in sebsd_create_devfs_directory() (which is called with a NULL fullpath from devfs_mount() via devfs_vmkdir()). Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#41 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#41 (text+ko) ==== @@ -443,6 +443,20 @@ */ } +static void +sebsd_update_devfsdirent(struct mount *mp, struct devfs_dirent *de, + struct label *delabel, struct vnode *vp, struct label *vlabel) +{ + struct vnode_security_struct *vsec, *dsec; + + vsec = SLOT(vlabel); + dsec = SLOT(delabel); + + dsec->sid = vsec->sid; + dsec->task_sid = vsec->task_sid; + dsec->sclass = vsec->sclass; +} + static int sebsd_associate_vnode_extattr(struct mount *mp, struct label *fslabel, struct vnode *vp, struct label *vlabel) @@ -644,9 +658,12 @@ dirent_type_to_security_class(devfs_dirent->de_dirent->d_type); /* Obtain a SID based on the fstype, path, and class. */ - path = malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); - path[0] = '/'; - strcpy(&path[1], fullpath); + if (fullpath != NULL) { + path = malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); + path[0] = '/'; + strcpy(&path[1], fullpath); + } else + path = "/"; rc = security_genfs_sid(mp->mnt_vfc->vfc_name, path, dirent->sclass, &newsid); @@ -675,7 +692,8 @@ "dirent=%d\n", path, sbsec->sid, mp->mnt_stat.f_mntonname, rc, dirent->sclass, newsid, dirent->sid); } - free(path, M_SEBSD); + if (fullpath != NULL) + free(path, M_SEBSD); } static void @@ -698,9 +716,12 @@ dirent->sclass = SECCLASS_DIR; /* Obtain a SID based on the fstype, path, and class. */ - path = malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); - path[0] = '/'; - strcpy(&path[1], fullpath); + if (fullpath != NULL) { + path = malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); + path[0] = '/'; + strcpy(&path[1], fullpath); + } else + path = "/"; rc = security_genfs_sid(mp->mnt_vfc->vfc_name, path, dirent->sclass, &newsid); if (rc == 0) @@ -713,7 +734,8 @@ __func__, path, sbsec->sid, mp->mnt_stat.f_mntonname, rc, dirent->sclass, newsid, dirent->sid); } - free(path, M_SEBSD); + if (fullpath != NULL) + free(path, M_SEBSD); } static void @@ -740,9 +762,12 @@ lnksec->sclass = SECCLASS_LNK_FILE; /* Obtain a SID based on the fstype, path, and class. */ - path = malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); - path[0] = '/'; - strcpy(&path[1], fullpath); + if (fullpath != NULL) { + path = malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); + path[0] = '/'; + strcpy(&path[1], fullpath); + } else + path = "/"; rc = security_genfs_sid(mp->mnt_vfc->vfc_name, path, lnksec->sclass, &newsid); if (rc == 0) @@ -754,7 +779,8 @@ sbsec->sid, mp->mnt_stat.f_mntonname, rc, lnksec->sclass, newsid, lnksec->sid); } - free(path, M_SEBSD); + if (fullpath != NULL) + free(path, M_SEBSD); } /* @@ -2457,6 +2483,7 @@ /* .mpo_create_socket = sebsd_create_socket, */ /* .mpo_create_socket_from_socket = sebsd_create_socket_from_socket, */ .mpo_create_vnode_extattr = sebsd_create_vnode_extattr, + .mpo_update_devfsdirent = sebsd_update_devfsdirent, .mpo_associate_vnode_devfs = sebsd_associate_vnode_devfs, .mpo_associate_vnode_singlelabel = sebsd_associate_vnode_singlelabel, .mpo_associate_vnode_extattr = sebsd_associate_vnode_extattr, From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 15 20:05:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2DDF16A423 for ; Wed, 15 Mar 2006 20:05:59 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA04D43D48 for ; Wed, 15 Mar 2006 20:05:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5B99846C04 for ; Wed, 15 Mar 2006 15:05:32 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 52734CFCF0; Wed, 15 Mar 2006 20:01:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C02E16A425; Wed, 15 Mar 2006 20:01:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E9DB316A423 for ; Wed, 15 Mar 2006 20:01:41 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5B2243D45 for ; Wed, 15 Mar 2006 20:01:41 +0000 (GMT) (envelope-from millert@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 k2FK1foN085565 for ; Wed, 15 Mar 2006 20:01:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2FK1fk7085562 for perforce@freebsd.org; Wed, 15 Mar 2006 20:01:41 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Mar 2006 20:01:41 GMT Message-Id: <200603152001.k2FK1fk7085562@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93366 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2006 20:05:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=93366 Change 93366 by millert@millert_p3 on 2006/03/15 20:01:38 Get rid of non-std -e option; we want to check extattrs for ufs2 by default. Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/fsck.h#9 edit .. //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/main.c#10 edit .. //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/pass1.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/fsck.h#9 (text+ko) ==== @@ -280,7 +280,6 @@ char resolved; /* cleared if unresolved changes => not clean */ char havesb; /* superblock has been read */ char skipclean; /* skip clean file systems if preening */ -char extattr; /* take a lot longer, and check ea's */ int fsmodified; /* 1 => write done to file system */ int fsreadfd; /* file descriptor for reading file system */ int fswritefd; /* file descriptor for writing file system */ ==== //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/main.c#10 (text+ko) ==== @@ -79,7 +79,7 @@ sync(); skipclean = 1; - while ((ch = getopt(argc, argv, "b:Bc:defFm:npy")) != -1) { + while ((ch = getopt(argc, argv, "b:Bc:dfFm:npy")) != -1) { switch (ch) { case 'b': skipclean = 0; @@ -103,10 +103,6 @@ debug++; break; - case 'e': - extattr++; - break; - case 'f': skipclean = 0; break; ==== //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/pass1.c#8 (text+ko) ==== @@ -340,7 +340,7 @@ break; } } - if (extattr && sblock.fs_magic == FS_UFS2_MAGIC) + if (sblock.fs_magic == FS_UFS2_MAGIC) eascan(idesc, &dp->dp2); idesc->id_entryno *= btodb(sblock.fs_fsize); if (DIP(dp, di_blocks) != idesc->id_entryno) { From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 15 20:27:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DDB216A401 for ; Wed, 15 Mar 2006 20:27:24 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7ACF43D6E for ; Wed, 15 Mar 2006 20:27:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EFC5346C05 for ; Wed, 15 Mar 2006 15:26:53 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0D33E92AC3; Wed, 15 Mar 2006 20:27:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 085FC16A423; Wed, 15 Mar 2006 20:27:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C2EFB16A401 for ; Wed, 15 Mar 2006 20:27:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A9E343D6E for ; Wed, 15 Mar 2006 20:27:16 +0000 (GMT) (envelope-from millert@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 k2FKRGZK088411 for ; Wed, 15 Mar 2006 20:27:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2FKRGRf088408 for perforce@freebsd.org; Wed, 15 Mar 2006 20:27:16 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Mar 2006 20:27:16 GMT Message-Id: <200603152027.k2FKRGRf088408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93370 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2006 20:27:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=93370 Change 93370 by millert@millert_p3 on 2006/03/15 20:26:57 Remove duplicate include of sys/ucred.h Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#16 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#16 (text+ko) ==== @@ -43,7 +43,6 @@ #include #include #include -#include #include From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 15 20:53:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 251EE16A423 for ; Wed, 15 Mar 2006 20:53:27 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 385A743DA4 for ; Wed, 15 Mar 2006 20:53:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9073A46C63 for ; Wed, 15 Mar 2006 15:52:45 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E0355D037D; Wed, 15 Mar 2006 20:52:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A98B316A420; Wed, 15 Mar 2006 20:52:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8112716A401 for ; Wed, 15 Mar 2006 20:52:52 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 222E643D78 for ; Wed, 15 Mar 2006 20:52:49 +0000 (GMT) (envelope-from deker@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 k2FKqnZH097424 for ; Wed, 15 Mar 2006 20:52:49 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2FKqma5097421 for perforce@freebsd.org; Wed, 15 Mar 2006 20:52:48 GMT (envelope-from deker@FreeBSD.org) Date: Wed, 15 Mar 2006 20:52:48 GMT Message-Id: <200603152052.k2FKqma5097421@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 93373 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2006 20:53:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=93373 Change 93373 by deker@deker_build1.columbia.sparta.com on 2006/03/15 20:51:48 Instantiate ChangeLog created by p42ch.pl Affected files ... .. //depot/projects/trustedbsd/sedarwin7/ChangeLog#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 16 18:41:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0519C16A4E4 for ; Thu, 16 Mar 2006 18:41:38 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C93043D78 for ; Thu, 16 Mar 2006 18:41:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F348246BE4 for ; Thu, 16 Mar 2006 13:41:05 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5990F14BA94; Thu, 16 Mar 2006 18:39:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 52B5816A422; Thu, 16 Mar 2006 18:39:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E42A16A400 for ; Thu, 16 Mar 2006 18:39:45 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB94143D48 for ; Thu, 16 Mar 2006 18:39:44 +0000 (GMT) (envelope-from millert@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 k2GIdieA096069 for ; Thu, 16 Mar 2006 18:39:44 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2GIdi01096066 for perforce@freebsd.org; Thu, 16 Mar 2006 18:39:44 GMT (envelope-from millert@freebsd.org) Date: Thu, 16 Mar 2006 18:39:44 GMT Message-Id: <200603161839.k2GIdi01096066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93408 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Mar 2006 18:41:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=93408 Change 93408 by millert@millert_g5tower on 2006/03/16 18:39:10 Remove obsolete file. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services_private.h#4 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 16 19:15:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29E9316A425 for ; Thu, 16 Mar 2006 19:15:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD3BF43D90 for ; Thu, 16 Mar 2006 19:15:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 19D3246C0B for ; Thu, 16 Mar 2006 14:15:15 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0641014C68D; Thu, 16 Mar 2006 19:07:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F3B2616A423; Thu, 16 Mar 2006 19:07:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2DE216A400 for ; Thu, 16 Mar 2006 19:07:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8119643D48 for ; Thu, 16 Mar 2006 19:07:33 +0000 (GMT) (envelope-from millert@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 k2GJ7XvD097187 for ; Thu, 16 Mar 2006 19:07:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2GJ7XRR097184 for perforce@freebsd.org; Thu, 16 Mar 2006 19:07:33 GMT (envelope-from millert@freebsd.org) Date: Thu, 16 Mar 2006 19:07:33 GMT Message-Id: <200603161907.k2GJ7XRR097184@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93409 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Mar 2006 19:15:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=93409 Change 93409 by millert@millert_p3 on 2006/03/16 19:06:34 Fix some apparent merge errors, primarily in error paths. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#17 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#17 (text+ko) ==== @@ -474,6 +474,8 @@ (struct vnode *)fp->f_data, mode); VOP_UNLOCK((struct vnode *)fp->f_data, 0, td); if (error) { + FILE_UNLOCK(fp); + FILEDESC_UNLOCK(fdp); fdrop(fp, td); break; } @@ -485,6 +487,8 @@ fp->f_flag, (fp->f_flag & ~FCNTLFLAGS) | (FFLAGS(arg & ~O_ACCMODE) & FCNTLFLAGS)); if (error) { + FILE_UNLOCK(fp); + FILEDESC_UNLOCK(fdp); fdrop(fp, td); break; } @@ -723,6 +727,9 @@ #ifdef MAC error = mac_check_file_dup(td->td_ucred, fp, new); if (error) { + /* we've allocated a descriptor which we won't use */ + if (fdp->fd_ofiles[new] == NULL) + fdunused(fdp, new); FILEDESC_UNLOCK(fdp); fdrop(fp, td); return (error); @@ -1858,7 +1865,8 @@ for (i = 0; i <= fdp->fd_lastfile; i++) { #ifdef MAC if (fdp->fd_ofiles[i] != NULL && - ((fdp->fd_ofileflags[i] & UF_EXCLOSE) || + (fdp->fd_ofiles[i]->f_type == DTYPE_MQUEUE || + (fdp->fd_ofileflags[i] & UF_EXCLOSE) || mac_check_file_inherit(td->td_ucred, fdp->fd_ofiles[i]))) { #else if (fdp->fd_ofiles[i] != NULL && From owner-trustedbsd-cvs@FreeBSD.ORG Fri Mar 17 21:41:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D9AA16A424 for ; Fri, 17 Mar 2006 21:41:08 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2A0B43D68 for ; Fri, 17 Mar 2006 21:41:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6F0AB46C44 for ; Fri, 17 Mar 2006 16:40:39 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8BBCE14D28C; Fri, 17 Mar 2006 21:37:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 872D816A422; Fri, 17 Mar 2006 21:37:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5960516A400 for ; Fri, 17 Mar 2006 21:37:59 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B2D643D46 for ; Fri, 17 Mar 2006 21:37:59 +0000 (GMT) (envelope-from millert@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 k2HLbwGm015950 for ; Fri, 17 Mar 2006 21:37:58 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2HLbwCV015943 for perforce@freebsd.org; Fri, 17 Mar 2006 21:37:58 GMT (envelope-from millert@freebsd.org) Date: Fri, 17 Mar 2006 21:37:58 GMT Message-Id: <200603172137.k2HLbwCV015943@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93468 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Mar 2006 21:41:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=93468 Change 93468 by millert@millert_p3 on 2006/03/17 21:37:30 Correct error path when mac_check_file_change_offset() fails in getdirentries(). Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_syscalls.c#18 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_syscalls.c#18 (text+ko) ==== @@ -3775,10 +3775,8 @@ } #ifdef MAC error = mac_check_file_change_offset(td->td_ucred, fp); - if (error) { - fdrop(fp, td); - return (error); - } + if (error) + goto fail; #endif aiov.iov_base = uap->buf; aiov.iov_len = uap->count; From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 18 16:01:41 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCC8B16A400 for ; Sat, 18 Mar 2006 16:01:41 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3601A43D46 for ; Sat, 18 Mar 2006 16:01:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 780FE46C44 for ; Sat, 18 Mar 2006 11:01:15 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1962456EE7; Sat, 18 Mar 2006 16:01:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 11E7216A422; Sat, 18 Mar 2006 16:01:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C02CE16A401 for ; Sat, 18 Mar 2006 16:01:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D53943D48 for ; Sat, 18 Mar 2006 16:01:39 +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 k2IG1di8093940 for ; Sat, 18 Mar 2006 16:01:39 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 k2IG1dVs093937 for perforce@freebsd.org; Sat, 18 Mar 2006 16:01:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 18 Mar 2006 16:01:39 GMT Message-Id: <200603181601.k2IG1dVs093937@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 93506 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 16:01:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=93506 Change 93506 by rwatson@rwatson_peppercorn on 2006/03/18 16:01:07 Add ioctls to audit pipes in order to allow querying of the current record queue state, setting of the queue limit, and querying of pipe statistics. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#1 add .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#11 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include +#include #include /* @@ -68,6 +69,7 @@ * Audit pipe buffer parameters. */ #define AUDIT_PIPE_QLIMIT_DEFAULT (32) +#define AUDIT_PIPE_QLIMIT_MIN (0) #define AUDIT_PIPE_QLIMIT_MAX (1024) /* @@ -379,8 +381,8 @@ } /* - * Audit pipe ioctl() routine. Nothing for now, but eventually will allow - * setting and retrieval of current queue depth, queue limit, flush, etc. + * Audit pipe ioctl() routine. Handle file descriptor and audit pipe layer + * commands. * * Would be desirable to support filtering, although perhaps something simple * like an event mask, as opposed to something complicated like BPF. @@ -433,6 +435,47 @@ case FIOGETOWN: *(int *)data = fgetown(&ap->ap_sigio); error = 0; + break; + + case AUDITPIPE_GET_QLEN: + *(u_int *)data = ap->ap_qlen; + error = 0; + break; + + case AUDITPIPE_GET_QLIMIT: + *(u_int *)data = ap->ap_qlimit; + error = 0; + break; + + case AUDITPIPE_SET_QLIMIT: + /* Lockless integer write. */ + if (*(u_int *)data >= AUDIT_PIPE_QLIMIT_MIN || + *(u_int *)data <= AUDIT_PIPE_QLIMIT_MAX) { + ap->ap_qlimit = *(u_int *)data; + error = 0; + } else + error = EINVAL; + break; + + case AUDITPIPE_GET_INSERTS: + *(u_int *)data = ap->ap_inserts; + error = 0; + break; + + case AUDITPIPE_GET_READS: + *(u_int *)data = ap->ap_reads; + error = 0; + break; + + case AUDITPIPE_GET_DROPS: + *(u_int *)data = ap->ap_drops; + error = 0; + break; + + case AUDITPIPE_GET_TRUNCATES: + *(u_int *)data = ap->ap_truncates; + error = 0; + break; default: error = ENOTTY; From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 18 16:11:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D51516A422 for ; Sat, 18 Mar 2006 16:11:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6878343D46 for ; Sat, 18 Mar 2006 16:11:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A5AD246C44 for ; Sat, 18 Mar 2006 11:11:28 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BBCAD57CF4; Sat, 18 Mar 2006 16:11:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B38AB16A420; Sat, 18 Mar 2006 16:11:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D8DF16A401 for ; Sat, 18 Mar 2006 16:11:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2723643D45 for ; Sat, 18 Mar 2006 16:11:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2IGBq7c094549 for ; Sat, 18 Mar 2006 16:11:52 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 k2IGBpvO094546 for perforce@freebsd.org; Sat, 18 Mar 2006 16:11:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 18 Mar 2006 16:11:51 GMT Message-Id: <200603181611.k2IGBpvO094546@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 93507 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 16:11:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=93507 Change 93507 by rwatson@rwatson_peppercorn on 2006/03/18 16:11:21 Correct comment: this print is now from audit_record_write(), not audit_worker(). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#18 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#18 (text+ko) ==== @@ -361,8 +361,8 @@ (unsigned long) ((audit_q_len + audit_pre_q_len + 1) * MAX_AUDIT_RECORD_SIZE) / mnt_stat->f_bsize >= (unsigned long)(mnt_stat->f_bfree)) { - printf( - "audit_worker: free space below size of audit queue, failing stop\n"); + printf("audit_record_write: free space below size of audit " + "queue, failing stop\n"); audit_in_failure = 1; } From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 18 16:39:32 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D3EA16A41F for ; Sat, 18 Mar 2006 16:39:32 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23A1A43D49 for ; Sat, 18 Mar 2006 16:39:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4354346C39 for ; Sat, 18 Mar 2006 11:39:05 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 32DEE55506; Sat, 18 Mar 2006 16:39:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AE4C16A423; Sat, 18 Mar 2006 16:39:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4AC516A41F for ; Sat, 18 Mar 2006 16:39:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F35143D48 for ; Sat, 18 Mar 2006 16:39: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 k2IGdQRF095564 for ; Sat, 18 Mar 2006 16:39: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 k2IGdPnb095561 for perforce@freebsd.org; Sat, 18 Mar 2006 16:39:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 18 Mar 2006 16:39:25 GMT Message-Id: <200603181639.k2IGdPnb095561@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 93509 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 16:39:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=93509 Change 93509 by rwatson@rwatson_peppercorn on 2006/03/18 16:38:25 Move log rotation logic out of audit_worker() into audit_worker_rotate(). This makes the event loop a bit easier to read. Comment on some ways in which the event loop could be made better. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#19 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#19 (text+ko) ==== @@ -459,6 +459,71 @@ } /* + * If an appropriate signal has been received rotate the audit log based on + * the global replacement variables. Signal consumers as needed that the + * rotation has taken place. + * + * XXXRW: The global variables and CVs used to signal the audit_worker to + * perform a rotation are essentially a message queue of depth 1. It would + * be much nicer to actually use a message queue. + */ +static void +audit_worker_rotate(struct ucred **audit_credp, struct vnode **audit_vpp, + struct thread *audit_td) +{ + int do_replacement_signal, vfslocked; + struct ucred *old_cred; + struct vnode *old_vp; + + mtx_assert(&audit_mtx, MA_OWNED); + + do_replacement_signal = 0; + while (audit_replacement_flag != 0) { + old_cred = *audit_credp; + old_vp = *audit_vpp; + *audit_credp = audit_replacement_cred; + *audit_vpp = audit_replacement_vp; + audit_replacement_cred = NULL; + audit_replacement_vp = NULL; + audit_replacement_flag = 0; + + audit_enabled = (*audit_vpp != NULL); + + /* + * XXX: What to do about write failures here? + */ + if (old_vp != NULL) { + AUDIT_PRINTF(("Closing old audit file\n")); + mtx_unlock(&audit_mtx); + vfslocked = VFS_LOCK_GIANT(old_vp->v_mount); + vn_close(old_vp, AUDIT_CLOSE_FLAGS, old_cred, + audit_td); + VFS_UNLOCK_GIANT(vfslocked); + crfree(old_cred); + mtx_lock(&audit_mtx); + old_cred = NULL; + old_vp = NULL; + AUDIT_PRINTF(("Audit file closed\n")); + } + if (*audit_vpp != NULL) { + AUDIT_PRINTF(("Opening new audit file\n")); + } + do_replacement_signal = 1; + } + + /* + * Signal that replacement have occurred to wake up and + * start any other replacements started in parallel. We can + * continue about our business in the mean time. We + * broadcast so that both new replacements can be inserted, + * but also so that the source(s) of replacement can return + * successfully. + */ + if (do_replacement_signal) + cv_broadcast(&audit_replacement_cv); +} + +/* * 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 @@ -469,14 +534,12 @@ static void audit_worker(void *arg) { - int do_replacement_signal, error; TAILQ_HEAD(, kaudit_record) ar_worklist; struct kaudit_record *ar; - struct vnode *audit_vp, *old_vp; - int vfslocked; - - struct ucred *audit_cred, *old_cred; + struct ucred *audit_cred; struct thread *audit_td; + struct vnode *audit_vp; + int error; AUDIT_PRINTF(("audit_worker starting\n")); @@ -490,59 +553,18 @@ mtx_lock(&audit_mtx); while (1) { + mtx_assert(&audit_mtx, MA_OWNED); + /* - * First priority: replace the audit log target if requested. - * Accessing the vnode here requires dropping the audit_mtx; - * in case another replacement was scheduled while the mutex - * was released, we loop. - * - * XXX It could well be we should drain existing records - * first to ensure that the timestamps and ordering - * are right. + * XXXRW: Logic here should really be: while (!events and + * !records) cv_wait(), then process events, and then + * records. */ - do_replacement_signal = 0; - while (audit_replacement_flag != 0) { - old_cred = audit_cred; - old_vp = audit_vp; - audit_cred = audit_replacement_cred; - audit_vp = audit_replacement_vp; - audit_replacement_cred = NULL; - audit_replacement_vp = NULL; - audit_replacement_flag = 0; - - audit_enabled = (audit_vp != NULL); - /* - * XXX: What to do about write failures here? - */ - if (old_vp != NULL) { - AUDIT_PRINTF(("Closing old audit file\n")); - mtx_unlock(&audit_mtx); - vfslocked = VFS_LOCK_GIANT(old_vp->v_mount); - vn_close(old_vp, AUDIT_CLOSE_FLAGS, old_cred, - audit_td); - VFS_UNLOCK_GIANT(vfslocked); - crfree(old_cred); - mtx_lock(&audit_mtx); - old_cred = NULL; - old_vp = NULL; - AUDIT_PRINTF(("Audit file closed\n")); - } - if (audit_vp != NULL) { - AUDIT_PRINTF(("Opening new audit file\n")); - } - do_replacement_signal = 1; - } /* - * Signal that replacement have occurred to wake up and - * start any other replacements started in parallel. We can - * continue about our business in the mean time. We - * broadcast so that both new replacements can be inserted, - * but also so that the source(s) of replacement can return - * successfully. + * First priority: replace the audit log target if requested. */ - if (do_replacement_signal) - cv_broadcast(&audit_replacement_cv); + audit_worker_rotate(&audit_cred, &audit_vp, audit_td); /* * Next, check to see if we have any records to drain into From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 18 16:58:01 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 213BA16A482 for ; Sat, 18 Mar 2006 16:58:01 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 404D643D49 for ; Sat, 18 Mar 2006 16:57:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7F69746C44 for ; Sat, 18 Mar 2006 11:57:32 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 85529554A8; Sat, 18 Mar 2006 16:57:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E1C116A420; Sat, 18 Mar 2006 16:57:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2955A16A400 for ; Sat, 18 Mar 2006 16:57:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDFF443D45 for ; Sat, 18 Mar 2006 16:57:48 +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 k2IGvmLn004080 for ; Sat, 18 Mar 2006 16:57:48 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 k2IGvmPB004077 for perforce@freebsd.org; Sat, 18 Mar 2006 16:57:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 18 Mar 2006 16:57:48 GMT Message-Id: <200603181657.k2IGvmPB004077@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 93510 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 16:58:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=93510 Change 93510 by rwatson@rwatson_peppercorn on 2006/03/18 16:57:39 Move wait loop up to top of audit_worker work loop, and add replacement as a condition for breaking from the wait loop. Move drain logic into its own function, audit_worker_drain(), and invoke that. Follow advice of comment and don't wake up when going below the watermark if we are draining, since no one is interested. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#20 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#20 (text+ko) ==== @@ -524,6 +524,22 @@ } /* + * Drain the audit commit queue and free the records. Used if there are + * records present, but no audit log target. + */ +static void +audit_worker_drain(void) +{ + struct kaudit_record *ar; + + while ((ar = TAILQ_FIRST(&audit_q))) { + TAILQ_REMOVE(&audit_q, ar, k_q); + uma_zfree(audit_record_zone, ar); + audit_q_len--; + } +} + +/* * 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 @@ -556,10 +572,16 @@ mtx_assert(&audit_mtx, MA_OWNED); /* - * XXXRW: Logic here should really be: while (!events and - * !records) cv_wait(), then process events, and then - * records. + * Wait for record or rotation events. */ + while (!audit_replacement_flag && TAILQ_EMPTY(&audit_q)) { + AUDIT_PRINTF(("audit_worker waiting\n")); + cv_wait(&audit_cv, &audit_mtx); + AUDIT_PRINTF(("audit_worker woken up\n")); + AUDIT_PRINTF(("audit_worker: new vp = %p; value of " + "flag %d\n", audit_replacement_vp, + audit_replacement_flag)); + } /* * First priority: replace the audit log target if requested. @@ -567,19 +589,6 @@ audit_worker_rotate(&audit_cred, &audit_vp, audit_td); /* - * Next, check to see if we have any records to drain into - * the vnode. If not, go back to waiting for an event. - */ - if (TAILQ_EMPTY(&audit_q)) { - AUDIT_PRINTF(("audit_worker waiting\n")); - cv_wait(&audit_cv, &audit_mtx); - AUDIT_PRINTF(("audit_worker woken up\n")); - AUDIT_PRINTF(("audit_worker: new vp = %p; value of flag %d\n", - audit_replacement_vp, audit_replacement_flag)); - continue; - } - - /* * If we have records, but there's no active vnode to write * to, drain the record queue. Generally, we prevent the * unnecessary allocation of records elsewhere, but we need @@ -587,17 +596,7 @@ * queueing. Go back to waiting when we're done. */ if (audit_vp == NULL) { - while ((ar = TAILQ_FIRST(&audit_q))) { - TAILQ_REMOVE(&audit_q, ar, k_q); - uma_zfree(audit_record_zone, ar); - audit_q_len--; - /* - * XXXRW: Why broadcast if we hold the - * mutex and know that audit_vp is NULL? - */ - if (audit_q_len <= audit_qctrl.aq_lowater) - cv_broadcast(&audit_commit_cv); - } + audit_worker_drain(); continue; } From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 18 17:02:22 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB73C16A47B for ; Sat, 18 Mar 2006 17:02:22 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1710E43D70 for ; Sat, 18 Mar 2006 17:02:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 855C046BFB for ; Sat, 18 Mar 2006 12:01:40 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 95B6355509; Sat, 18 Mar 2006 17:02:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 833FF16A422; Sat, 18 Mar 2006 17:02:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62EE816A401 for ; Sat, 18 Mar 2006 17:02:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C6D943D70 for ; Sat, 18 Mar 2006 17:01: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 k2IH1uPV004315 for ; Sat, 18 Mar 2006 17:01: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 k2IH1r5x004312 for perforce@freebsd.org; Sat, 18 Mar 2006 17:01:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 18 Mar 2006 17:01:53 GMT Message-Id: <200603181701.k2IH1r5x004312@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 93511 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 17:02:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=93511 Change 93511 by rwatson@rwatson_peppercorn on 2006/03/18 17:01:32 When pulling the global audit queue's contents into a thread-local queue, generate one low water mark transition signal, rather than many, and generate it only if actually crossing the transition point, rather than every time we notice we're below it. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#21 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#21 (text+ko) ==== @@ -555,7 +555,7 @@ struct ucred *audit_cred; struct thread *audit_td; struct vnode *audit_vp; - int error; + int error, lowater_signal; AUDIT_PRINTF(("audit_worker starting\n")); @@ -607,13 +607,16 @@ * our own clustering, if the lower layers aren't doing it * automatically enough. */ + lowater_signal = 0; while ((ar = TAILQ_FIRST(&audit_q))) { TAILQ_REMOVE(&audit_q, ar, k_q); audit_q_len--; - if (audit_q_len <= audit_qctrl.aq_lowater) - cv_broadcast(&audit_commit_cv); + if (audit_q_len == audit_qctrl.aq_lowater) + lowater_signal++; TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q); } + if (lowater_signal) + cv_broadcast(&audit_commit_cv); mtx_unlock(&audit_mtx); while ((ar = TAILQ_FIRST(&ar_worklist))) { From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 18 17:03:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F73116A41F for ; Sat, 18 Mar 2006 17:03:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99E1A43D46 for ; Sat, 18 Mar 2006 17:03:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7FABE46C35 for ; Sat, 18 Mar 2006 12:03:31 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AB1E4554A8; Sat, 18 Mar 2006 17:03:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A297116A425; Sat, 18 Mar 2006 17:03:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 69DC716A41F; Sat, 18 Mar 2006 17:03:54 +0000 (UTC) (envelope-from arr@watson.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id D03C043D46; Sat, 18 Mar 2006 17:03:53 +0000 (GMT) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost.watson.org [127.0.0.1]) by fledge.watson.org (8.13.4/8.13.4) with ESMTP id k2IH5391016269; Sat, 18 Mar 2006 12:05:03 -0500 (EST) (envelope-from arr@watson.org) Received: from localhost (arr@localhost) by fledge.watson.org (8.13.4/8.13.4/Submit) with ESMTP id k2IH53sh016266; Sat, 18 Mar 2006 12:05:03 -0500 (EST) (envelope-from arr@watson.org) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Sat, 18 Mar 2006 12:05:03 -0500 (EST) From: "Andrew R. Reiter" To: Robert Watson In-Reply-To: <200603181701.k2IH1r5x004312@repoman.freebsd.org> Message-ID: <20060318120450.C51324@fledge.watson.org> References: <200603181701.k2IH1r5x004312@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93511 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 17:03:58 -0000 Heh; you just read my mind (was about to email) On Sat, 18 Mar 2006, Robert Watson wrote: :http://perforce.freebsd.org/chv.cgi?CH=93511 : :Change 93511 by rwatson@rwatson_peppercorn on 2006/03/18 17:01:32 : : When pulling the global audit queue's contents into a thread-local : queue, generate one low water mark transition signal, rather than : many, and generate it only if actually crossing the transition : point, rather than every time we notice we're below it. : :Affected files ... : :.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#21 edit : :Differences ... : :==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#21 (text+ko) ==== : :@@ -555,7 +555,7 @@ : struct ucred *audit_cred; : struct thread *audit_td; : struct vnode *audit_vp; :- int error; :+ int error, lowater_signal; : : AUDIT_PRINTF(("audit_worker starting\n")); : :@@ -607,13 +607,16 @@ : * our own clustering, if the lower layers aren't doing it : * automatically enough. : */ :+ lowater_signal = 0; : while ((ar = TAILQ_FIRST(&audit_q))) { : TAILQ_REMOVE(&audit_q, ar, k_q); : audit_q_len--; :- if (audit_q_len <= audit_qctrl.aq_lowater) :- cv_broadcast(&audit_commit_cv); :+ if (audit_q_len == audit_qctrl.aq_lowater) :+ lowater_signal++; : TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q); : } :+ if (lowater_signal) :+ cv_broadcast(&audit_commit_cv); : : mtx_unlock(&audit_mtx); : while ((ar = TAILQ_FIRST(&ar_worklist))) { : : -- arr@watson.org From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 18 17:06:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED9BA16A425 for ; Sat, 18 Mar 2006 17:06:07 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA51C43D46 for ; Sat, 18 Mar 2006 17:06:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BB3A946C7D for ; Sat, 18 Mar 2006 12:05:40 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 997C655522; Sat, 18 Mar 2006 17:06:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9191116A422; Sat, 18 Mar 2006 17:06:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 70A4916A401 for ; Sat, 18 Mar 2006 17:06:03 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFA3943D45 for ; Sat, 18 Mar 2006 17:06:02 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 358F146B98; Sat, 18 Mar 2006 12:05:37 -0500 (EST) Date: Sat, 18 Mar 2006 17:07:12 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: "Andrew R. Reiter" In-Reply-To: <20060318120450.C51324@fledge.watson.org> Message-ID: <20060318170636.E578@fledge.watson.org> References: <200603181701.k2IH1r5x004312@repoman.freebsd.org> <20060318120450.C51324@fledge.watson.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93511 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 17:06:08 -0000 On Sat, 18 Mar 2006, Andrew R. Reiter wrote: > Heh; you just read my mind (was about to email) If you get bored, you should come hang out in #trustedbsd on EFNet so that we can perform more feats of mind-reading :-). Robert N M Watson > > On Sat, 18 Mar 2006, Robert Watson wrote: > > :http://perforce.freebsd.org/chv.cgi?CH=93511 > : > :Change 93511 by rwatson@rwatson_peppercorn on 2006/03/18 17:01:32 > : > : When pulling the global audit queue's contents into a thread-local > : queue, generate one low water mark transition signal, rather than > : many, and generate it only if actually crossing the transition > : point, rather than every time we notice we're below it. > : > :Affected files ... > : > :.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#21 edit > : > :Differences ... > : > :==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#21 (text+ko) ==== > : > :@@ -555,7 +555,7 @@ > : struct ucred *audit_cred; > : struct thread *audit_td; > : struct vnode *audit_vp; > :- int error; > :+ int error, lowater_signal; > : > : AUDIT_PRINTF(("audit_worker starting\n")); > : > :@@ -607,13 +607,16 @@ > : * our own clustering, if the lower layers aren't doing it > : * automatically enough. > : */ > :+ lowater_signal = 0; > : while ((ar = TAILQ_FIRST(&audit_q))) { > : TAILQ_REMOVE(&audit_q, ar, k_q); > : audit_q_len--; > :- if (audit_q_len <= audit_qctrl.aq_lowater) > :- cv_broadcast(&audit_commit_cv); > :+ if (audit_q_len == audit_qctrl.aq_lowater) > :+ lowater_signal++; > : TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q); > : } > :+ if (lowater_signal) > :+ cv_broadcast(&audit_commit_cv); > : > : mtx_unlock(&audit_mtx); > : while ((ar = TAILQ_FIRST(&ar_worklist))) { > : > : > > -- > arr@watson.org > From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 18 17:13:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 303B616A401 for ; Sat, 18 Mar 2006 17:13:38 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FB1843D49 for ; Sat, 18 Mar 2006 17:13:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 14FF546BFB for ; Sat, 18 Mar 2006 12:13:08 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9E4CE554A8; Sat, 18 Mar 2006 17:13:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 96F7216A425; Sat, 18 Mar 2006 17:13:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75CF716A420 for ; Sat, 18 Mar 2006 17:13:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27CE443D45 for ; Sat, 18 Mar 2006 17:13:10 +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 k2IHDA44004908 for ; Sat, 18 Mar 2006 17:13:10 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 k2IHD992004905 for perforce@freebsd.org; Sat, 18 Mar 2006 17:13:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 18 Mar 2006 17:13:09 GMT Message-Id: <200603181713.k2IHD992004905@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 93512 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 17:13:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=93512 Change 93512 by rwatson@rwatson_peppercorn on 2006/03/18 17:12:46 Integrate audit.c to audit_worker.c, so as to migrate the worker thread implementation to its own .c file. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#1 branch Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 18 17:23:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C518A16A401 for ; Sat, 18 Mar 2006 17:23:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E645643D45 for ; Sat, 18 Mar 2006 17:23:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 31CE246C63 for ; Sat, 18 Mar 2006 12:23:21 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 62A4F5570D; Sat, 18 Mar 2006 17:23:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BECD16A424; Sat, 18 Mar 2006 17:23:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A08916A420; Sat, 18 Mar 2006 17:23:44 +0000 (UTC) (envelope-from arr@watson.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66F3A43D48; Sat, 18 Mar 2006 17:23:43 +0000 (GMT) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost.watson.org [127.0.0.1]) by fledge.watson.org (8.13.4/8.13.4) with ESMTP id k2IHOqFx017248; Sat, 18 Mar 2006 12:24:52 -0500 (EST) (envelope-from arr@watson.org) Received: from localhost (arr@localhost) by fledge.watson.org (8.13.4/8.13.4/Submit) with ESMTP id k2IHOq99017245; Sat, 18 Mar 2006 12:24:52 -0500 (EST) (envelope-from arr@watson.org) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Sat, 18 Mar 2006 12:24:52 -0500 (EST) From: "Andrew R. Reiter" To: Robert Watson In-Reply-To: <20060318170636.E578@fledge.watson.org> Message-ID: <20060318122340.O51324@fledge.watson.org> References: <200603181701.k2IH1r5x004312@repoman.freebsd.org> <20060318120450.C51324@fledge.watson.org> <20060318170636.E578@fledge.watson.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93511 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 17:23:48 -0000 On Sat, 18 Mar 2006, Robert Watson wrote: : :On Sat, 18 Mar 2006, Andrew R. Reiter wrote: : :> Heh; you just read my mind (was about to email) : :If you get bored, you should come hang out in #trustedbsd on EFNet so that we :can perform more feats of mind-reading :-). :-) Not a bad idea. Been out of the computer zone for awhile ... decided to go part time and work on photography and videography so I'm feeling a bit more "excited" to work on projects; at least in any minor way. Thanks for the tip. I hope all is well and that life is treating you good. Cheers, Andrew : :Robert N M Watson : :> :> On Sat, 18 Mar 2006, Robert Watson wrote: :> :> :http://perforce.freebsd.org/chv.cgi?CH=93511 :> : :> :Change 93511 by rwatson@rwatson_peppercorn on 2006/03/18 17:01:32 :> : :> : When pulling the global audit queue's contents into a thread-local :> : queue, generate one low water mark transition signal, rather than :> : many, and generate it only if actually crossing the transition :> : point, rather than every time we notice we're below it. :> : :> :Affected files ... :> : :> :.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#21 edit :> : :> :Differences ... :> : :> :==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#21 :> (text+ko) ==== :> : :> :@@ -555,7 +555,7 @@ :> : struct ucred *audit_cred; :> : struct thread *audit_td; :> : struct vnode *audit_vp; :> :- int error; :> :+ int error, lowater_signal; :> : :> : AUDIT_PRINTF(("audit_worker starting\n")); :> : :> :@@ -607,13 +607,16 @@ :> : * our own clustering, if the lower layers aren't doing it :> : * automatically enough. :> : */ :> :+ lowater_signal = 0; :> : while ((ar = TAILQ_FIRST(&audit_q))) { :> : TAILQ_REMOVE(&audit_q, ar, k_q); :> : audit_q_len--; :> :- if (audit_q_len <= audit_qctrl.aq_lowater) :> :- cv_broadcast(&audit_commit_cv); :> :+ if (audit_q_len == audit_qctrl.aq_lowater) :> :+ lowater_signal++; :> : TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q); :> : } :> :+ if (lowater_signal) :> :+ cv_broadcast(&audit_commit_cv); :> : :> : mtx_unlock(&audit_mtx); :> : while ((ar = TAILQ_FIRST(&ar_worklist))) { :> : :> : :> :> -- :> arr@watson.org :> : : -- arr@watson.org From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 18 18:14:21 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 231D816A430 for ; Sat, 18 Mar 2006 18:14:21 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 711E443D45 for ; Sat, 18 Mar 2006 18:14:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id ECE2B46C62 for ; Sat, 18 Mar 2006 13:13:49 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B3798580D3; Sat, 18 Mar 2006 18:11:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AD43016A423; Sat, 18 Mar 2006 18:11:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86CB816A420 for ; Sat, 18 Mar 2006 18:11:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C987943D49 for ; Sat, 18 Mar 2006 18:11:20 +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 k2IIBKlv007883 for ; Sat, 18 Mar 2006 18:11:20 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 k2IIBKl0007880 for perforce@freebsd.org; Sat, 18 Mar 2006 18:11:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 18 Mar 2006 18:11:20 GMT Message-Id: <200603181811.k2IIBKl0007880@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 93514 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 18:14:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=93514 Change 93514 by rwatson@rwatson_peppercorn on 2006/03/18 18:10:34 Populate audit_worker.c using parts now removed from audit.c: - Move audit rotation global variables. - Move audit_record_write(), audit_worker_rotate(), audit_worker_drain(), audit_worker(), audit_rotate_vnode(). - Create audit_worker_init() from relevant parts of audit_init(), which now calls this routine. - Recreate audit_free(), which wraps uma_zfree() so that audit_record_zone can be static to audit.c. - Unstaticize various types and variables relating to the audit record queue so that audit_worker can get to them. We may want to wrap these in accessor methods at some point. - Move AUDIT_PRINTF() to audit_private.h. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#22 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#21 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#22 (text+ko) ==== @@ -69,20 +69,7 @@ #include -/* - * The AUDIT_EXCESSIVELY_VERBOSE define enables a number of - * gratuitously noisy printf's to the console. Due to the - * volume, it should be left off unless you want your system - * to churn a lot whenever the audit record flow gets high. - */ -//#define AUDIT_EXCESSIVELY_VERBOSE -#ifdef AUDIT_EXCESSIVELY_VERBOSE -#define AUDIT_PRINTF(x) printf x -#else -#define AUDIT_PRINTF(X) -#endif - -static uma_zone_t audit_record_zone; +static uma_zone_t audit_record_zone; static MALLOC_DEFINE(M_AUDITPROC, "audit_proc", "Audit process storage"); MALLOC_DEFINE(M_AUDITDATA, "audit_data", "Audit data storage"); MALLOC_DEFINE(M_AUDITPATH, "audit_path", "Audit path storage"); @@ -95,37 +82,37 @@ /* * Define the audit control flags. */ -int audit_enabled; -int audit_suspended; +int audit_enabled; +int audit_suspended; /* * Flags controlling behavior in low storage situations. * Should we panic if a write fails? Should we fail stop * if we're out of disk space? */ -int audit_panic_on_write_fail; -int audit_fail_stop; +int audit_panic_on_write_fail; +int audit_fail_stop; /* * Are we currently "failing stop" due to out of disk space? */ -static int audit_in_failure; +int audit_in_failure; /* * Global audit statistiscs. */ -struct audit_fstat audit_fstat; +struct audit_fstat audit_fstat; /* * Preselection mask for non-attributable events. */ -struct au_mask audit_nae_mask; +struct au_mask audit_nae_mask; /* * Mutex to protect global variables shared between various threads and * processes. */ -static struct mtx audit_mtx; +struct mtx audit_mtx; /* * Queue of audit records ready for delivery to disk. We insert new @@ -135,69 +122,39 @@ * not yet in the queue, which is needed to estimate the total * size of the combined set of records outstanding in the system. */ -static TAILQ_HEAD(, kaudit_record) audit_q; -static int audit_q_len; -static int audit_pre_q_len; +struct kaudit_queue audit_q; +int audit_q_len; +int audit_pre_q_len; /* * Audit queue control settings (minimum free, low/high water marks, etc.) */ -struct au_qctrl audit_qctrl; +struct au_qctrl audit_qctrl; /* * Condition variable to signal to the worker that it has work to do: * either new records are in the queue, or a log replacement is taking * place. */ -static struct cv audit_cv; - -/* - * Worker thread that will schedule disk I/O, etc. - */ -static struct proc *audit_thread; - -/* - * When an audit log is rotated, the actual rotation must be performed - * by the audit worker thread, as it may have outstanding writes on the - * current audit log. audit_replacement_vp holds the vnode replacing - * the current vnode. We can't let more than one replacement occur - * at a time, so if more than one thread requests a replacement, only - * one can have the replacement "in progress" at any given moment. If - * a thread tries to replace the audit vnode and discovers a replacement - * is already in progress (i.e., audit_replacement_flag != 0), then it - * will sleep on audit_replacement_cv waiting its turn to perform a - * 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; - -static int audit_replacement_flag; -static struct vnode *audit_replacement_vp; -static struct ucred *audit_replacement_cred; +struct cv audit_cv; /* * Condition variable to signal to the worker that it has work to do: * either new records are in the queue, or a log replacement is taking * place. + * + * XXXRW: This description is incorrect. */ -static struct cv audit_commit_cv; +struct cv audit_commit_cv; /* * Condition variable for auditing threads wait on when in fail-stop mode. * Threads wait on this CV forever (and ever), never seeing the light of * day again. */ -static struct cv audit_fail_cv; +static struct cv audit_fail_cv; /* - * Flags related to Kernel->user-space communication. - */ -static int audit_file_rotate_wait; - -/* * Construct an audit record for the passed thread. */ static int @@ -255,389 +212,6 @@ } /* - * 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) -{ - int ret; - long temp; - struct au_record *bsm; - struct vattr vattr; - struct statfs *mnt_stat = &vp->v_mount->mnt_stat; - int vfslocked; - - vfslocked = VFS_LOCK_GIANT(vp->v_mount); - - /* - * First, gather statistics on the audit log file and file system - * so that we know how we're doing on space. In both cases, - * if we're unable to perform the operation, we drop the record - * and return. However, this is arguably an assertion failure. - * XXX Need a FreeBSD equivalent. - */ - ret = VFS_STATFS(vp->v_mount, mnt_stat, td); - if (ret) - goto out; - - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - ret = VOP_GETATTR(vp, &vattr, cred, td); - VOP_UNLOCK(vp, 0, td); - if (ret) - goto out; - - /* update the global stats struct */ - audit_fstat.af_currsz = vattr.va_size; - - /* - * XXX Need to decide what to do if the trigger to the audit daemon - * fails. - */ - - /* - * If we fall below minimum free blocks (hard limit), tell the audit - * daemon to force a rotation off of the file system. We also stop - * writing, which means this audit record is probably lost. - * If we fall below the minimum percent free blocks (soft limit), - * then kindly suggest to the audit daemon to do something. - */ - if (mnt_stat->f_bfree < AUDIT_HARD_LIMIT_FREE_BLOCKS) { - (void)send_trigger(AUDIT_TRIGGER_NO_SPACE); - /* Hopefully userspace did something about all the previous - * triggers that were sent prior to this critical condition. - * If fail-stop is set, then we're done; goodnight Gracie. - */ - if (audit_fail_stop) - panic("Audit log space exhausted and fail-stop set."); - else { - audit_suspended = 1; - ret = ENOSPC; - goto out; - } - } else - /* - * 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 / - audit_qctrl.aq_minfree); - if (mnt_stat->f_bfree < temp) - (void)send_trigger(AUDIT_TRIGGER_LOW_SPACE); - } - - /* Check if the current log file is full; if so, call for - * a log rotate. This is not an exact comparison; we may - * write some records over the limit. If that's not - * acceptable, then add a fudge factor here. - */ - if ((audit_fstat.af_filesz != 0) && - (audit_file_rotate_wait == 0) && - (vattr.va_size >= audit_fstat.af_filesz)) { - audit_file_rotate_wait = 1; - (void)send_trigger(AUDIT_TRIGGER_OPEN_NEW); - } - - /* - * If the estimated amount of audit data in the audit event queue - * (plus records allocated but not yet queued) has reached the - * amount of free space on the disk, then we need to go into an - * audit fail stop state, in which we do not permit the - * allocation/committing of any new audit records. We continue to - * process packets but don't allow any activities that might - * generate new records. In the future, we might want to detect - * when space is available again and allow operation to continue, - * but this behavior is sufficient to meet fail stop requirements - * in CAPP. - */ - if (audit_fail_stop && - (unsigned long) - ((audit_q_len + audit_pre_q_len + 1) * MAX_AUDIT_RECORD_SIZE) / - mnt_stat->f_bsize >= (unsigned long)(mnt_stat->f_bfree)) { - printf("audit_record_write: free space below size of audit " - "queue, failing stop\n"); - audit_in_failure = 1; - } - - /* - * If there is a user audit record attached to the kernel record, - * then write the user record. - */ - /* XXX Need to decide a few things here: IF the user audit - * record is written, but the write of the kernel record fails, - * what to do? Should the kernel record come before or after the - * user record? For now, we write the user record first, and - * we ignore errors. - */ - if (ar->k_ar_commit & AR_COMMIT_USER) { - /* - * Try submitting the record to any active audit pipes. - */ - audit_pipe_submit((void *)ar->k_udata, ar->k_ulen); - - /* - * And to disk. - */ - ret = vn_rdwr(UIO_WRITE, vp, (void *)ar->k_udata, ar->k_ulen, - (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, - NULL, td); - if (ret) - goto out; - } - - /* - * Convert the internal kernel record to BSM format and write it - * out if everything's OK. - */ - if (!(ar->k_ar_commit & AR_COMMIT_KERNEL)) { - ret = 0; - 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; - goto out; - } - - /* - * XXX: We drop the record on BSM conversion failure, but really - * this is an assertion failure. - */ - if (ret == BSM_FAILURE) { - AUDIT_PRINTF(("BSM conversion failure\n")); - ret = EINVAL; - goto out; - } - - /* - * Try submitting the record to any active audit pipes. - */ - audit_pipe_submit((void *)bsm->data, bsm->len); - - /* - * XXX - * We should break the write functionality 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. - */ - ret = (vn_rdwr(UIO_WRITE, vp, (void *)bsm->data, bsm->len, - (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, NULL, td)); - - kau_free(bsm); - -out: - /* - * When we're done processing the current record, we have to - * check to see if we're in a failure mode, and if so, whether - * this was the last record left to be drained. If we're done - * draining, then we fsync the vnode and panic. - */ - 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, MNT_WAIT, td); - VOP_UNLOCK(vp, 0, td); - panic("Audit store overflow; record queue drained."); - } - - VFS_UNLOCK_GIANT(vfslocked); - - return (ret); -} - -/* - * If an appropriate signal has been received rotate the audit log based on - * the global replacement variables. Signal consumers as needed that the - * rotation has taken place. - * - * XXXRW: The global variables and CVs used to signal the audit_worker to - * perform a rotation are essentially a message queue of depth 1. It would - * be much nicer to actually use a message queue. - */ -static void -audit_worker_rotate(struct ucred **audit_credp, struct vnode **audit_vpp, - struct thread *audit_td) -{ - int do_replacement_signal, vfslocked; - struct ucred *old_cred; - struct vnode *old_vp; - - mtx_assert(&audit_mtx, MA_OWNED); - - do_replacement_signal = 0; - while (audit_replacement_flag != 0) { - old_cred = *audit_credp; - old_vp = *audit_vpp; - *audit_credp = audit_replacement_cred; - *audit_vpp = audit_replacement_vp; - audit_replacement_cred = NULL; - audit_replacement_vp = NULL; - audit_replacement_flag = 0; - - audit_enabled = (*audit_vpp != NULL); - - /* - * XXX: What to do about write failures here? - */ - if (old_vp != NULL) { - AUDIT_PRINTF(("Closing old audit file\n")); - mtx_unlock(&audit_mtx); - vfslocked = VFS_LOCK_GIANT(old_vp->v_mount); - vn_close(old_vp, AUDIT_CLOSE_FLAGS, old_cred, - audit_td); - VFS_UNLOCK_GIANT(vfslocked); - crfree(old_cred); - mtx_lock(&audit_mtx); - old_cred = NULL; - old_vp = NULL; - AUDIT_PRINTF(("Audit file closed\n")); - } - if (*audit_vpp != NULL) { - AUDIT_PRINTF(("Opening new audit file\n")); - } - do_replacement_signal = 1; - } - - /* - * Signal that replacement have occurred to wake up and - * start any other replacements started in parallel. We can - * continue about our business in the mean time. We - * broadcast so that both new replacements can be inserted, - * but also so that the source(s) of replacement can return - * successfully. - */ - if (do_replacement_signal) - cv_broadcast(&audit_replacement_cv); -} - -/* - * Drain the audit commit queue and free the records. Used if there are - * records present, but no audit log target. - */ -static void -audit_worker_drain(void) -{ - struct kaudit_record *ar; - - while ((ar = TAILQ_FIRST(&audit_q))) { - TAILQ_REMOVE(&audit_q, ar, k_q); - uma_zfree(audit_record_zone, ar); - audit_q_len--; - } -} - -/* - * 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. - */ -static void -audit_worker(void *arg) -{ - TAILQ_HEAD(, kaudit_record) ar_worklist; - struct kaudit_record *ar; - struct ucred *audit_cred; - struct thread *audit_td; - struct vnode *audit_vp; - int error, lowater_signal; - - AUDIT_PRINTF(("audit_worker starting\n")); - - /* - * These are thread-local variables requiring no synchronization. - */ - TAILQ_INIT(&ar_worklist); - audit_cred = NULL; - audit_td = curthread; - audit_vp = NULL; - - mtx_lock(&audit_mtx); - while (1) { - mtx_assert(&audit_mtx, MA_OWNED); - - /* - * Wait for record or rotation events. - */ - while (!audit_replacement_flag && TAILQ_EMPTY(&audit_q)) { - AUDIT_PRINTF(("audit_worker waiting\n")); - cv_wait(&audit_cv, &audit_mtx); - AUDIT_PRINTF(("audit_worker woken up\n")); - AUDIT_PRINTF(("audit_worker: new vp = %p; value of " - "flag %d\n", audit_replacement_vp, - audit_replacement_flag)); - } - - /* - * First priority: replace the audit log target if requested. - */ - audit_worker_rotate(&audit_cred, &audit_vp, audit_td); - - /* - * If we have records, but there's no active vnode to write - * to, drain the record queue. Generally, we prevent the - * unnecessary allocation of records elsewhere, but we need - * to allow for races between conditional allocation and - * queueing. Go back to waiting when we're done. - */ - if (audit_vp == NULL) { - audit_worker_drain(); - continue; - } - - /* - * We have both records to write and an active vnode to write - * to. Dequeue a record, and start the write. Eventually, - * it might make sense to dequeue several records and perform - * our own clustering, if the lower layers aren't doing it - * automatically enough. - */ - lowater_signal = 0; - while ((ar = TAILQ_FIRST(&audit_q))) { - TAILQ_REMOVE(&audit_q, ar, k_q); - audit_q_len--; - if (audit_q_len == audit_qctrl.aq_lowater) - lowater_signal++; - TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q); - } - if (lowater_signal) - cv_broadcast(&audit_commit_cv); - - mtx_unlock(&audit_mtx); - while ((ar = TAILQ_FIRST(&ar_worklist))) { - TAILQ_REMOVE(&ar_worklist, ar, k_q); - if (audit_vp != NULL) { - error = audit_record_write(audit_vp, ar, - audit_cred, audit_td); - if (error && audit_panic_on_write_fail) - panic("audit_worker: write error %d\n", - error); - else if (error) - printf("audit_worker: write error %d\n", - error); - } - uma_zfree(audit_record_zone, ar); - } - mtx_lock(&audit_mtx); - } -} - -/* * 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. @@ -645,7 +219,6 @@ static void audit_init(void) { - int error; printf("Security auditing service present\n"); audit_enabled = 0; @@ -654,10 +227,6 @@ audit_fail_stop = 0; audit_in_failure = 0; - audit_replacement_vp = NULL; - audit_replacement_cred = NULL; - audit_replacement_flag = 0; - audit_fstat.af_filesz = 0; /* '0' means unset, unbounded */ audit_fstat.af_currsz = 0; audit_nae_mask.am_success = AU_NULL; @@ -673,7 +242,6 @@ mtx_init(&audit_mtx, "audit_mtx", NULL, MTX_DEF); cv_init(&audit_cv, "audit_cv"); - cv_init(&audit_replacement_cv, "audit_replacement_cv"); cv_init(&audit_commit_cv, "audit_commit_cv"); cv_init(&audit_fail_cv, "audit_fail_cv"); @@ -684,83 +252,19 @@ /* Initialize the BSM audit subsystem. */ kau_init(); - audit_file_rotate_wait = 0; audit_trigger_init(); /* Register shutdown handler. */ EVENTHANDLER_REGISTER(shutdown_pre_sync, audit_shutdown, NULL, SHUTDOWN_PRI_FIRST); - error = kthread_create(audit_worker, NULL, &audit_thread, RFHIGHPID, - 0, "audit_worker"); - if (error != 0) - panic("audit_init: kthread_create returned %d", error); + /* Start audit worker thread. */ + audit_worker_init(); } 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. - */ -void -audit_rotate_vnode(struct ucred *cred, struct vnode *vp) -{ - - /* - * If other parallel log replacements have been requested, we wait - * until they've finished before continuing. - */ - mtx_lock(&audit_mtx); - while (audit_replacement_flag != 0) { - AUDIT_PRINTF(("audit_rotate_vnode: sleeping to wait for " - "flag\n")); - cv_wait(&audit_replacement_cv, &audit_mtx); - AUDIT_PRINTF(("audit_rotate_vnode: woken up (flag %d)\n", - audit_replacement_flag)); - } - audit_replacement_cred = cred; - audit_replacement_flag = 1; - audit_replacement_vp = vp; - - /* - * Wake up the audit worker to perform the exchange once we - * release the mutex. - */ - cv_signal(&audit_cv); - - /* - * Wait for the audit_worker to broadcast that a replacement has - * taken place; we know that once this has happened, our vnode - * has been replaced in, so we can return successfully. - */ - AUDIT_PRINTF(("audit_rotate_vnode: waiting for news of " - "replacement\n")); - cv_wait(&audit_replacement_cv, &audit_mtx); - AUDIT_PRINTF(("audit_rotate_vnode: change acknowledged by " - "audit_worker (flag " "now %d)\n", audit_replacement_flag)); - mtx_unlock(&audit_mtx); - - audit_file_rotate_wait = 0; /* We can now request another rotation */ -} - -/* * Drain the audit queue and close the log at shutdown. Note that this can * be called both from the system shutdown path and also from audit * configuration syscalls, so 'arg' and 'howto' are ignored. @@ -819,6 +323,13 @@ return (ar); } +void +audit_free(struct kaudit_record *ar) +{ + + uma_zfree(audit_record_zone, ar); +} + /* * MPSAFE */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#21 (text+ko) ==== @@ -53,6 +53,19 @@ #endif /* + * The AUDIT_EXCESSIVELY_VERBOSE define enables a number of gratuitously + * noisy printf's to the console. Due to the volume, it should be left off + * unless you want your system to churn a lot whenever the audit record flow + * gets high. + */ +//#define AUDIT_EXCESSIVELY_VERBOSE +#ifdef AUDIT_EXCESSIVELY_VERBOSE +#define AUDIT_PRINTF(x) printf x +#else +#define AUDIT_PRINTF(x) +#endif + +/* * Audit control variables that are usually set/read via system calls * and used to control various aspects of auditing. */ @@ -220,19 +233,20 @@ */ struct kaudit_record { struct audit_record k_ar; - u_int32_t k_ar_commit; + u_int32_t k_ar_commit; void *k_udata; /* user data */ u_int k_ulen; /* user data length */ struct uthread *k_uthread; /* thread we are auditing */ TAILQ_ENTRY(kaudit_record) k_q; }; +TAILQ_HEAD(kaudit_queue, kaudit_record); /* * Functions to manage the allocation, release, and commit of kernel audit * records. */ void audit_abort(struct kaudit_record *ar); -void audit_commit(struct kaudit_record *ar, int error, +void audit_commit(struct kaudit_record *ar, int error, int retval); struct kaudit_record *audit_new(int event, struct thread *td); @@ -258,7 +272,19 @@ #define AU_PRS_FAILURE 2 #define AU_PRS_BOTH (AU_PRS_SUCCESS|AU_PRS_FAILURE) -/* +/* + * Data structures relating to the kernel audit queue. Ideally, these might + * be abstracted so that only accessor methods are exposed. + */ +extern struct mtx audit_mtx; +extern struct cv audit_commit_cv; +extern struct cv audit_cv; +extern struct kaudit_queue audit_q; +extern int audit_q_len; +extern int audit_pre_q_len; +extern int audit_in_failure; + +/* * Flags to use on audit files when opening and closing. */ #define AUDIT_OPEN_FLAGS (FWRITE | O_APPEND) @@ -301,9 +327,11 @@ * General audit related functions. */ struct kaudit_record *currecord(void); +void audit_free(struct kaudit_record *ar); void audit_shutdown(void *arg, int howto); void audit_rotate_vnode(struct ucred *cred, struct vnode *vp); +void audit_worker_init(void); /* * Audit pipe functions. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.c,v 1.8 2006/03/04 17:00:55 rwatson Exp $ + * $FreeBSD$ */ #include @@ -70,91 +70,9 @@ #include /* - * The AUDIT_EXCESSIVELY_VERBOSE define enables a number of - * gratuitously noisy printf's to the console. Due to the - * volume, it should be left off unless you want your system - * to churn a lot whenever the audit record flow gets high. - */ -//#define AUDIT_EXCESSIVELY_VERBOSE -#ifdef AUDIT_EXCESSIVELY_VERBOSE -#define AUDIT_PRINTF(x) printf x -#else -#define AUDIT_PRINTF(X) -#endif - -static uma_zone_t audit_record_zone; -static MALLOC_DEFINE(M_AUDITPROC, "audit_proc", "Audit process storage"); -MALLOC_DEFINE(M_AUDITDATA, "audit_data", "Audit data storage"); -MALLOC_DEFINE(M_AUDITPATH, "audit_path", "Audit path storage"); -MALLOC_DEFINE(M_AUDITTEXT, "audit_text", "Audit text storage"); - -/* - * Audit control settings that are set/read by system calls and are - * hence non-static. - */ -/* - * Define the audit control flags. - */ -int audit_enabled; -int audit_suspended; - -/* - * Flags controlling behavior in low storage situations. - * Should we panic if a write fails? Should we fail stop - * if we're out of disk space? - */ -int audit_panic_on_write_fail; -int audit_fail_stop; - -/* - * Are we currently "failing stop" due to out of disk space? - */ -static int audit_in_failure; - -/* - * Global audit statistiscs. - */ -struct audit_fstat audit_fstat; - -/* - * Preselection mask for non-attributable events. - */ -struct au_mask audit_nae_mask; - -/* - * Mutex to protect global variables shared between various threads and - * processes. - */ -static struct mtx audit_mtx; - -/* - * Queue of audit records ready for delivery to disk. We insert new - * records at the tail, and remove records from the head. Also, - * a count of the number of records used for checking queue depth. - * In addition, a counter of records that we have allocated but are - * not yet in the queue, which is needed to estimate the total - * size of the combined set of records outstanding in the system. - */ -static TAILQ_HEAD(, kaudit_record) audit_q; -static int audit_q_len; -static int audit_pre_q_len; - -/* - * Audit queue control settings (minimum free, low/high water marks, etc.) - */ -struct au_qctrl audit_qctrl; - -/* - * Condition variable to signal to the worker that it has work to do: - * either new records are in the queue, or a log replacement is taking - * place. - */ -static struct cv audit_cv; - -/* * Worker thread that will schedule disk I/O, etc. */ -static struct proc *audit_thread; +static struct proc *audit_thread; /* * When an audit log is rotated, the actual rotation must be performed @@ -172,89 +90,18 @@ * * The current credential and vnode are thread-local to audit_worker. */ -static struct cv audit_replacement_cv; +static struct cv audit_replacement_cv; -static int audit_replacement_flag; -static struct vnode *audit_replacement_vp; -static struct ucred *audit_replacement_cred; - -/* - * Condition variable to signal to the worker that it has work to do: - * either new records are in the queue, or a log replacement is taking - * place. - */ -static struct cv audit_commit_cv; +static int audit_replacement_flag; +static struct vnode *audit_replacement_vp; +static struct ucred *audit_replacement_cred; -/* - * Condition variable for auditing threads wait on when in fail-stop mode. - * Threads wait on this CV forever (and ever), never seeing the light of - * day again. - */ -static struct cv audit_fail_cv; - /* * Flags related to Kernel->user-space communication. */ static int audit_file_rotate_wait; /* - * Construct an audit record for the passed thread. - */ -static int -audit_record_ctor(void *mem, int size, void *arg, int flags) -{ - struct kaudit_record *ar; - struct thread *td; - - KASSERT(sizeof(*ar) == size, ("audit_record_ctor: wrong size")); - - td = arg; - ar = mem; - bzero(ar, sizeof(*ar)); - ar->k_ar.ar_magic = AUDIT_RECORD_MAGIC; - nanotime(&ar->k_ar.ar_starttime); - - /* - * 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; - ar->k_ar.ar_subj_egid = td->td_ucred->cr_groups[0]; - ar->k_ar.ar_subj_auid = td->td_proc->p_au->ai_auid; - ar->k_ar.ar_subj_asid = td->td_proc->p_au->ai_asid; - 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 (0); -} - -static void -audit_record_dtor(void *mem, int size, void *arg) -{ - struct kaudit_record *ar; - - KASSERT(sizeof(*ar) == size, ("audit_record_dtor: wrong size")); - - ar = mem; - if (ar->k_ar.ar_arg_upath1 != NULL) - free(ar->k_ar.ar_arg_upath1, M_AUDITPATH); - if (ar->k_ar.ar_arg_upath2 != NULL) - free(ar->k_ar.ar_arg_upath2, M_AUDITPATH); - if (ar->k_ar.ar_arg_text != NULL) - free(ar->k_ar.ar_arg_text, M_AUDITTEXT); - if (ar->k_ar.ar_arg_iovecstr != NULL) - free(ar->k_ar.ar_arg_iovecstr, M_AUDITTEXT); - if (ar->k_udata != NULL) - free(ar->k_udata, M_AUDITDATA); -} - -/* * 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. @@ -534,7 +381,7 @@ while ((ar = TAILQ_FIRST(&audit_q))) { TAILQ_REMOVE(&audit_q, ar, k_q); - uma_zfree(audit_record_zone, ar); + audit_free(ar); audit_q_len--; } } @@ -631,75 +478,13 @@ printf("audit_worker: write error %d\n", error); } - uma_zfree(audit_record_zone, ar); + audit_free(ar); } mtx_lock(&audit_mtx); } } /* - * 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. - */ -static void -audit_init(void) -{ - int error; - - printf("Security auditing service present\n"); - audit_enabled = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Mar 18 18:25:14 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 91FA616A423 for ; Sat, 18 Mar 2006 18:25:14 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A032243D46 for ; Sat, 18 Mar 2006 18:25:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 65D1146BFB for ; Sat, 18 Mar 2006 13:24:46 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 60EAD72ACA; Sat, 18 Mar 2006 18:21:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E4D8D16A439; Sat, 18 Mar 2006 18:21:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF59216A425 for ; Sat, 18 Mar 2006 18:21:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85A4143D5E for ; Sat, 18 Mar 2006 18:21: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 k2IILXOI008526 for ; Sat, 18 Mar 2006 18:21: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 k2IILXqH008523 for perforce@freebsd.org; Sat, 18 Mar 2006 18:21:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 18 Mar 2006 18:21:33 GMT Message-Id: <200603181821.k2IILXqH008523@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 93515 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Mar 2006 18:25:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=93515 Change 93515 by rwatson@rwatson_peppercorn on 2006/03/18 18:21:26 Addition of audit_worker.c to kernel configuration, missed in earlier submit. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/conf/files#20 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/conf/files#20 (text+ko) ==== @@ -1842,6 +1842,7 @@ security/audit/audit_pipe.c optional audit security/audit/audit_syscalls.c standard security/audit/audit_trigger.c optional audit +security/audit/audit_worker.c optional audit security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 14:03:45 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF31B16A420 for ; Sun, 19 Mar 2006 14:03:45 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F9CF43D48 for ; Sun, 19 Mar 2006 14:03:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6CAEF46B42 for ; Sun, 19 Mar 2006 09:03:18 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 03A5855935; Sun, 19 Mar 2006 14:03:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F233B16A423; Sun, 19 Mar 2006 14:03:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1C2516A400 for ; Sun, 19 Mar 2006 14:03:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A8B343D46 for ; Sun, 19 Mar 2006 14:03: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 k2JE3giT000971 for ; Sun, 19 Mar 2006 14:03: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 k2JE3g88000968 for perforce@freebsd.org; Sun, 19 Mar 2006 14:03:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 14:03:42 GMT Message-Id: <200603191403.k2JE3g88000968@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 93567 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 14:03:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=93567 Change 93567 by rwatson@rwatson_zoo on 2006/03/19 14:03:11 Bump default queue limit for audit pipes from 32 to 128, since 32 is pretty small. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#12 (text+ko) ==== @@ -68,7 +68,7 @@ /* * Audit pipe buffer parameters. */ -#define AUDIT_PIPE_QLIMIT_DEFAULT (32) +#define AUDIT_PIPE_QLIMIT_DEFAULT (128) #define AUDIT_PIPE_QLIMIT_MIN (0) #define AUDIT_PIPE_QLIMIT_MAX (1024) From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 14:34:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F07616A420 for ; Sun, 19 Mar 2006 14:34:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D71FC43D45 for ; Sun, 19 Mar 2006 14:34:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BFEEB46BDC for ; Sun, 19 Mar 2006 09:33:57 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6B9C2558ED; Sun, 19 Mar 2006 14:34:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6546C16A423; Sun, 19 Mar 2006 14:34:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A1A916A420 for ; Sun, 19 Mar 2006 14:34:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC1DB43D45 for ; Sun, 19 Mar 2006 14:34:20 +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 k2JEYK23002115 for ; Sun, 19 Mar 2006 14:34:20 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 k2JEYJIE002112 for perforce@freebsd.org; Sun, 19 Mar 2006 14:34:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 14:34:19 GMT Message-Id: <200603191434.k2JEYJIE002112@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 93568 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 14:34:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=93568 Change 93568 by rwatson@rwatson_peppercorn on 2006/03/19 14:34:11 Normalize nested include guards. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#13 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#2 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#22 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#13 (text+ko) ==== @@ -34,8 +34,8 @@ * necessary for the kernel as a whole to interact with the audit subsystem. */ -#ifndef _BSM_AUDIT_KERNEL_H -#define _BSM_AUDIT_KERNEL_H +#ifndef _SECURITY_AUDIT_KERNEL_H_ +#define _SEUCRITY_AUDIT_KERNEL_H_ #ifndef _KERNEL #error "no user-serviceable parts inside" @@ -240,4 +240,4 @@ #endif /* AUDIT */ -#endif /* !_BSM_AUDIT_KERNEL_H */ +#endif /* !_SECURITY_AUDIT_KERNEL_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#2 (text+ko) ==== @@ -28,8 +28,8 @@ * $FreeBSD$ */ -#ifndef _SYS_SECURITY_AUDIT_AUDIT_IOCTL_H_ -#define _SYS_SECURITY_AUDIT_AUDIT_IOCTL_H_ +#ifndef _SECURITY_AUDIT_AUDIT_IOCTL_H_ +#define _SECURITY_AUDIT_AUDIT_IOCTL_H_ #define AUDITPIPE_IOBASE 'A' @@ -48,4 +48,4 @@ #define AUDITPIPE_GET_DROPS _IOR(AUDITPIPE_IOBASE, 102, u_int64_t) #define AUDITPIPE_GET_TRUNCATES _IOR(AUDITPIPE_IOBASE, 103, u_int64_t) -#endif /* _SYS_SECURITY_AUDIT_AUDIT_IOCTL_H_ */ +#endif /* _SECURITY_AUDIT_AUDIT_IOCTL_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#22 (text+ko) ==== @@ -34,8 +34,8 @@ * within the audit implementation. */ -#ifndef _BSM_AUDIT_PRIVATE_H -#define _BSM_AUDIT_PRIVATE_H +#ifndef _SECURITY_AUDIT_PRIVATE_H_ +#define _SECURITY_AUDIT_PRIVATE_H_ #ifndef _KERNEL #error "no user-serviceable parts inside" @@ -338,4 +338,4 @@ */ void audit_pipe_submit(void *record, u_int record_len); -#endif /* ! _BSM_AUDIT_PRIVATE_H */ +#endif /* ! _SECURITY_AUDIT_PRIVATE_H_ */ From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 14:38:32 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 098B316A400 for ; Sun, 19 Mar 2006 14:38:32 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4986243D48 for ; Sun, 19 Mar 2006 14:38:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E113D46BD0 for ; Sun, 19 Mar 2006 09:38:03 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1786255E17; Sun, 19 Mar 2006 14:37:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 108C916A420; Sun, 19 Mar 2006 14:37:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7A5E16A400 for ; Sun, 19 Mar 2006 14:37:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AED943D58 for ; Sun, 19 Mar 2006 14:37:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JEbOm4002324 for ; Sun, 19 Mar 2006 14:37: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 k2JEbOm0002321 for perforce@freebsd.org; Sun, 19 Mar 2006 14:37:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 14:37:24 GMT Message-Id: <200603191437.k2JEbOm0002321@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 93569 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 14:38:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=93569 Change 93569 by rwatson@rwatson_peppercorn on 2006/03/19 14:36:45 Do install sys/security/audit include files. It would be nice just to install audit_ioctl.h, but we seem only to support installing directories, so we get them all. The two not intended for extra- kernel use have !_KERNEL #error's, which should help. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#7 edit .. //depot/projects/trustedbsd/audit3/include/Makefile#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#7 (text+ko) ==== @@ -210,6 +210,8 @@ rpcsvc .. security + audit + .. mac_biba .. mac_bsdextended ==== //depot/projects/trustedbsd/audit3/include/Makefile#7 (text+ko) ==== @@ -47,6 +47,7 @@ isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ + security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 14:45:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 53D0B16A429 for ; Sun, 19 Mar 2006 14:45:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C4EB43D49 for ; Sun, 19 Mar 2006 14:45:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3E98746BD0 for ; Sun, 19 Mar 2006 09:45:14 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 24DE55557E; Sun, 19 Mar 2006 14:45:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E2AE16A422; Sun, 19 Mar 2006 14:45:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEC2616A420 for ; Sun, 19 Mar 2006 14:45:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B22A43D45 for ; Sun, 19 Mar 2006 14:45: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 k2JEjaxU002650 for ; Sun, 19 Mar 2006 14:45: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 k2JEjaxW002647 for perforce@freebsd.org; Sun, 19 Mar 2006 14:45:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 14:45:36 GMT Message-Id: <200603191445.k2JEjaxW002647@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 93570 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 14:45:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=93570 Change 93570 by rwatson@rwatson_peppercorn on 2006/03/19 14:45:26 Add audit pipe ioctls to query minimum and maximum audit queue lengths. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#3 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#3 (text+ko) ==== @@ -36,16 +36,18 @@ /* * Ioctls to read and control the behavior of individual audit pipe devices. */ -#define AUDITPIPE_GET_QLEN _IOR(AUDITPIPE_IOBASE, 1, u_int) -#define AUDITPIPE_GET_QLIMIT _IOR(AUDITPIPE_IOBASE, 2, u_int) -#define AUDITPIPE_SET_QLIMIT _IOW(AUDITPIPE_IOBASE, 3, u_int) +#define AUDITPIPE_GET_QLEN _IOR(AUDITPIPE_IOBASE, 1, u_int) +#define AUDITPIPE_GET_QLIMIT _IOR(AUDITPIPE_IOBASE, 2, u_int) +#define AUDITPIPE_SET_QLIMIT _IOW(AUDITPIPE_IOBASE, 3, u_int) +#define AUDITPIPE_GET_QLIMIT_MIN _IOR(AUDITPIPE_IOBASE, 4, u_int) +#define AUDITPIPE_GET_QLIMIT_MAX _IOR(AUDITPIPE_IOBASE, 5, u_int) /* * Ioctls to retrieve audit pipe statistics. */ -#define AUDITPIPE_GET_INSERTS _IOR(AUDITPIPE_IOBASE, 100, u_int64_t) -#define AUDITPIPE_GET_READS _IOR(AUDITPIPE_IOBASE, 101, u_int64_t) -#define AUDITPIPE_GET_DROPS _IOR(AUDITPIPE_IOBASE, 102, u_int64_t) -#define AUDITPIPE_GET_TRUNCATES _IOR(AUDITPIPE_IOBASE, 103, u_int64_t) +#define AUDITPIPE_GET_INSERTS _IOR(AUDITPIPE_IOBASE, 100, u_int64_t) +#define AUDITPIPE_GET_READS _IOR(AUDITPIPE_IOBASE, 101, u_int64_t) +#define AUDITPIPE_GET_DROPS _IOR(AUDITPIPE_IOBASE, 102, u_int64_t) +#define AUDITPIPE_GET_TRUNCATES _IOR(AUDITPIPE_IOBASE, 103, u_int64_t) #endif /* _SECURITY_AUDIT_AUDIT_IOCTL_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#13 (text+ko) ==== @@ -457,6 +457,16 @@ error = EINVAL; break; + case AUDITPIPE_GET_QLIMIT_MIN: + *(u_int *)data = AUDIT_PIPE_QLIMIT_MIN; + error = 0; + break; + + case AUDITPIPE_GET_QLIMIT_MAX: + *(u_int *)data = AUDIT_PIPE_QLIMIT_MAX; + error = 0; + break; + case AUDITPIPE_GET_INSERTS: *(u_int *)data = ap->ap_inserts; error = 0; From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 15:06:17 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 180EA16A422 for ; Sun, 19 Mar 2006 15:06:17 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 661B743D5D for ; Sun, 19 Mar 2006 15:06:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F36E446C8D for ; Sun, 19 Mar 2006 10:05:48 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AE0E2587E4; Sun, 19 Mar 2006 15:05:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A60FD16A42B; Sun, 19 Mar 2006 15:05:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8099916A428 for ; Sun, 19 Mar 2006 15:05:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51B5343D45 for ; Sun, 19 Mar 2006 15:05:01 +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 k2JF518i003311 for ; Sun, 19 Mar 2006 15:05:01 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 k2JF51kb003308 for perforce@freebsd.org; Sun, 19 Mar 2006 15:05:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 15:05:01 GMT Message-Id: <200603191505.k2JF51kb003308@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 93572 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 15:06:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=93572 Change 93572 by rwatson@rwatson_zoo on 2006/03/19 15:04:43 Simple audit pipe ioctl regression test. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/Makefile#1 add .. //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 17:11:46 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9ED1816A425 for ; Sun, 19 Mar 2006 17:11:46 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39EAC43D48 for ; Sun, 19 Mar 2006 17:11:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E1C2146C98 for ; Sun, 19 Mar 2006 12:11:15 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7CAB4556EA; Sun, 19 Mar 2006 17:11:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7366516A420; Sun, 19 Mar 2006 17:11:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 343D616A401 for ; Sun, 19 Mar 2006 17:11:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D741B43D46 for ; Sun, 19 Mar 2006 17:11:37 +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 k2JHBbF4016393 for ; Sun, 19 Mar 2006 17:11:37 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 k2JHBb3p016390 for perforce@freebsd.org; Sun, 19 Mar 2006 17:11:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 17:11:37 GMT Message-Id: <200603191711.k2JHBb3p016390@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 93581 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 17:11:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=93581 Change 93581 by rwatson@rwatson_peppercorn on 2006/03/19 17:10:38 Mega-style patch. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#23 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#14 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#15 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#11 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#4 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#23 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#12 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#23 (text+ko) ==== @@ -76,43 +76,43 @@ MALLOC_DEFINE(M_AUDITTEXT, "audit_text", "Audit text storage"); /* - * Audit control settings that are set/read by system calls and are + * Audit control settings that are set/read by system calls and are * hence non-static. */ -/* +/* * Define the audit control flags. */ -int audit_enabled; -int audit_suspended; +int audit_enabled; +int audit_suspended; /* * Flags controlling behavior in low storage situations. * Should we panic if a write fails? Should we fail stop * if we're out of disk space? */ -int audit_panic_on_write_fail; -int audit_fail_stop; +int audit_panic_on_write_fail; +int audit_fail_stop; /* * Are we currently "failing stop" due to out of disk space? */ -int audit_in_failure; +int audit_in_failure; /* - * Global audit statistiscs. + * Global audit statistiscs. */ -struct audit_fstat audit_fstat; +struct audit_fstat audit_fstat; /* * Preselection mask for non-attributable events. */ -struct au_mask audit_nae_mask; +struct au_mask audit_nae_mask; /* * Mutex to protect global variables shared between various threads and * processes. */ -struct mtx audit_mtx; +struct mtx audit_mtx; /* * Queue of audit records ready for delivery to disk. We insert new @@ -122,21 +122,21 @@ * not yet in the queue, which is needed to estimate the total * size of the combined set of records outstanding in the system. */ -struct kaudit_queue audit_q; -int audit_q_len; -int audit_pre_q_len; +struct kaudit_queue audit_q; +int audit_q_len; +int audit_pre_q_len; /* * Audit queue control settings (minimum free, low/high water marks, etc.) */ -struct au_qctrl audit_qctrl; +struct au_qctrl audit_qctrl; /* * Condition variable to signal to the worker that it has work to do: * either new records are in the queue, or a log replacement is taking * place. */ -struct cv audit_cv; +struct cv audit_cv; /* * Condition variable to signal to the worker that it has work to do: @@ -145,14 +145,14 @@ * * XXXRW: This description is incorrect. */ -struct cv audit_commit_cv; +struct cv audit_commit_cv; -/* - * Condition variable for auditing threads wait on when in fail-stop mode. - * Threads wait on this CV forever (and ever), never seeing the light of +/* + * Condition variable for auditing threads wait on when in fail-stop mode. + * Threads wait on this CV forever (and ever), never seeing the light of * day again. */ -static struct cv audit_fail_cv; +static struct cv audit_fail_cv; /* * Construct an audit record for the passed thread. @@ -228,7 +228,7 @@ audit_in_failure = 0; audit_fstat.af_filesz = 0; /* '0' means unset, unbounded */ - audit_fstat.af_currsz = 0; + audit_fstat.af_currsz = 0; audit_nae_mask.am_success = AU_NULL; audit_nae_mask.am_failure = AU_NULL; @@ -353,7 +353,7 @@ aumask = &audit_nae_mask; else aumask = &ar->k_ar.ar_subj_amask; - + if (error) sorf = AU_PRS_FAILURE; else @@ -363,7 +363,7 @@ case AUE_OPEN_RWTC: /* The open syscall always writes a AUE_OPEN_RWTC event; change - * it to the proper type of event based on the flags and the + * it to the proper type of event based on the flags and the * error value. */ ar->k_ar.ar_event = flags_and_error_to_openevent( @@ -421,7 +421,7 @@ uma_zfree(audit_record_zone, ar); return; } - + /* * Constrain the number of committed audit records based on * the configurable parameter. @@ -480,9 +480,9 @@ aumask = &audit_nae_mask; else aumask = &td->td_proc->p_au->ai_mask; - + /* - * Allocate an audit record, if preselection allows it, and store + * Allocate an audit record, if preselection allows it, and store * in the thread for later use. */ if (au_preselect(audit_event, aumask, @@ -533,7 +533,7 @@ audit_commit(td->td_ar, error, retval); if (td->td_ar != NULL) - AUDIT_PRINTF(("audit record committed by pid %d\n", + AUDIT_PRINTF(("audit record committed by pid %d\n", td->td_proc->p_pid)); td->td_ar = NULL; @@ -573,11 +573,11 @@ KASSERT(td->td_ar == NULL, ("audit_thread_free: td_ar != NULL")); } -/* - * Initialize the audit information for the a process, presumably the first +/* + * Initialize the audit information for the a process, presumably the first * process in the system. - * XXX It is not clear what the initial values should be for audit ID, - * session ID, etc. + * XXX It is not clear what the initial values should be for audit ID, + * session ID, etc. */ void audit_proc_kproc0(struct proc *p) @@ -600,7 +600,7 @@ p->p_au->ai_auid = AU_DEFAUDITID; } -/* +/* * Copy the audit info from the parent process to the child process when * a fork takes place. */ @@ -626,7 +626,7 @@ } /* - * Free the auditing structure for the process. + * Free the auditing structure for the process. */ void audit_proc_free(struct proc *p) ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#14 (text+ko) ==== @@ -76,7 +76,7 @@ #define ARG_AUID 0x0000000000000100ULL #define ARG_GID 0x0000000000000200ULL #define ARG_FD 0x0000000000000400ULL -#define ARG_POSIX_IPC_PERM 0x0000000000000800ULL +#define ARG_POSIX_IPC_PERM 0x0000000000000800ULL #define ARG_FFLAGS 0x0000000000001000ULL #define ARG_MODE 0x0000000000002000ULL #define ARG_DEV 0x0000000000004000ULL @@ -116,76 +116,67 @@ #define ARG_NONE 0x0000000000000000ULL #define ARG_ALL 0xFFFFFFFFFFFFFFFFULL -void audit_syscall_enter(unsigned short code, - struct thread *td); -void audit_syscall_exit(int error, struct thread *td); +void audit_syscall_enter(unsigned short code, struct thread *td); +void audit_syscall_exit(int error, struct thread *td); /* * The remaining kernel functions are conditionally compiled in as they - * are wrapped by a macro, and the macro should be the only place in + * are wrapped by a macro, and the macro should be the only place in * the source tree where these functions are referenced. */ #ifdef AUDIT struct ipc_perm; struct sockaddr; union auditon_udata; -void audit_arg_addr(void * addr); -void audit_arg_exit(int status, int retval); -void audit_arg_len(int len); -void audit_arg_fd(int fd); -void audit_arg_fflags(int fflags); -void audit_arg_gid(gid_t gid); -void audit_arg_uid(uid_t uid); -void audit_arg_egid(gid_t egid); -void audit_arg_euid(uid_t euid); -void audit_arg_rgid(gid_t rgid); -void audit_arg_ruid(uid_t ruid); -void audit_arg_sgid(gid_t sgid); -void audit_arg_suid(uid_t suid); -void audit_arg_groupset(gid_t *gidset, u_int gidset_size); -void audit_arg_login(char *login); -void audit_arg_ctlname(int *name, int namelen); -void audit_arg_mask(int mask); -void audit_arg_mode(mode_t mode); -void audit_arg_dev(int dev); -void audit_arg_value(long value); -void audit_arg_owner(uid_t uid, gid_t gid); -void audit_arg_pid(pid_t pid); -void audit_arg_process(struct proc *p); -void audit_arg_signum(u_int signum); -void audit_arg_socket(int sodomain, int sotype, - int soprotocol); -void audit_arg_sockaddr(struct thread *td, - struct sockaddr *so); -void audit_arg_auid(uid_t auid); -void audit_arg_auditinfo(struct auditinfo *au_info); -void audit_arg_upath(struct thread *td, char *upath, - u_int64_t flags); -void audit_arg_vnode(struct vnode *vp, u_int64_t flags); -void audit_arg_text(char *text); -void audit_arg_iovec(struct iovec *iov, - unsigned int iovcnt); -void audit_arg_cmd(int cmd); -void audit_arg_svipc_cmd(int cmd); -void audit_arg_svipc_perm(struct ipc_perm *perm); -void audit_arg_svipc_id(int id); -void audit_arg_svipc_addr(void *addr); -void audit_arg_posix_ipc_perm(uid_t uid, gid_t gid, - mode_t mode); -void audit_arg_auditon(union auditon_udata *udata); -void audit_arg_file(struct proc *p, struct file *fp); - -void audit_sysclose(struct thread *td, int fd); +void audit_arg_addr(void * addr); +void audit_arg_exit(int status, int retval); +void audit_arg_len(int len); +void audit_arg_fd(int fd); +void audit_arg_fflags(int fflags); +void audit_arg_gid(gid_t gid); +void audit_arg_uid(uid_t uid); +void audit_arg_egid(gid_t egid); +void audit_arg_euid(uid_t euid); +void audit_arg_rgid(gid_t rgid); +void audit_arg_ruid(uid_t ruid); +void audit_arg_sgid(gid_t sgid); +void audit_arg_suid(uid_t suid); +void audit_arg_groupset(gid_t *gidset, u_int gidset_size); +void audit_arg_login(char *login); +void audit_arg_ctlname(int *name, int namelen); +void audit_arg_mask(int mask); +void audit_arg_mode(mode_t mode); +void audit_arg_dev(int dev); +void audit_arg_value(long value); +void audit_arg_owner(uid_t uid, gid_t gid); +void audit_arg_pid(pid_t pid); +void audit_arg_process(struct proc *p); +void audit_arg_signum(u_int signum); +void audit_arg_socket(int sodomain, int sotype, int soprotocol); +void audit_arg_sockaddr(struct thread *td, struct sockaddr *so); +void audit_arg_auid(uid_t auid); +void audit_arg_auditinfo(struct auditinfo *au_info); +void audit_arg_upath(struct thread *td, char *upath, u_int64_t flags); +void audit_arg_vnode(struct vnode *vp, u_int64_t flags); +void audit_arg_text(char *text); +void audit_arg_iovec(struct iovec *iov, unsigned int iovcnt); +void audit_arg_cmd(int cmd); +void audit_arg_svipc_cmd(int cmd); +void audit_arg_svipc_perm(struct ipc_perm *perm); +void audit_arg_svipc_id(int id); +void audit_arg_svipc_addr(void *addr); +void audit_arg_posix_ipc_perm(uid_t uid, gid_t gid, mode_t mode); +void audit_arg_auditon(union auditon_udata *udata); +void audit_arg_file(struct proc *p, struct file *fp); +void audit_sysclose(struct thread *td, int fd); +void audit_proc_alloc(struct proc *p); +void audit_proc_kproc0(struct proc *p); +void audit_proc_init(struct proc *p); +void audit_proc_fork(struct proc *parent, struct proc *child); +void audit_proc_free(struct proc *p); +void audit_thread_alloc(struct thread *td); +void audit_thread_free(struct thread *td); -void audit_proc_alloc(struct proc *p); -void audit_proc_kproc0(struct proc *p); -void audit_proc_init(struct proc *p); -void audit_proc_fork(struct proc *parent, - struct proc *child); -void audit_proc_free(struct proc *p); -void audit_thread_alloc(struct thread *td); -void audit_thread_free(struct thread *td); - /* * Define a macro to wrap the audit_arg_* calls by checking the global * audit_enabled flag before performing the actual call. @@ -193,23 +184,23 @@ #define AUDIT_ARG(op, args...) do { \ if (audit_enabled) \ audit_arg_ ## op (args); \ - } while (0) +} while (0) #define AUDIT_SYSCALL_ENTER(code, td) do { \ if (audit_enabled) { \ audit_syscall_enter(code, td); \ } \ - } while (0) +} while (0) /* * Wrap the audit_syscall_exit() function so that it is called only when - * auditing is enabled, or we have a audit record on the thread. It is + * auditing is enabled, or we have a audit record on the thread. It is * possible that an audit record was begun before auditing was turned off. */ #define AUDIT_SYSCALL_EXIT(error, td) do { \ if (audit_enabled | (td->td_ar != NULL)) \ audit_syscall_exit(error, td); \ - } while (0) +} while (0) /* * A Macro to wrap the audit_sysclose() function. @@ -217,26 +208,25 @@ #define AUDIT_SYSCLOSE(td, fd) do { \ if (audit_enabled) \ audit_sysclose(td, fd); \ - } while (0) +} while (0) #else /* !AUDIT */ -void audit_proc_init(struct proc *p); -void audit_proc_fork(struct proc *parent, - struct proc *child); -void audit_proc_free(struct proc *p); +void audit_proc_init(struct proc *p); +void audit_proc_fork(struct proc *parent, struct proc *child); +void audit_proc_free(struct proc *p); #define AUDIT_ARG(op, args...) do { \ - } while (0) +} while (0) #define AUDIT_SYSCALL_ENTER(code, td) do { \ - } while (0) +} while (0) #define AUDIT_SYSCALL_EXIT(error, td) do { \ - } while (0) +} while (0) #define AUDIT_SYSCLOSE(p, fd) do { \ - } while (0) +} while (0) #endif /* AUDIT */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#15 (text+ko) ==== @@ -393,7 +393,7 @@ audit_arg_socket(int sodomain, int sotype, int soprotocol) { struct kaudit_record *ar; - + ar = currecord(); if (ar == NULL) return; @@ -428,7 +428,7 @@ break; case AF_UNIX: - audit_arg_upath(td, ((struct sockaddr_un *)so)->sun_path, + audit_arg_upath(td, ((struct sockaddr_un *)so)->sun_path, ARG_UPATH1); ARG_SET_VALID(ar, ARG_SADDRUNIX); break; @@ -482,7 +482,7 @@ /* Invalidate the text string */ ar->k_ar.ar_valid_arg &= (ARG_ALL ^ ARG_TEXT); if (text == NULL) - return; + return; if (ar->k_ar.ar_arg_text == NULL) ar->k_ar.ar_arg_text = malloc(MAXPATHLEN, M_AUDITTEXT, @@ -513,13 +513,11 @@ for (i = 0; i < iovcnt; i++) { if (!is_auditable_string(iov[i].iov_base, iov[i].iov_len)) continue; - if (first) { - ret = sbuf_printf(&sb, "%s", (char *)iov[i].iov_base); + ret = sbuf_printf(&sb, "%s", (char *)iov[i].iov_base); first = 0; - } else { + } else ret = sbuf_printf(&sb, ":%s", (char *)iov[i].iov_base); - } if (ret != 0) break; } @@ -564,8 +562,8 @@ if (ar == NULL) return; - bcopy(perm, &ar->k_ar.ar_arg_svipc_perm, - sizeof(ar->k_ar.ar_arg_svipc_perm)); + bcopy(perm, &ar->k_ar.ar_arg_svipc_perm, + sizeof(ar->k_ar.ar_arg_svipc_perm)); ARG_SET_VALID(ar, ARG_SVIPC_PERM); } @@ -619,8 +617,8 @@ if (ar == NULL) return; - bcopy((void *)udata, &ar->k_ar.ar_arg_auditon, - sizeof(ar->k_ar.ar_arg_auditon)); + bcopy((void *)udata, &ar->k_ar.ar_arg_auditon, + sizeof(ar->k_ar.ar_arg_auditon)); ARG_SET_VALID(ar, ARG_AUDITON); } @@ -667,20 +665,20 @@ if (so->so_pcb == NULL) return; ar->k_ar.ar_arg_sockinfo.so_type = - so->so_type; + so->so_type; ar->k_ar.ar_arg_sockinfo.so_domain = - INP_SOCKAF(so); + INP_SOCKAF(so); ar->k_ar.ar_arg_sockinfo.so_protocol = - so->so_proto->pr_protocol; + so->so_proto->pr_protocol; pcb = (struct inpcb *)so->so_pcb; ar->k_ar.ar_arg_sockinfo.so_raddr = - pcb->inp_faddr.s_addr; + pcb->inp_faddr.s_addr; ar->k_ar.ar_arg_sockinfo.so_laddr = - pcb->inp_laddr.s_addr; + pcb->inp_laddr.s_addr; ar->k_ar.ar_arg_sockinfo.so_rport = - pcb->inp_fport; + pcb->inp_fport; ar->k_ar.ar_arg_sockinfo.so_lport = - pcb->inp_lport; + pcb->inp_lport; ARG_SET_VALID(ar, ARG_SOCKINFO); } break; @@ -692,11 +690,11 @@ } -/* - * Store a path as given by the user process for auditing into the audit - * 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. +/* + * Store a path as given by the user process for auditing into the audit + * 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? */ @@ -706,7 +704,7 @@ struct kaudit_record *ar; char **pathp; - if (td == NULL || upath == NULL) + if (td == NULL || upath == NULL) return; /* nothing to do! */ /* @@ -735,8 +733,8 @@ } /* - * Function to save the path and vnode attr information into the audit - * record. + * Function to save the path and vnode attr information into the audit + * record. * * It is assumed that the caller will hold any vnode locks necessary to * perform a VOP_GETATTR() on the passed vnode. @@ -773,7 +771,7 @@ ASSERT_VOP_LOCKED(vp, "audit_arg_vnode"); ar = currecord(); - if (ar == NULL) /* This will be the case for unaudited system calls */ + if (ar == NULL) return; /* @@ -816,9 +814,9 @@ } /* - * The close() system call uses it's own audit call to capture the - * path/vnode information because those pieces are not easily obtained - * within the system call itself. + * The close() system call uses it's own audit call to capture the path/vnode + * information because those pieces are not easily obtained within the system + * call itself. */ void audit_sysclose(struct thread *td, int fd) @@ -839,4 +837,4 @@ VOP_UNLOCK(vp, 0, td); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); -} +} ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#11 (text+ko) ==== @@ -54,7 +54,7 @@ MALLOC_DEFINE(M_AUDITBSM, "audit_bsm", "Audit BSM data"); -/* +/* * Forward declares. */ static void audit_sys_auditon(struct audit_record *ar, @@ -72,18 +72,16 @@ } /* - * This call reserves memory for the audit record. - * Memory must be guaranteed before any auditable event can be - * generated. - * The au_record structure maintains a reference to the - * memory allocated above and also the list of tokens associated - * with this record - */ -static struct au_record * + * This call reserves memory for the audit record. Memory must be guaranteed + * before any auditable event can be generated. The au_record structure + * maintains a reference to the memory allocated above and also the list of + * tokens associated with this record + */ +static struct au_record * kau_open(void) -{ +{ struct au_record *rec; - + rec = malloc(sizeof(*rec), M_AUDITBSM, M_WAITOK); rec->data = malloc(MAX_AUDIT_RECORD_SIZE * sizeof(u_char), M_AUDITBSM, M_WAITOK | M_ZERO); @@ -96,7 +94,7 @@ /* * Store the token with the record descriptor. - */ + */ static void kau_write(struct au_record *rec, struct au_token *tok) { @@ -118,7 +116,7 @@ size_t tot_rec_size; token_t *cur, *hdr, *trail; struct timeval tm; - + tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; if (tot_rec_size <= MAX_AUDIT_RECORD_SIZE) { /* Create the header token */ @@ -131,34 +129,33 @@ TAILQ_INSERT_TAIL(&rec->token_q, trail, tokens); /* Serialize token data to the record. */ - rec->len = tot_rec_size; dptr = rec->data; TAILQ_FOREACH(cur, &rec->token_q, tokens) { - memcpy(dptr, cur->t_data, cur->len); + memcpy(dptr, cur->t_data, cur->len); dptr += cur->len; } } } /* - * Free a BSM audit record by releasing all the tokens and clearing the - * audit record information. + * Free a BSM audit record by releasing all the tokens and clearing the audit + * record information. */ void kau_free(struct au_record *rec) { struct au_token *tok; - /* Free the token list */ + /* Free the token list. */ while ((tok = TAILQ_FIRST(&rec->token_q))) { TAILQ_REMOVE(&rec->token_q, tok, tokens); free(tok->t_data, M_AUDITBSM); free(tok, M_AUDITBSM); - } + } rec->used = 0; - rec->len = 0; + rec->len = 0; free(rec->data, M_AUDITBSM); free(rec, M_AUDITBSM); } @@ -218,7 +215,8 @@ kau_write(rec, tok); \ } else { \ if (ARG_IS_VALID(kar, ARG_FD)) { \ - tok = au_to_arg32(1, "non-file: fd", ar->ar_arg_fd);\ + tok = au_to_arg32(1, "non-file: fd", \ + ar->ar_arg_fd); \ kau_write(rec, tok); \ } \ } \ @@ -250,92 +248,92 @@ struct au_token *tok; switch (ar->ar_arg_cmd) { - case A_SETPOLICY: + case A_SETPOLICY: if (sizeof(ar->ar_arg_auditon.au_flags) > 4) - tok = au_to_arg64(1, "policy", - ar->ar_arg_auditon.au_flags); + tok = au_to_arg64(1, "policy", + ar->ar_arg_auditon.au_flags); else - tok = au_to_arg32(1, "policy", - ar->ar_arg_auditon.au_flags); + tok = au_to_arg32(1, "policy", + ar->ar_arg_auditon.au_flags); kau_write(rec, tok); break; - case A_SETKMASK: - tok = au_to_arg32(2, "setkmask:as_success", - ar->ar_arg_auditon.au_mask.am_success); + case A_SETKMASK: + tok = au_to_arg32(2, "setkmask:as_success", + ar->ar_arg_auditon.au_mask.am_success); kau_write(rec, tok); - tok = au_to_arg32(2, "setkmask:as_failure", - ar->ar_arg_auditon.au_mask.am_failure); + tok = au_to_arg32(2, "setkmask:as_failure", + ar->ar_arg_auditon.au_mask.am_failure); kau_write(rec, tok); break; - case A_SETQCTRL: - tok = au_to_arg32(3, "setqctrl:aq_hiwater", - ar->ar_arg_auditon.au_qctrl.aq_hiwater); + case A_SETQCTRL: + tok = au_to_arg32(3, "setqctrl:aq_hiwater", + ar->ar_arg_auditon.au_qctrl.aq_hiwater); kau_write(rec, tok); - tok = au_to_arg32(3, "setqctrl:aq_lowater", - ar->ar_arg_auditon.au_qctrl.aq_lowater); + tok = au_to_arg32(3, "setqctrl:aq_lowater", + ar->ar_arg_auditon.au_qctrl.aq_lowater); kau_write(rec, tok); - tok = au_to_arg32(3, "setqctrl:aq_bufsz", - ar->ar_arg_auditon.au_qctrl.aq_bufsz); + tok = au_to_arg32(3, "setqctrl:aq_bufsz", + ar->ar_arg_auditon.au_qctrl.aq_bufsz); kau_write(rec, tok); - tok = au_to_arg32(3, "setqctrl:aq_delay", - ar->ar_arg_auditon.au_qctrl.aq_delay); + tok = au_to_arg32(3, "setqctrl:aq_delay", + ar->ar_arg_auditon.au_qctrl.aq_delay); kau_write(rec, tok); - tok = au_to_arg32(3, "setqctrl:aq_minfree", - ar->ar_arg_auditon.au_qctrl.aq_minfree); + tok = au_to_arg32(3, "setqctrl:aq_minfree", + ar->ar_arg_auditon.au_qctrl.aq_minfree); kau_write(rec, tok); break; - case A_SETUMASK: - tok = au_to_arg32(3, "setumask:as_success", - ar->ar_arg_auditon.au_auinfo.ai_mask.am_success); + case A_SETUMASK: + tok = au_to_arg32(3, "setumask:as_success", + ar->ar_arg_auditon.au_auinfo.ai_mask.am_success); kau_write(rec, tok); - tok = au_to_arg32(3, "setumask:as_failure", - ar->ar_arg_auditon.au_auinfo.ai_mask.am_failure); + tok = au_to_arg32(3, "setumask:as_failure", + ar->ar_arg_auditon.au_auinfo.ai_mask.am_failure); kau_write(rec, tok); break; - case A_SETSMASK: - tok = au_to_arg32(3, "setsmask:as_success", - ar->ar_arg_auditon.au_auinfo.ai_mask.am_success); + case A_SETSMASK: + tok = au_to_arg32(3, "setsmask:as_success", + ar->ar_arg_auditon.au_auinfo.ai_mask.am_success); kau_write(rec, tok); - tok = au_to_arg32(3, "setsmask:as_failure", - ar->ar_arg_auditon.au_auinfo.ai_mask.am_failure); + tok = au_to_arg32(3, "setsmask:as_failure", + ar->ar_arg_auditon.au_auinfo.ai_mask.am_failure); kau_write(rec, tok); break; - case A_SETCOND: + case A_SETCOND: if (sizeof(ar->ar_arg_auditon.au_cond) > 4) - tok = au_to_arg64(3, "setcond", - ar->ar_arg_auditon.au_cond); + tok = au_to_arg64(3, "setcond", + ar->ar_arg_auditon.au_cond); else - tok = au_to_arg32(3, "setcond", - ar->ar_arg_auditon.au_cond); + tok = au_to_arg32(3, "setcond", + ar->ar_arg_auditon.au_cond); kau_write(rec, tok); break; - case A_SETCLASS: + case A_SETCLASS: tok = au_to_arg32(2, "setclass:ec_event", - ar->ar_arg_auditon.au_evclass.ec_number); + ar->ar_arg_auditon.au_evclass.ec_number); kau_write(rec, tok); tok = au_to_arg32(3, "setclass:ec_class", - ar->ar_arg_auditon.au_evclass.ec_class); + ar->ar_arg_auditon.au_evclass.ec_class); kau_write(rec, tok); break; - case A_SETPMASK: - tok = au_to_arg32(2, "setpmask:as_success", - ar->ar_arg_auditon.au_aupinfo.ap_mask.am_success); + case A_SETPMASK: + tok = au_to_arg32(2, "setpmask:as_success", + ar->ar_arg_auditon.au_aupinfo.ap_mask.am_success); kau_write(rec, tok); - tok = au_to_arg32(2, "setpmask:as_failure", - ar->ar_arg_auditon.au_aupinfo.ap_mask.am_failure); + tok = au_to_arg32(2, "setpmask:as_failure", + ar->ar_arg_auditon.au_aupinfo.ap_mask.am_failure); kau_write(rec, tok); break; - case A_SETFSIZE: - tok = au_to_arg32(2, "setfsize:filesize", - ar->ar_arg_auditon.au_fstat.af_filesz); + case A_SETFSIZE: + tok = au_to_arg32(2, "setfsize:filesize", + ar->ar_arg_auditon.au_fstat.af_filesz); kau_write(rec, tok); break; @@ -345,13 +343,14 @@ } /* - * Convert an internal kernel audit record to a BSM record and return - * a success/failure indicator. The BSM record is passed as an out - * parameter to this function. + * Convert an internal kernel audit record to a BSM record and return a + * success/failure indicator. The BSM record is passed as an out parameter to + * this function. + * * Return conditions: * BSM_SUCCESS: The BSM record is valid * BSM_FAILURE: Failure; the BSM record is NULL. - * BSM_NOAUDIT: The event is not auditable for BSM; the BSM record is NULL. + * BSM_NOAUDIT: The event is not auditable for BSM; the BSM record is NULL. */ int kaudit_to_bsm(struct kaudit_record *kar, struct au_record **pau) @@ -380,35 +379,35 @@ ar->ar_subj_asid, /* session ID */ &tid); - /* The logic inside each case fills in the tokens required for the - * event, except for the header, trailer, and return tokens. The + /* + * The logic inside each case fills in the tokens required for the + * event, except for the header, trailer, and return tokens. The * header and trailer tokens are added by the kau_close() function. * The return token is added outside of the switch statement. - */ + */ switch(ar->ar_event) { - - /* - * Socket-related events. - */ case AUE_ACCEPT: case AUE_BIND: case AUE_CONNECT: case AUE_RECVFROM: - case AUE_RECVMSG: + case AUE_RECVMSG: case AUE_SENDMSG: case AUE_SENDTO: + /* + * Socket-related events. + */ if (ARG_IS_VALID(kar, ARG_FD)) { tok = au_to_arg32(1, "fd", ar->ar_arg_fd); kau_write(rec, tok); } if (ARG_IS_VALID(kar, ARG_SADDRINET)) { - tok = au_to_sock_inet( - (struct sockaddr_in *)&ar->ar_arg_sockaddr); + tok = au_to_sock_inet((struct sockaddr_in *) + &ar->ar_arg_sockaddr); kau_write(rec, tok); } if (ARG_IS_VALID(kar, ARG_SADDRUNIX)) { - tok = au_to_sock_unix( - (struct sockaddr_un *)&ar->ar_arg_sockaddr); + tok = au_to_sock_unix((struct sockaddr_un *) + &ar->ar_arg_sockaddr); kau_write(rec, tok); UPATH1_TOKENS; } @@ -469,21 +468,23 @@ case AUE_SETAUDIT: if (ARG_IS_VALID(kar, ARG_AUID)) { - tok = au_to_arg32(1, "setaudit:auid", ar->ar_arg_auid); + tok = au_to_arg32(1, "setaudit:auid", + ar->ar_arg_auid); kau_write(rec, tok); - tok = au_to_arg32(1, "setaudit:port", - ar->ar_arg_termid.port); + tok = au_to_arg32(1, "setaudit:port", + ar->ar_arg_termid.port); kau_write(rec, tok); - tok = au_to_arg32(1, "setaudit:machine", - ar->ar_arg_termid.machine); + tok = au_to_arg32(1, "setaudit:machine", + ar->ar_arg_termid.machine); kau_write(rec, tok); - tok = au_to_arg32(1, "setaudit:as_success", - ar->ar_arg_amask.am_success); + tok = au_to_arg32(1, "setaudit:as_success", + ar->ar_arg_amask.am_success); kau_write(rec, tok); - tok = au_to_arg32(1, "setaudit:as_failure", - ar->ar_arg_amask.am_failure); + tok = au_to_arg32(1, "setaudit:as_failure", + ar->ar_arg_amask.am_failure); kau_write(rec, tok); - tok = au_to_arg32(1, "setaudit:asid", ar->ar_arg_asid); + tok = au_to_arg32(1, "setaudit:asid", + ar->ar_arg_asid); kau_write(rec, tok); } break; @@ -492,7 +493,9 @@ break; /* XXX need to add arguments */ case AUE_AUDITON: - /* For AUDITON commands without own event, audit the cmd */ + /* + * For AUDITON commands without own event, audit the cmd. + */ if (ARG_IS_VALID(kar, ARG_CMD)) { tok = au_to_arg32(1, "cmd", ar->ar_arg_cmd); kau_write(rec, tok); @@ -515,11 +518,10 @@ case AUE_AUDITON_SETUMASK: case AUE_AUDITON_SPOLICY: case AUE_AUDITON_SQCTRL: - if (ARG_IS_VALID(kar, ARG_AUDITON)) { + if (ARG_IS_VALID(kar, ARG_AUDITON)) audit_sys_auditon(ar, rec); - } break; - + case AUE_AUDITCTL: UPATH1_VNODE1_TOKENS; break; @@ -544,7 +546,9 @@ case AUE_SETSID: case AUE_SETTIMEOFDAY: case AUE_NEWSYSTEMSHREG: - /* Header, subject, and return tokens added at end */ + /* + * Header, subject, and return tokens added at end. + */ break; case AUE_MKFIFO: @@ -584,16 +588,17 @@ } UPATH1_VNODE1_TOKENS; break; - + case AUE_CHMOD: case AUE_LCHMOD: if (ARG_IS_VALID(kar, ARG_MODE)) { - tok = au_to_arg32(2, "new file mode", ar->ar_arg_mode); + tok = au_to_arg32(2, "new file mode", + ar->ar_arg_mode); kau_write(rec, tok); } UPATH1_VNODE1_TOKENS; break; - + case AUE_CHOWN: case AUE_LCHOWN: if (ARG_IS_VALID(kar, ARG_UID)) { @@ -606,7 +611,7 @@ } UPATH1_VNODE1_TOKENS; break; - + case AUE_EXCHANGEDATA: UPATH1_VNODE1_TOKENS; UPATH2_TOKENS; @@ -622,12 +627,13 @@ case AUE_FCHMOD: if (ARG_IS_VALID(kar, ARG_MODE)) { - tok = au_to_arg32(2, "new file mode", ar->ar_arg_mode); + tok = au_to_arg32(2, "new file mode", + ar->ar_arg_mode); kau_write(rec, tok); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 18:30:16 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 293CC16A420 for ; Sun, 19 Mar 2006 18:30:16 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C94AF43D48 for ; Sun, 19 Mar 2006 18:30:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D565046BB2 for ; Sun, 19 Mar 2006 13:29:42 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DB7335C4F2; Sun, 19 Mar 2006 18:25:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D279616A422; Sun, 19 Mar 2006 18:25:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9555316A41F for ; Sun, 19 Mar 2006 18:25:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 448B143D48 for ; Sun, 19 Mar 2006 18:25:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JIP79L018997 for ; Sun, 19 Mar 2006 18:25:07 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 k2JIP6Gn018994 for perforce@freebsd.org; Sun, 19 Mar 2006 18:25:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 18:25:06 GMT Message-Id: <200603191825.k2JIP6Gn018994@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 93583 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 18:30:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=93583 Change 93583 by rwatson@rwatson_peppercorn on 2006/03/19 18:24:38 Rename audit_cv to audit_worker_cv, as it wakes up the audit worker. Rename audit_commit_cv to audit_watermark_cv, since it is there to wake up threads waiting on hitting the low watermark. Describe properly in comment. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#24 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#24 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#24 (text+ko) ==== @@ -136,16 +136,14 @@ * either new records are in the queue, or a log replacement is taking * place. */ -struct cv audit_cv; +struct cv audit_worker_cv; /* - * Condition variable to signal to the worker that it has work to do: - * either new records are in the queue, or a log replacement is taking - * place. - * - * XXXRW: This description is incorrect. + * Condition variable to flag when crossing the low watermark, meaning that + * threads blocked due to hitting the high watermark can wake up and continue + * to commit records. */ -struct cv audit_commit_cv; +struct cv audit_watermark_cv; /* * Condition variable for auditing threads wait on when in fail-stop mode. @@ -241,8 +239,8 @@ audit_qctrl.aq_minfree = AU_FS_MINFREE; mtx_init(&audit_mtx, "audit_mtx", NULL, MTX_DEF); - cv_init(&audit_cv, "audit_cv"); - cv_init(&audit_commit_cv, "audit_commit_cv"); + cv_init(&audit_worker_cv, "audit_worker_cv"); + cv_init(&audit_watermark_cv, "audit_watermark_cv"); cv_init(&audit_fail_cv, "audit_fail_cv"); audit_record_zone = uma_zcreate("audit_record_zone", @@ -429,7 +427,7 @@ while (audit_q_len >= audit_qctrl.aq_hiwater) { AUDIT_PRINTF(("audit_commit: sleeping to wait for " "audit queue to drain below high water mark\n")); - cv_wait(&audit_commit_cv, &audit_mtx); + cv_wait(&audit_watermark_cv, &audit_mtx); AUDIT_PRINTF(("audit_commit: woke up waiting for " "audit queue draining\n")); } @@ -437,7 +435,7 @@ TAILQ_INSERT_TAIL(&audit_q, ar, k_q); audit_q_len++; audit_pre_q_len--; - cv_signal(&audit_cv); + cv_signal(&audit_worker_cv); mtx_unlock(&audit_mtx); } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#24 (text+ko) ==== @@ -278,8 +278,8 @@ * be abstracted so that only accessor methods are exposed. */ extern struct mtx audit_mtx; -extern struct cv audit_commit_cv; -extern struct cv audit_cv; +extern struct cv audit_watermark_cv; +extern struct cv audit_worker_cv; extern struct kaudit_queue audit_q; extern int audit_q_len; extern int audit_pre_q_len; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#4 (text+ko) ==== @@ -420,7 +420,7 @@ */ while (!audit_replacement_flag && TAILQ_EMPTY(&audit_q)) { AUDIT_PRINTF(("audit_worker waiting\n")); - cv_wait(&audit_cv, &audit_mtx); + cv_wait(&audit_worker_cv, &audit_mtx); AUDIT_PRINTF(("audit_worker woken up\n")); AUDIT_PRINTF(("audit_worker: new vp = %p; value of " "flag %d\n", audit_replacement_vp, @@ -460,7 +460,7 @@ TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q); } if (lowater_signal) - cv_broadcast(&audit_commit_cv); + cv_broadcast(&audit_watermark_cv); mtx_unlock(&audit_mtx); while ((ar = TAILQ_FIRST(&ar_worklist))) { @@ -525,7 +525,7 @@ * Wake up the audit worker to perform the exchange once we * release the mutex. */ - cv_signal(&audit_cv); + cv_signal(&audit_worker_cv); /* * Wait for the audit_worker to broadcast that a replacement has From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 19:08:51 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D855416A494 for ; Sun, 19 Mar 2006 19:08:51 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38F5843D48 for ; Sun, 19 Mar 2006 19:08:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2B1DB46C30 for ; Sun, 19 Mar 2006 14:08:23 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 450A155818; Sun, 19 Mar 2006 19:08:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AF4216A427; Sun, 19 Mar 2006 19:08:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB90416A41F for ; Sun, 19 Mar 2006 19:08:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 932F243D48 for ; Sun, 19 Mar 2006 19:08:47 +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 k2JJ8lfx020333 for ; Sun, 19 Mar 2006 19:08:47 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 k2JJ8lEf020330 for perforce@freebsd.org; Sun, 19 Mar 2006 19:08:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 19:08:47 GMT Message-Id: <200603191908.k2JJ8lEf020330@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 93587 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 19:08:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=93587 Change 93587 by rwatson@rwatson_peppercorn on 2006/03/19 19:07:46 Use struct kaudit_queue instead of a hand-crafted queue type for audit records in the audit_worker thread. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#5 (text+ko) ==== @@ -394,7 +394,7 @@ static void audit_worker(void *arg) { - TAILQ_HEAD(, kaudit_record) ar_worklist; + struct kaudit_queue ar_worklist; struct kaudit_record *ar; struct ucred *audit_cred; struct thread *audit_td; From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 19:21:11 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 081BF16A427 for ; Sun, 19 Mar 2006 19:21:11 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3198C43D48 for ; Sun, 19 Mar 2006 19:21:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 67C9646C78 for ; Sun, 19 Mar 2006 14:20:40 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9382956794; Sun, 19 Mar 2006 19:21:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B96216A423; Sun, 19 Mar 2006 19:21:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C17D16A41F for ; Sun, 19 Mar 2006 19:21:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9A3E43D53 for ; Sun, 19 Mar 2006 19:21: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 k2JJL2DD020894 for ; Sun, 19 Mar 2006 19:21: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 k2JJL2Ek020891 for perforce@freebsd.org; Sun, 19 Mar 2006 19:21:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 19:21:02 GMT Message-Id: <200603191921.k2JJL2Ek020891@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 93588 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 19:21:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=93588 Change 93588 by rwatson@rwatson_peppercorn on 2006/03/19 19:20:12 Assert audit mtx in audit_worker_drain(). Break out logic to call audit_record_write() and handle error conditions into audit_worker_process_record(). This will be the future home of some logic now present in audit_record_write() also. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#6 (text+ko) ==== @@ -376,6 +376,8 @@ { struct kaudit_record *ar; + mtx_assert(&audit_mtx, MA_OWNED); + while ((ar = TAILQ_FIRST(&audit_q))) { TAILQ_REMOVE(&audit_q, ar, k_q); audit_free(ar); @@ -384,6 +386,31 @@ } /* + * Given a kernel audit record, process as required. Currently, that means + * passing it to audit_record_write(), but in the future it will mean + * converting it to BSM and then routing it to various possible output + * streams, including the audit trail and audit pipes. The caller will free + * the record. + */ +static void +audit_worker_process_record(struct vnode *audit_vp, struct ucred *audit_cred, + struct thread *audit_td, struct kaudit_record *ar) +{ + int error; + + if (audit_vp == NULL) + return; + + error = audit_record_write(audit_vp, ar, audit_cred, audit_td); + if (error) { + if (audit_panic_on_write_fail) + panic("audit_worker: write error %d\n", error); + else + printf("audit_worker: write error %d\n", error); + } +} + +/* * 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 @@ -399,7 +426,7 @@ struct ucred *audit_cred; struct thread *audit_td; struct vnode *audit_vp; - int error, lowater_signal; + int lowater_signal; AUDIT_PRINTF(("audit_worker starting\n")); @@ -465,16 +492,8 @@ mtx_unlock(&audit_mtx); while ((ar = TAILQ_FIRST(&ar_worklist))) { TAILQ_REMOVE(&ar_worklist, ar, k_q); - if (audit_vp != NULL) { - error = audit_record_write(audit_vp, ar, - audit_cred, audit_td); - if (error && audit_panic_on_write_fail) - panic("audit_worker: write error %d\n", - error); - else if (error) - printf("audit_worker: write error %d\n", - error); - } + audit_worker_process_record(audit_vp, audit_cred, + audit_td, ar); audit_free(ar); } mtx_lock(&audit_mtx); From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 20:22:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D6AD16A400 for ; Sun, 19 Mar 2006 20:22:29 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B681143D45 for ; Sun, 19 Mar 2006 20:22:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7039E46B92 for ; Sun, 19 Mar 2006 15:22:24 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 43AF2555EE; Sun, 19 Mar 2006 20:22:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BD6116A423; Sun, 19 Mar 2006 20:22:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17CAE16A420 for ; Sun, 19 Mar 2006 20:22:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB6D243D45 for ; Sun, 19 Mar 2006 20:22:22 +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 k2JKMMYI023304 for ; Sun, 19 Mar 2006 20:22:22 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 k2JKMMg1023301 for perforce@freebsd.org; Sun, 19 Mar 2006 20:22:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 20:22:22 GMT Message-Id: <200603192022.k2JKMMg1023301@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 93595 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 20:22:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=93595 Change 93595 by rwatson@rwatson_peppercorn on 2006/03/19 20:22:12 Pull BSM conversion logic out of audit_record_write(), as well as knowledge of user vs. kernel audit records into audit_worker_process_record(). This largely confines vnode knowledge to audit_record_write(), but avoids that logic knowing about BSM as opposed to byte streams. This will allow us to improve our ability to support real-time audit stream processing by audit pipe consumers while auditing is disabled, but this support is not yet complete. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#7 (text+ko) ==== @@ -109,16 +109,18 @@ * we accounted for. */ static int -audit_record_write(struct vnode *vp, struct kaudit_record *ar, - struct ucred *cred, struct thread *td) +audit_record_write(struct vnode *vp, struct ucred *cred, struct thread *td, + void *data, size_t len) { int ret; long temp; - struct au_record *bsm; struct vattr vattr; struct statfs *mnt_stat = &vp->v_mount->mnt_stat; int vfslocked; + if (vp == NULL) + return (0); + vfslocked = VFS_LOCK_GIANT(vp->v_mount); /* @@ -214,75 +216,9 @@ audit_in_failure = 1; } - /* - * If there is a user audit record attached to the kernel record, - * then write the user record. - * - * XXX Need to decide a few things here: IF the user audit record is - * written, but the write of the kernel record fails, what to do? - * Should the kernel record come before or after the user record? - * For now, we write the user record first, and we ignore errors. - */ - if (ar->k_ar_commit & AR_COMMIT_USER) { - /* - * Try submitting the record to any active audit pipes. - */ - audit_pipe_submit((void *)ar->k_udata, ar->k_ulen); - - /* - * And to disk. - */ - ret = vn_rdwr(UIO_WRITE, vp, (void *)ar->k_udata, ar->k_ulen, - (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, - NULL, td); - if (ret) - goto out; - } - - /* - * Convert the internal kernel record to BSM format and write it out - * if everything's OK. - */ - if (!(ar->k_ar_commit & AR_COMMIT_KERNEL)) { - ret = 0; - 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; - goto out; - } - - /* - * XXX: We drop the record on BSM conversion failure, but really this - * is an assertion failure. - */ - if (ret == BSM_FAILURE) { - AUDIT_PRINTF(("BSM conversion failure\n")); - ret = EINVAL; - goto out; - } - - /* - * Try submitting the record to any active audit pipes. - */ - audit_pipe_submit((void *)bsm->data, bsm->len); + ret = vn_rdwr(UIO_WRITE, vp, data, len, (off_t)0, UIO_SYSSPACE, + IO_APPEND|IO_UNIT, cred, NULL, NULL, td); - /* - * XXX We should break the write functionality 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. - */ - ret = (vn_rdwr(UIO_WRITE, vp, (void *)bsm->data, bsm->len, (off_t)0, - UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, NULL, td)); - kau_free(bsm); - out: /* * When we're done processing the current record, we have to check to @@ -386,27 +322,55 @@ } /* - * Given a kernel audit record, process as required. Currently, that means - * passing it to audit_record_write(), but in the future it will mean - * converting it to BSM and then routing it to various possible output - * streams, including the audit trail and audit pipes. The caller will free - * the record. + * Given a kernel audit record, process as required. Kernel audit records + * are converted to one, or possibly two, BSM records, depending on whether + * there is a user audit record present also. Kernel records need be + * converted to BSM before they can be written out. Both types will be + * written to disk, and audit pipes. */ static void audit_worker_process_record(struct vnode *audit_vp, struct ucred *audit_cred, struct thread *audit_td, struct kaudit_record *ar) { - int error; + struct au_record *bsm; + int error, ret; - if (audit_vp == NULL) - return; - - error = audit_record_write(audit_vp, ar, audit_cred, audit_td); - if (error) { - if (audit_panic_on_write_fail) + if (ar->k_ar_commit & AR_COMMIT_USER) { + error = audit_record_write(audit_vp, audit_cred, audit_td, + ar->k_udata, ar->k_ulen); + if (error && audit_panic_on_write_fail) panic("audit_worker: write error %d\n", error); - else + else if (error) printf("audit_worker: write error %d\n", error); + audit_pipe_submit(ar->k_udata, ar->k_ulen); + } + + if (ar->k_ar_commit & AR_COMMIT_KERNEL) { + ret = kaudit_to_bsm(ar, &bsm); + switch (ret) { + case BSM_NOAUDIT: + break; + + case BSM_FAILURE: + printf("audit_worker_process_record: BSM_FAILURE\n"); + break; + + case BSM_SUCCESS: + error = audit_record_write(audit_vp, audit_cred, + audit_td, bsm->data, bsm->len); + if (error && audit_panic_on_write_fail) + panic("audit_worker: write error %d\n", + error); + else if (error) + printf("audit_worker: write error %d\n", + error); + audit_pipe_submit(bsm->data, bsm->len); + kau_free(bsm); + break; + + default: + panic("kaudit_to_bsm returned %d", ret); + } } } From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 20:25:33 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECE7116A401 for ; Sun, 19 Mar 2006 20:25:32 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F0E643D45 for ; Sun, 19 Mar 2006 20:25:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C758846BAF for ; Sun, 19 Mar 2006 15:25:29 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A725C55816; Sun, 19 Mar 2006 20:25:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EC3E16A423; Sun, 19 Mar 2006 20:25:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E39A16A401 for ; Sun, 19 Mar 2006 20:25:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D7F443D49 for ; Sun, 19 Mar 2006 20:25: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 k2JKPQHl023422 for ; Sun, 19 Mar 2006 20:25: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 k2JKPQYd023419 for perforce@freebsd.org; Sun, 19 Mar 2006 20:25:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 20:25:26 GMT Message-Id: <200603192025.k2JKPQYd023419@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 93596 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 20:25:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=93596 Change 93596 by rwatson@rwatson_peppercorn on 2006/03/19 20:24:58 No longer unconditionally drain the audit record queue if there is not an active audit trail: instead, continue to iterate through each record in case an audit pipe is interested. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#8 (text+ko) ==== @@ -304,24 +304,6 @@ } /* - * Drain the audit commit queue and free the records. Used if there are - * records present, but no audit log target. - */ -static void -audit_worker_drain(void) -{ - struct kaudit_record *ar; - - mtx_assert(&audit_mtx, MA_OWNED); - - while ((ar = TAILQ_FIRST(&audit_q))) { - TAILQ_REMOVE(&audit_q, ar, k_q); - audit_free(ar); - audit_q_len--; - } -} - -/* * Given a kernel audit record, process as required. Kernel audit records * are converted to one, or possibly two, BSM records, depending on whether * there is a user audit record present also. Kernel records need be @@ -424,23 +406,11 @@ audit_worker_rotate(&audit_cred, &audit_vp, audit_td); /* - * If we have records, but there's no active vnode to write - * to, drain the record queue. Generally, we prevent the - * unnecessary allocation of records elsewhere, but we need - * to allow for races between conditional allocation and - * queueing. Go back to waiting when we're done. - */ - if (audit_vp == NULL) { - audit_worker_drain(); - continue; - } - - /* - * We have both records to write and an active vnode to write - * to. Dequeue a record, and start the write. Eventually, - * it might make sense to dequeue several records and perform - * our own clustering, if the lower layers aren't doing it - * automatically enough. + * If there are records in the global audit record queue, + * transfer them to a thread-local queue and process them + * one by one. If we cross the low watermark threshold, + * signal any waiting processes that they may wake up and + * continue generating records. */ lowater_signal = 0; while ((ar = TAILQ_FIRST(&audit_q))) { From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 20:57:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E61D16A401 for ; Sun, 19 Mar 2006 20:57:08 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4C1543D49 for ; Sun, 19 Mar 2006 20:57:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1E13046C82 for ; Sun, 19 Mar 2006 15:57:07 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4D65D5592A; Sun, 19 Mar 2006 20:57:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4562216A422; Sun, 19 Mar 2006 20:57:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 205EA16A41F for ; Sun, 19 Mar 2006 20:57:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E32D943D49 for ; Sun, 19 Mar 2006 20:57:05 +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 k2JKv5jI032505 for ; Sun, 19 Mar 2006 20:57:05 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 k2JKv5RZ032502 for perforce@freebsd.org; Sun, 19 Mar 2006 20:57:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 20:57:05 GMT Message-Id: <200603192057.k2JKv5RZ032502@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 93598 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 20:57:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=93598 Change 93598 by rwatson@rwatson_peppercorn on 2006/03/19 20:56:21 Shorten audit record zone name. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#25 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#25 (text+ko) ==== @@ -243,7 +243,7 @@ cv_init(&audit_watermark_cv, "audit_watermark_cv"); cv_init(&audit_fail_cv, "audit_fail_cv"); - audit_record_zone = uma_zcreate("audit_record_zone", + audit_record_zone = uma_zcreate("audit_record", sizeof(struct kaudit_record), audit_record_ctor, audit_record_dtor, NULL, NULL, UMA_ALIGN_PTR, 0); From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 21:32:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0CA3416A423 for ; Sun, 19 Mar 2006 21:32:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38D9B43D48 for ; Sun, 19 Mar 2006 21:32:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 87A8246B9A for ; Sun, 19 Mar 2006 16:32:44 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2F8047274B; Sun, 19 Mar 2006 21:31:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 24DC416A423; Sun, 19 Mar 2006 21:31:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F38D716A41F for ; Sun, 19 Mar 2006 21:31:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C029743D45 for ; Sun, 19 Mar 2006 21:31:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JLVox0034101 for ; Sun, 19 Mar 2006 21:31:50 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 k2JLVo0m034098 for perforce@freebsd.org; Sun, 19 Mar 2006 21:31:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 21:31:50 GMT Message-Id: <200603192131.k2JLVo0m034098@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 93603 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 21:32:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=93603 Change 93603 by rwatson@rwatson_peppercorn on 2006/03/19 21:31:14 Rename wait_for_triggers() to wait_for_events(), as it is waiting for both triggers and signals to perform state transitions. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#14 $ */ #include @@ -596,10 +596,10 @@ } /* - * Read the control file for triggers and handle appropriately. + * Read the control file for triggers/signals and handle appropriately. */ static int -wait_for_triggers(void) +wait_for_events(void) { int num; unsigned int trigger; @@ -814,7 +814,7 @@ setup(); - rc = wait_for_triggers(); + rc = wait_for_events(); syslog(LOG_INFO, "auditd exiting.\n"); exit(rc); From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 21:52:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E6CB916A420 for ; Sun, 19 Mar 2006 21:52:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A63743D70 for ; Sun, 19 Mar 2006 21:52:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F3DAC46C2C for ; Sun, 19 Mar 2006 16:52:10 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2C4D055723; Sun, 19 Mar 2006 21:50:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 22CF116A424; Sun, 19 Mar 2006 21:50:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC21F16A422 for ; Sun, 19 Mar 2006 21:50:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFD3A43D68 for ; Sun, 19 Mar 2006 21:50:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JLoDPa034973 for ; Sun, 19 Mar 2006 21:50:13 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 k2JLoDCQ034970 for perforce@freebsd.org; Sun, 19 Mar 2006 21:50:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 21:50:13 GMT Message-Id: <200603192150.k2JLoDCQ034970@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 93605 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 21:52:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=93605 Change 93605 by rwatson@rwatson_peppercorn on 2006/03/19 21:49:49 Set some syslog() calls to LOG_DEBUG and LOG_ERR instead of LOG_INFO. Remove carriage returns from log messages. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#15 $ */ #include @@ -127,7 +127,7 @@ const char *sep = "/"; curdir = dirent->dirname; - syslog(LOG_INFO, "dir = %s\n", dirent->dirname); + syslog(LOG_DEBUG, "dir = %s", dirent->dirname); fn = malloc(strlen(curdir) + strlen(sep) + (2 * POSTFIX_LEN) + 1); if (fn == NULL) @@ -158,10 +158,10 @@ *ptr = '.'; strcpy(ptr+1, TS); if (rename(oldname, lastfile) != 0) - syslog(LOG_ERR, "Could not rename %s to %s \n", + syslog(LOG_ERR, "Could not rename %s to %s", oldname, lastfile); else - syslog(LOG_INFO, "renamed %s to %s \n", + syslog(LOG_INFO, "renamed %s to %s", oldname, lastfile); } free(lastfile); @@ -241,7 +241,7 @@ /* Try until we succeed. */ while ((dirent = TAILQ_FIRST(&dir_q))) { if ((fn = affixdir(timestr, dirent)) == NULL) { - syslog(LOG_INFO, "Failed to swap log at time %s\n", + syslog(LOG_INFO, "Failed to swap log at time %s", timestr); return (-1); } @@ -250,7 +250,7 @@ * Create and open the file; then close and pass to the * kernel if all went well. */ - syslog(LOG_INFO, "New audit file is %s\n", fn); + syslog(LOG_INFO, "New audit file is %s", fn); #ifdef AUDIT_REVIEW_GROUP fd = open_trail(fn, uid, gid); #else @@ -262,7 +262,7 @@ error = auditctl(fn); if (error) { syslog(LOG_ERR, - "auditctl failed setting log file! : %s\n", + "auditctl failed setting log file! : %s", strerror(errno)); close(fd); } else { @@ -284,7 +284,7 @@ free(dirent->dirname); free(dirent); } - syslog(LOG_INFO, "Log directories exhausted\n"); + syslog(LOG_ERR, "Log directories exhausted\n"); return (-1); } @@ -326,7 +326,7 @@ allhardcount = 0; if (swap_audit_file() == -1) { - syslog(LOG_ERR, "Could not swap audit file\n"); + syslog(LOG_ERR, "Could not swap audit file"); /* * XXX Faulty directory listing? - user should be given * XXX an opportunity to change the audit_control file @@ -341,16 +341,16 @@ * XXX is generated here? */ if (0 == (ret = getacmin(&minval))) { - syslog(LOG_INFO, "min free = %d\n", minval); + syslog(LOG_DEBUG, "min free = %d\n", minval); if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, - "could not get audit queue settings\n"); + "could not get audit queue settings"); return (-1); } qctrl.aq_minfree = minval; if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, - "could not set audit queue settings\n"); + "could not set audit queue settings"); return (-1); } } @@ -372,20 +372,20 @@ /* Generate an audit record. */ if ((aufd = au_open()) == -1) - syslog(LOG_ERR, "Could not create audit shutdown event.\n"); + syslog(LOG_ERR, "Could not create audit shutdown event."); else { if ((tok = au_to_text("auditd::Audit shutdown")) != NULL) au_write(aufd, tok); if (au_close(aufd, 1, AUE_audit_shutdown) == -1) syslog(LOG_ERR, - "Could not close audit shutdown event.\n"); + "Could not close audit shutdown event."); } /* Flush contents. */ cond = AUC_DISABLED; err_ret = auditon(A_SETCOND, &cond, sizeof(cond)); if (err_ret != 0) { - syslog(LOG_ERR, "Disabling audit failed! : %s\n", + syslog(LOG_ERR, "Disabling audit failed! : %s", strerror(errno)); err_ret = 1; } @@ -396,15 +396,15 @@ free_dir_q(); if ((remove(AUDITD_PIDFILE) == -1) || err_ret) { - syslog(LOG_ERR, "Could not unregister\n"); + syslog(LOG_ERR, "Could not unregister"); audit_warn_postsigterm(); return (1); } endac(); if (close(triggerfd) != 0) - syslog(LOG_ERR, "Error closing control file\n"); - syslog(LOG_INFO, "Finished.\n"); + syslog(LOG_ERR, "Error closing control file"); + syslog(LOG_INFO, "Finished"); return (0); } @@ -437,23 +437,22 @@ /* Set up the signal hander. */ if (signal(SIGTERM, relay_signal) == SIG_ERR) { syslog(LOG_ERR, - "Could not set signal handler for SIGTERM\n"); + "Could not set signal handler for SIGTERM"); fail_exit(); } if (signal(SIGCHLD, relay_signal) == SIG_ERR) { syslog(LOG_ERR, - "Could not set signal handler for SIGCHLD\n"); + "Could not set signal handler for SIGCHLD"); fail_exit(); } if (signal(SIGHUP, relay_signal) == SIG_ERR) { syslog(LOG_ERR, - "Could not set signal handler for SIGHUP\n"); + "Could not set signal handler for SIGHUP"); fail_exit(); } if ((pidfile = fopen(AUDITD_PIDFILE, "a")) == NULL) { - syslog(LOG_ERR, - "Could not open PID file\n"); + syslog(LOG_ERR, "Could not open PID file"); audit_warn_tmpfile(); return (-1); } @@ -462,7 +461,7 @@ fd = fileno(pidfile); if (flock(fd, LOCK_EX | LOCK_NB) < 0) { syslog(LOG_ERR, - "PID file is locked (is another auditd running?).\n"); + "PID file is locked (is another auditd running?)."); audit_warn_ebusy(); return (-1); } @@ -516,7 +515,7 @@ switch(trigger) { case AUDIT_TRIGGER_LOW_SPACE: - syslog(LOG_INFO, "Got low space trigger\n"); + syslog(LOG_INFO, "Got low space trigger"); if (dirent && (dirent->softlim != 1)) { TAILQ_REMOVE(&dir_q, dirent, dirs); /* Add this node to the end of the list. */ @@ -526,7 +525,7 @@ if (TAILQ_NEXT(TAILQ_FIRST(&dir_q), dirs) != NULL && swap_audit_file() == -1) - syslog(LOG_ERR, "Error swapping audit file\n"); + syslog(LOG_ERR, "Error swapping audit file"); /* * Check if the next dir has already reached its soft @@ -548,7 +547,7 @@ break; case AUDIT_TRIGGER_NO_SPACE: - syslog(LOG_INFO, "Got no space trigger\n"); + syslog(LOG_INFO, "Got no space trigger"); /* Delete current dir, go on to next. */ TAILQ_REMOVE(&dir_q, dirent, dirs); @@ -557,7 +556,7 @@ free(dirent); if (swap_audit_file() == -1) - syslog(LOG_ERR, "Error swapping audit file\n"); + syslog(LOG_ERR, "Error swapping audit file"); /* We are out of log directories. */ audit_warn_allhard(++allhardcount); @@ -568,21 +567,21 @@ * Create a new file and swap with the one being used in * kernel */ - syslog(LOG_INFO, "Got open new trigger\n"); + syslog(LOG_INFO, "Got open new trigger"); if (swap_audit_file() == -1) - syslog(LOG_ERR, "Error swapping audit file\n"); + syslog(LOG_ERR, "Error swapping audit file"); break; case AUDIT_TRIGGER_READ_FILE: - syslog(LOG_INFO, "Got read file trigger\n"); + syslog(LOG_INFO, "Got read file trigger"); if (read_control_file() == -1) - syslog(LOG_ERR, "Error in audit control file\n"); + syslog(LOG_ERR, "Error in audit control file"); if (config_audit_controls() == -1) - syslog(LOG_ERR, "Error setting audit controls\n"); + syslog(LOG_ERR, "Error setting audit controls"); break; default: - syslog(LOG_ERR, "Got unknown trigger %d\n", trigger); + syslog(LOG_ERR, "Got unknown trigger %d", trigger); break; } } @@ -607,24 +606,24 @@ for (;;) { num = read(triggerfd, &trigger, sizeof(trigger)); if ((num == -1) && (errno != EINTR)) { - syslog(LOG_ERR, "%s: error %d\n", __FUNCTION__, errno); + syslog(LOG_ERR, "%s: error %d", __FUNCTION__, errno); return (-1); } if (sigterms != sigterms_handled) { - syslog(LOG_INFO, "%s: SIGTERM", __FUNCTION__); + syslog(LOG_DEBUG, "%s: SIGTERM", __FUNCTION__); break; } if (sighups != sighups_handled) { - syslog(LOG_INFO, "%s: SIGHUP", __FUNCTION__); + syslog(LOG_DEBUG, "%s: SIGHUP", __FUNCTION__); handle_sighup(); } if ((num == -1) && (errno == EINTR)) continue; if (num == 0) { - syslog(LOG_INFO, "%s: read EOF\n", __FUNCTION__); + syslog(LOG_ERR, "%s: read EOF", __FUNCTION__); return (-1); } - syslog(LOG_INFO, "%s: read %d\n", __FUNCTION__, trigger); + syslog(LOG_DEBUG, "%s: read %d", __FUNCTION__, trigger); if (trigger == AUDIT_TRIGGER_CLOSE_AND_DIE) break; else @@ -645,7 +644,7 @@ while ((child = waitpid(-1, &wstatus, WNOHANG)) > 0) { if (!wstatus) continue; - syslog(LOG_INFO, "warn process [pid=%d] %s %d.\n", child, + syslog(LOG_INFO, "warn process [pid=%d] %s %d.", child, ((WIFEXITED(wstatus)) ? "exited with non-zero status" : "exited as a result of signal"), ((WIFEXITED(wstatus)) ? WEXITSTATUS(wstatus) : @@ -700,7 +699,7 @@ if (ctr == 0) syslog(LOG_ERR, "No events to class mappings registered."); else - syslog(LOG_INFO, "Registered %d event to class mappings.", + syslog(LOG_DEBUG, "Registered %d event to class mappings.", ctr); /* @@ -713,7 +712,7 @@ syslog(LOG_ERR, "Failed to register non-attributable event mask."); else - syslog(LOG_INFO, + syslog(LOG_DEBUG, "Registered non-attributable event mask."); } else syslog(LOG_ERR, @@ -735,31 +734,31 @@ token_t *tok; if ((triggerfd = open(AUDIT_TRIGGER_FILE, O_RDONLY, 0)) < 0) { - syslog(LOG_ERR, "Error opening trigger file\n"); + syslog(LOG_ERR, "Error opening trigger file"); fail_exit(); } TAILQ_INIT(&dir_q); if (read_control_file() == -1) { - syslog(LOG_ERR, "Error reading control file\n"); + syslog(LOG_ERR, "Error reading control file"); fail_exit(); } /* Generate an audit record. */ if ((aufd = au_open()) == -1) - syslog(LOG_ERR, "Could not create audit startup event.\n"); + syslog(LOG_ERR, "Could not create audit startup event."); else { if ((tok = au_to_text("auditd::Audit startup")) != NULL) au_write(aufd, tok); if (au_close(aufd, 1, AUE_audit_startup) == -1) syslog(LOG_ERR, - "Could not close audit startup event.\n"); + "Could not close audit startup event."); } if (config_audit_controls() == 0) - syslog(LOG_INFO, "Audit controls init successful\n"); + syslog(LOG_INFO, "Audit controls init successful"); else - syslog(LOG_INFO, "Audit controls init failed\n"); + syslog(LOG_ERR, "Audit controls init failed"); } int @@ -800,22 +799,22 @@ #else openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); #endif - syslog(LOG_INFO, "starting...\n"); + syslog(LOG_INFO, "starting..."); if (debug == 0 && daemon(0, 0) == -1) { - syslog(LOG_ERR, "Failed to daemonize\n"); + syslog(LOG_ERR, "Failed to daemonize"); exit(1); } if (register_daemon() == -1) { - syslog(LOG_ERR, "Could not register as daemon\n"); + syslog(LOG_ERR, "Could not register as daemon"); exit(1); } setup(); rc = wait_for_events(); - syslog(LOG_INFO, "auditd exiting.\n"); + syslog(LOG_INFO, "auditd exiting."); exit(rc); } From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 19 21:52:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBC4C16A400 for ; Sun, 19 Mar 2006 21:52:44 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FC4443D6B for ; Sun, 19 Mar 2006 21:52:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 951EE46C44 for ; Sun, 19 Mar 2006 16:52:34 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0C08E56895; Sun, 19 Mar 2006 21:51:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 034FF16A422; Sun, 19 Mar 2006 21:51:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D6ED016A41F for ; Sun, 19 Mar 2006 21:51:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A512A43D48 for ; Sun, 19 Mar 2006 21:51: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 k2JLpF3g035092 for ; Sun, 19 Mar 2006 21:51: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 k2JLpFgH035089 for perforce@freebsd.org; Sun, 19 Mar 2006 21:51:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 21:51:15 GMT Message-Id: <200603192151.k2JLpFgH035089@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 93606 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 21:52:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=93606 Change 93606 by rwatson@rwatson_peppercorn on 2006/03/19 21:51:06 Update. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#10 (text+ko) ==== @@ -29,6 +29,8 @@ network byte order when decoding. - Beginnings of an OpenBSM test framework can now be found in openbsm/test. This code is not built or installed by default. +- auditd now assigns more appropriate syslog levels to its debugging and + error information. OpenBSM 1.0 alpha 5 @@ -156,4 +158,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#9 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#10 $ From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 15:14:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D6AA16A400 for ; Mon, 20 Mar 2006 15:14:50 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8140143D45 for ; Mon, 20 Mar 2006 15:14:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A2DB146B1C for ; Mon, 20 Mar 2006 10:14:48 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B33B35670C; Mon, 20 Mar 2006 15:14:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AD72116A429; Mon, 20 Mar 2006 15:14:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5784616A420 for ; Mon, 20 Mar 2006 15:14:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0C6843D48 for ; Mon, 20 Mar 2006 15:14:32 +0000 (GMT) (envelope-from millert@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 k2KFEWAE012069 for ; Mon, 20 Mar 2006 15:14:32 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KFEWG4012066 for perforce@freebsd.org; Mon, 20 Mar 2006 15:14:32 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 15:14:32 GMT Message-Id: <200603201514.k2KFEWG4012066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93625 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 15:14:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=93625 Change 93625 by millert@millert_p3 on 2006/03/20 15:14:03 comment out KDB_UNATTENDED Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/i386/conf/MAC#17 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/i386/conf/MAC#17 (text+ko) ==== @@ -14,7 +14,7 @@ ident MAC options BREAK_TO_DEBUGGER -options KDB_UNATTENDED +#options KDB_UNATTENDED options MAC #options MAC_BIBA # BIBA data integrity policy From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 15:26:35 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9FCCD16A456 for ; Mon, 20 Mar 2006 15:26:35 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7815A43D62 for ; Mon, 20 Mar 2006 15:26:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 67CD146C6F for ; Mon, 20 Mar 2006 10:26:20 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8F37764672; Mon, 20 Mar 2006 15:25:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 89F3F16A423; Mon, 20 Mar 2006 15:25:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6793916A41F for ; Mon, 20 Mar 2006 15:25:47 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3114D43D45 for ; Mon, 20 Mar 2006 15:25:47 +0000 (GMT) (envelope-from millert@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 k2KFPlp2012913 for ; Mon, 20 Mar 2006 15:25:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KFPkaO012910 for perforce@freebsd.org; Mon, 20 Mar 2006 15:25:46 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 15:25:46 GMT Message-Id: <200603201525.k2KFPkaO012910@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93627 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 15:26:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=93627 Change 93627 by millert@millert_p3 on 2006/03/20 15:25:46 In fdcopy() set newfdp->fd_freefile after the first loop over fdp instead of the loop over newfdp. This means we never enter fdused() with fd_freefile == -1. It also fixes a bug when fdp->fd_lastfile == -1. Previously, if fdp->fd_lastfile was -1 newfdp->fd_freefile would get set to 1 instead of 0 since newfdp->fd_lastfile is initialized to 0 and newfdp->fd_freefile will not have been set in the first loop (which doesn't run at all in this case). It's not clear why newfdp->fd_freefile is -1 at this point. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#18 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#18 (text+ko) ==== @@ -1604,17 +1604,15 @@ newfdp->fd_freefile = i; } } + newfdp->fd_cmask = fdp->fd_cmask; FILEDESC_UNLOCK_FAST(fdp); FILEDESC_LOCK(newfdp); + if (newfdp->fd_freefile == -1) + newfdp->fd_freefile = i; for (i = 0; i <= newfdp->fd_lastfile; ++i) if (newfdp->fd_ofiles[i] != NULL) fdused(newfdp, i); FILEDESC_UNLOCK(newfdp); - FILEDESC_LOCK_FAST(fdp); - if (newfdp->fd_freefile == -1) - newfdp->fd_freefile = i; - newfdp->fd_cmask = fdp->fd_cmask; - FILEDESC_UNLOCK_FAST(fdp); return (newfdp); } From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 15:29:03 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 556C216A425 for ; Mon, 20 Mar 2006 15:29:03 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 720BE43D49 for ; Mon, 20 Mar 2006 15:28:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A72D246C78 for ; Mon, 20 Mar 2006 10:28:54 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BE58157F58; Mon, 20 Mar 2006 15:28:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AF8A616A428; Mon, 20 Mar 2006 15:28:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D90D16A41F for ; Mon, 20 Mar 2006 15:28:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DE1243D68 for ; Mon, 20 Mar 2006 15:28:51 +0000 (GMT) (envelope-from millert@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 k2KFSp2Z013138 for ; Mon, 20 Mar 2006 15:28:51 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KFSpwT013135 for perforce@freebsd.org; Mon, 20 Mar 2006 15:28:51 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 15:28:51 GMT Message-Id: <200603201528.k2KFSpwT013135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93628 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 15:29:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=93628 Change 93628 by millert@millert_p3 on 2006/03/20 15:28:25 Always zero fdp->fd_ofileflags[idx] when we NULL out fdp->fd_ofiles[idx]. Be more careful with locking fdp in fdcheckstd(). The current behavior is probably safe but a little paranoia goes a long way. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#19 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#19 (text+ko) ==== @@ -1832,6 +1832,7 @@ FILEDESC_LOCK(fdp); if (fdp->fd_ofiles[idx] == fp) { fdp->fd_ofiles[idx] = NULL; + fdp->fd_ofileflags[idx] = 0; fdunused(fdp, idx); FILEDESC_UNLOCK(fdp); fdrop(fp, td); @@ -1911,12 +1912,18 @@ fdp = td->td_proc->p_fd; if (fdp == NULL) return (0); + FILEDESC_LOCK_FAST(fdp); KASSERT(fdp->fd_refcnt == 1, ("the fdtable should not be shared")); + FILEDESC_UNLOCK_FAST(fdp); devnull = -1; error = 0; for (i = 0; i < 3; i++) { - if (fdp->fd_ofiles[i] != NULL) + FILEDESC_LOCK_FAST(fdp); + if (fdp->fd_ofiles[i] != NULL) { + FILEDESC_UNLOCK_FAST(fdp); continue; + } + FILEDESC_UNLOCK_FAST(fdp); if (devnull < 0) { int vfslocked; error = falloc(td, &fp, &fd); @@ -1938,6 +1945,7 @@ KASSERT(fdp->fd_ofiles[fd] == fp, ("table not shared, how did it change?")); fdp->fd_ofiles[fd] = NULL; + fdp->fd_ofileflags[fd] = 0; fdunused(fdp, fd); FILEDESC_UNLOCK(fdp); fdrop(fp, td); From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 15:50:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 410A216A482 for ; Mon, 20 Mar 2006 15:50:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9510043D53 for ; Mon, 20 Mar 2006 15:50:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F320146C8D for ; Mon, 20 Mar 2006 10:50:37 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7897473578; Mon, 20 Mar 2006 15:50:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E1E3216A537; Mon, 20 Mar 2006 15:50:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE11016A4E0; Mon, 20 Mar 2006 15:50:28 +0000 (UTC) (envelope-from Todd.Miller@sparta.com) Received: from M4.sparta.com (M4.sparta.com [157.185.61.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C7D443D66; Mon, 20 Mar 2006 15:50:16 +0000 (GMT) (envelope-from Todd.Miller@sparta.com) Received: from Beta5.sparta.com (beta5.sparta.com [157.185.63.21]) by M4.sparta.com (8.13.5/8.13.5) with ESMTP id k2KFoFkP021340; Mon, 20 Mar 2006 09:50:15 -0600 Received: from nemo.columbia.ads.sparta.com (nemo.columbia.sparta.com [157.185.80.75]) by Beta5.sparta.com (8.12.11/8.13.1) with ESMTP id k2KFoFhH026350; Mon, 20 Mar 2006 09:50:16 -0600 Received: from [127.0.0.1] ([157.185.80.253]) by nemo.columbia.ads.sparta.com with Microsoft SMTPSVC(6.0.3790.1830); Mon, 20 Mar 2006 10:50:15 -0500 In-Reply-To: <200603201525.k2KFPkaO012910@repoman.freebsd.org> References: <200603201525.k2KFPkaO012910@repoman.freebsd.org> Mime-Version: 1.0 (Apple Message framework v746.3) Content-Type: text/plain; charset=US-ASCII; format=flowed Message-Id: Content-Transfer-Encoding: 7bit From: Todd Miller Date: Mon, 20 Mar 2006 10:50:13 -0500 To: Todd Miller X-Mailer: Apple Mail (2.746.3) X-OriginalArrivalTime: 20 Mar 2006 15:50:15.0276 (UTC) FILETIME=[FAE272C0:01C64C35] Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93627 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 15:50:42 -0000 On Mar 20, 2006, at 3:25 PM, Todd Miller wrote: > http://perforce.freebsd.org/chv.cgi?CH=93627 > > Change 93627 by millert@millert_p3 on 2006/03/20 15:25:46 > > In fdcopy() set newfdp->fd_freefile after the first loop > over fdp instead of the loop over newfdp. This means we > never enter fdused() with fd_freefile == -1. It also fixes > a bug when fdp->fd_lastfile == -1. Previously, if > fdp->fd_lastfile was -1 newfdp->fd_freefile would get set > to 1 instead of 0 since newfdp->fd_lastfile is initialized > to 0 and newfdp->fd_freefile will not have been set in the > first loop (which doesn't run at all in this case). > It's not clear why newfdp->fd_freefile is -1 at this point. That last line should have read: It's not clear why newfdp->fd_lastfile is -1 at this point. - todd From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 17:53:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1DCB16A428 for ; Mon, 20 Mar 2006 17:53:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BF8443D5A for ; Mon, 20 Mar 2006 17:53:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BBC7846C0F for ; Mon, 20 Mar 2006 12:53:44 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 67CC457A1B; Mon, 20 Mar 2006 17:52:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D79C16A426; Mon, 20 Mar 2006 17:52:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D7E716A423 for ; Mon, 20 Mar 2006 17:52:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E4DD43D6D for ; Mon, 20 Mar 2006 17:52:25 +0000 (GMT) (envelope-from millert@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 k2KHqOEH027601 for ; Mon, 20 Mar 2006 17:52:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KHqO5h027598 for perforce@freebsd.org; Mon, 20 Mar 2006 17:52:24 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 17:52:24 GMT Message-Id: <200603201752.k2KHqO5h027598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93645 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 17:53:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=93645 Change 93645 by millert@millert_p3 on 2006/03/20 17:51:24 Arg pointer in mac_thread_syscall_{enter,exit} should be register_t * not int *. Fixes compilation problem on amd64. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 (text+ko) ==== @@ -282,7 +282,7 @@ } int -mac_thread_syscall_enter(struct thread *td, int *args, int code) +mac_thread_syscall_enter(struct thread *td, register_t *args, int code) { int error; @@ -293,7 +293,7 @@ } void -mac_thread_syscall_exit(struct thread *td, int *args, int code, int errcode) +mac_thread_syscall_exit(struct thread *td, register_t *args, int code, int errcode) { if (!mac_enforce_syscall) From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 18:57:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B970516A400 for ; Mon, 20 Mar 2006 18:57:53 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C129643D75 for ; Mon, 20 Mar 2006 18:57:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6A5E146C87 for ; Mon, 20 Mar 2006 13:57:36 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7A59B63911; Mon, 20 Mar 2006 18:55:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CD0C16A427; Mon, 20 Mar 2006 18:55:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28E8416A401 for ; Mon, 20 Mar 2006 18:55:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 845C943D77 for ; Mon, 20 Mar 2006 18:55:47 +0000 (GMT) (envelope-from millert@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 k2KItlFw030626 for ; Mon, 20 Mar 2006 18:55:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KItlAt030623 for perforce@freebsd.org; Mon, 20 Mar 2006 18:55:47 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 18:55:47 GMT Message-Id: <200603201855.k2KItlAt030623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93652 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 18:57:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=93652 Change 93652 by millert@millert_p3 on 2006/03/20 18:54:48 Back out fdcopy() changes to ease upcoming integration. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#20 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#20 (text+ko) ==== @@ -1502,6 +1502,8 @@ newfdp->fd_fd.fd_cmask = CMASK; newfdp->fd_fd.fd_ofiles = newfdp->fd_dfiles; newfdp->fd_fd.fd_ofileflags = newfdp->fd_dfileflags; + newfdp->fd_fd.fd_lastfile = 0; /* XXX */ + newfdp->fd_fd.fd_freefile = 0; /* XXX */ newfdp->fd_fd.fd_nfiles = NDFILE; newfdp->fd_fd.fd_map = newfdp->fd_dmap; return (&newfdp->fd_fd); @@ -1592,6 +1594,8 @@ } /* copy everything except kqueue descriptors */ newfdp->fd_freefile = -1; + if (fdp->fd_lastfile < 0) + printf("%s: fd_lastfile is %d\n", __func__, fdp->fd_lastfile); for (i = 0; i <= fdp->fd_lastfile; ++i) { if (fdisused(fdp, i) && fdp->fd_ofiles[i]->f_type != DTYPE_KQUEUE) { @@ -1604,15 +1608,17 @@ newfdp->fd_freefile = i; } } - newfdp->fd_cmask = fdp->fd_cmask; FILEDESC_UNLOCK_FAST(fdp); FILEDESC_LOCK(newfdp); - if (newfdp->fd_freefile == -1) - newfdp->fd_freefile = i; for (i = 0; i <= newfdp->fd_lastfile; ++i) if (newfdp->fd_ofiles[i] != NULL) fdused(newfdp, i); FILEDESC_UNLOCK(newfdp); + FILEDESC_LOCK_FAST(fdp); + if (newfdp->fd_freefile == -1) + newfdp->fd_freefile = i; + newfdp->fd_cmask = fdp->fd_cmask; + FILEDESC_UNLOCK_FAST(fdp); return (newfdp); } From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 19:01:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D32416A401 for ; Mon, 20 Mar 2006 19:01:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B039D43D6B for ; Mon, 20 Mar 2006 19:01:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8995946C85 for ; Mon, 20 Mar 2006 14:01:45 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A0813741A0; Mon, 20 Mar 2006 19:01:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 91A8316A427; Mon, 20 Mar 2006 19:01:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7019416A424 for ; Mon, 20 Mar 2006 19:01:01 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E891143D77 for ; Mon, 20 Mar 2006 19:00:54 +0000 (GMT) (envelope-from millert@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 k2KJ0sKt030966 for ; Mon, 20 Mar 2006 19:00:54 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KJ0sbC030963 for perforce@freebsd.org; Mon, 20 Mar 2006 19:00:54 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 19:00:54 GMT Message-Id: <200603201900.k2KJ0sbC030963@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93654 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 19:01:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=93654 Change 93654 by millert@millert_p3 on 2006/03/20 19:00:21 Remove debugging code that snuck into the last checkin. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#21 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#21 (text+ko) ==== @@ -1502,8 +1502,6 @@ newfdp->fd_fd.fd_cmask = CMASK; newfdp->fd_fd.fd_ofiles = newfdp->fd_dfiles; newfdp->fd_fd.fd_ofileflags = newfdp->fd_dfileflags; - newfdp->fd_fd.fd_lastfile = 0; /* XXX */ - newfdp->fd_fd.fd_freefile = 0; /* XXX */ newfdp->fd_fd.fd_nfiles = NDFILE; newfdp->fd_fd.fd_map = newfdp->fd_dmap; return (&newfdp->fd_fd); @@ -1594,8 +1592,6 @@ } /* copy everything except kqueue descriptors */ newfdp->fd_freefile = -1; - if (fdp->fd_lastfile < 0) - printf("%s: fd_lastfile is %d\n", __func__, fdp->fd_lastfile); for (i = 0; i <= fdp->fd_lastfile; ++i) { if (fdisused(fdp, i) && fdp->fd_ofiles[i]->f_type != DTYPE_KQUEUE) { From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 19:14:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B9D7916A424 for ; Mon, 20 Mar 2006 19:14:52 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA81443D45 for ; Mon, 20 Mar 2006 19:14:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 61B0046BD0 for ; Mon, 20 Mar 2006 14:14:48 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 69B0C556B5; Mon, 20 Mar 2006 19:14:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C40916A424; Mon, 20 Mar 2006 19:14:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8A2316A400; Mon, 20 Mar 2006 19:14:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 768E443D4C; Mon, 20 Mar 2006 19:14:43 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k2KJEf6f002247; Mon, 20 Mar 2006 14:14:42 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Todd Miller Date: Mon, 20 Mar 2006 14:06:41 -0500 User-Agent: KMail/1.9.1 References: <200603201525.k2KFPkaO012910@repoman.freebsd.org> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200603201406.43861.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1345/Mon Mar 20 07:03:16 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-3.6 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Todd Miller , Perforce Change Reviews Subject: Re: PERFORCE change 93627 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 19:14:52 -0000 On Monday 20 March 2006 10:50, Todd Miller wrote: > > On Mar 20, 2006, at 3:25 PM, Todd Miller wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=93627 > > > > Change 93627 by millert@millert_p3 on 2006/03/20 15:25:46 > > > > In fdcopy() set newfdp->fd_freefile after the first loop > > over fdp instead of the loop over newfdp. This means we > > never enter fdused() with fd_freefile == -1. It also fixes > > a bug when fdp->fd_lastfile == -1. Previously, if > > fdp->fd_lastfile was -1 newfdp->fd_freefile would get set > > to 1 instead of 0 since newfdp->fd_lastfile is initialized > > to 0 and newfdp->fd_freefile will not have been set in the > > first loop (which doesn't run at all in this case). > > It's not clear why newfdp->fd_freefile is -1 at this point. > > That last line should have read: > It's not clear why newfdp->fd_lastfile is -1 at this point. csjp@ just fixed this in FreeBSD head. I also had the change to move the setting of cmask up earlier to avoid an extra lock/unlock pair in one of my p4 branches as well. :) You'll probably want to make sure you're changes are in sync with what csjp@ just committed to make the merge in the future less exciting. :) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 19:16:46 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B25D16A422 for ; Mon, 20 Mar 2006 19:16:46 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B16C343D49 for ; Mon, 20 Mar 2006 19:16:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A0DD046BC4 for ; Mon, 20 Mar 2006 14:16:36 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D1BEF57698; Mon, 20 Mar 2006 19:16:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C3F3516A401; Mon, 20 Mar 2006 19:16:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8651A16A425 for ; Mon, 20 Mar 2006 19:16:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E04643D45 for ; Mon, 20 Mar 2006 19:16: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 k2KJGUbP031464 for ; Mon, 20 Mar 2006 19:16: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 k2KJGRUO031461 for perforce@freebsd.org; Mon, 20 Mar 2006 19:16:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 20 Mar 2006 19:16:27 GMT Message-Id: <200603201916.k2KJGRUO031461@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 93655 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 19:16:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=93655 Change 93655 by rwatson@rwatson_zoo on 2006/03/20 19:15:26 Integrate TrustedBSD base branch from FreeBSD CVS HEAD: - make showconfig - MK_foo - NETSMBCRYPTO now always built into smbfs - getfacl -q - csup update - hostapd update - wpa_supplicant update - vkbd now default - security/audit include files installed - libc symbol versioning - more jemalloc fixes and optimizations - COMPAT_43 gone - more arm - linux truncate, sethostname calls now explicitly emulated, 32/64-bit work on stat - ATA USB attachment - Audit restructuring, now audit_worker.c; audit pipe ioctls, style fixes, etc. - File descriptor optimization fixes for MAC - m_unshare - SS_PROTOREF - soabort() can't fail - UNIX domain sockets, netatalk, netipx, natm now believe so_pcb != NULL - More auditing of namei() arguments, such as open() - A fair number of UFS/snapshots/soft updates fixes. - Countless device driver fixes/changes/bugs/... Affected files ... .. //depot/projects/trustedbsd/base/Makefile#43 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#70 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#7 integrate .. //depot/projects/trustedbsd/base/UPDATING#64 integrate .. //depot/projects/trustedbsd/base/bin/Makefile#9 integrate .. //depot/projects/trustedbsd/base/bin/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#11 integrate .. //depot/projects/trustedbsd/base/bin/csh/Makefile#13 integrate .. //depot/projects/trustedbsd/base/bin/ed/Makefile#11 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#8 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.c#8 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#22 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FREEBSD-Upgrade#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/base/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/TODO#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/config.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/config.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/csup.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/fattr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/globtree.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/idcache.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/idcache.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/lister.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/misc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/misc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/proto.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/token.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/token.l#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/updater.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/aes.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/config.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/config.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/config_types.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/defconfig#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/defs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/driver.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_pax.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_psk.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.8#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_cli.1#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_ctrl.c#2 delete .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_ctrl.h#2 delete .. //depot/projects/trustedbsd/base/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/logwatch/README#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/logwatch/hostapd#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/md5.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/md5.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/tls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/version.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wired.conf#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa_ctrl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa_ctrl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/nc.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/libngatm.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/uniaddr.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unifunc.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unimsg.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unisap.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unistruct.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pflogd.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/base64.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/base64.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_file.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_types.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto_gnutls.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/developer.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_hostap.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_wired.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_pax.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/events.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/hostap_common.h#2 delete .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/hostapd.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/main.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/preauth.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/preauth.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_gnutls.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_schannel.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_i.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-upgrade#9 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#48 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#19 integrate .. //depot/projects/trustedbsd/base/etc/hosts.allow#7 integrate .. //depot/projects/trustedbsd/base/etc/isdn/Makefile#8 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#35 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.x11-4.dist#12 integrate .. //depot/projects/trustedbsd/base/etc/mtree/Makefile#5 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/440.status-mailq#6 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/800.loginfail#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#36 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/kernel#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/nsswitch#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/syscons#11 integrate .. //depot/projects/trustedbsd/base/games/factor/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#11 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libg2c/Makefile#10 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcc/Makefile#13 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcov/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libobjc/Makefile#14 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#16 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/bc/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/Makefile#14 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvs/Makefile#14 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/dialog/Makefile#4 integrate .. //depot/projects/trustedbsd/base/include/Makefile#51 integrate .. //depot/projects/trustedbsd/base/include/arpa/nameser.h#3 integrate .. //depot/projects/trustedbsd/base/include/stdlib.h#24 integrate .. //depot/projects/trustedbsd/base/kerberos5/Makefile#10 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libgssapi/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#42 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind9/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.mk#6 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/bind/isc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/bind/isccc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/isccfg/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/lwres/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/INSTALL#2 delete .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#18 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile.am#4 delete .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tp.c#2 delete .. //depot/projects/trustedbsd/base/lib/libarchive/configure.ac.in#9 delete .. //depot/projects/trustedbsd/base/lib/libc/Makefile#21 integrate .. //depot/projects/trustedbsd/base/lib/libc/Versions.def#1 branch .. //depot/projects/trustedbsd/base/lib/libc/alpha/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/arm/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/compat-43/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/db/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#28 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/_pthread_stubs.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/_spinlock_stub.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/ia64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/include/libc_private.h#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/namespace.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/un-namespace.h#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#24 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/nls/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/nls/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/powerpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/quad/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/quad/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/regex/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/regex/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/rpc/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/softfloat/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/softfloat/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Makefile.inc#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.3#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#24 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtonum.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtonum.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdtime/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/string/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#20 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/mq.c#2 delete .. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/uuid/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/uuid/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/xdr/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/yp/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/yp/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc_r/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/Makefile#18 integrate .. //depot/projects/trustedbsd/base/lib/libgpib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libio/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libmilter/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libncp/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#19 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/modules.inc#10 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_login_access/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_login_access/login.access.5#3 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_login_access/pam_login_access.8#4 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_nologin/pam_nologin.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libpcap/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/libpmc.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmc.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#14 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/pthread.map#13 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/sys/thr_error.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_accept.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_aio_suspend.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_atfork.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_get_np.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_init.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setguardsize.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setinheritsched.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setschedparam.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setscope.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_barrier.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_barrierattr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_clean.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_close.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_concurrency.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_condattr_init.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_connect.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_creat.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_detach.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_equal.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_execve.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_exit.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fcntl.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fork.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fsync.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_getprio.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_getschedparam.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_info.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_join.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kill.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_main_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mattr_init.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mattr_kind_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_msync.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_multi_np.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex_prioceiling.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex_protocol.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_nanosleep.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_once.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_open.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pause.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_poll.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#25 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pselect.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pspinlock.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_raise.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_read.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_readv.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_resume_np.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_rwlock.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_select.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_self.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sem.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_setprio.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_setschedparam.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaction.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigmask.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigpending.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigprocmask.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigsuspend.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigwait.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_single_np.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sleep.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spec.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spinlock.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_suspend_np.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_switch_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_symbols.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_system.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_tcdrain.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_vfork.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait4.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_waitpid.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_write.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_writev.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_yield.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libradius/Makefile#12 integrate .. //depot/projects/trustedbsd/base/lib/librpcsvc/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/librt/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/librt/aio.c#2 integrate .. //depot/projects/trustedbsd/base/lib/librt/mq.c#2 integrate .. //depot/projects/trustedbsd/base/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/trustedbsd/base/lib/librt/sigev_thread.h#2 integrate .. //depot/projects/trustedbsd/base/lib/librt/timer.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libsm/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libsmb/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libstand/printf.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libtelnet/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libthr/pthread.map#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_timer.c#3 delete .. //depot/projects/trustedbsd/base/lib/libwrap/Makefile#10 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#20 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/Makefile#12 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/Makefile#15 integrate .. //depot/projects/trustedbsd/base/libexec/tcpd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/libexec/telnetd/Makefile#9 integrate .. //depot/projects/trustedbsd/base/release/Makefile#73 integrate .. //depot/projects/trustedbsd/base/release/amd64/boot_crunch.conf#5 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/errata/article.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate .. //depot/projects/trustedbsd/base/release/i386/boot_crunch.conf#11 integrate .. //depot/projects/trustedbsd/base/release/ia64/boot_crunch.conf#9 integrate .. //depot/projects/trustedbsd/base/release/pc98/boot_crunch.conf#11 integrate .. //depot/projects/trustedbsd/base/release/picobsd/bridge/crunch.conf#10 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/login/Makefile#5 integrate .. //depot/projects/trustedbsd/base/release/scripts/kernels-install.sh#1 branch .. //depot/projects/trustedbsd/base/release/scripts/package-split.py#6 integrate .. //depot/projects/trustedbsd/base/rescue/librescue/Makefile#5 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#17 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#33 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#22 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/gmirror.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/ggatec.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#29 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifvlan.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#44 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#36 integrate .. //depot/projects/trustedbsd/base/secure/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/secure/lib/Makefile#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#25 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile.inc#14 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#20 integrate .. //depot/projects/trustedbsd/base/secure/libexec/Makefile#6 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh/Makefile#14 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#19 integrate .. //depot/projects/trustedbsd/base/share/Makefile#10 integrate .. //depot/projects/trustedbsd/base/share/doc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/examples/Makefile#13 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#42 integrate .. //depot/projects/trustedbsd/base/share/examples/kld/syscall/test/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/examples/netgraph/ether.bridge#4 integrate .. //depot/projects/trustedbsd/base/share/man/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/man/man3/Makefile#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#19 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cpufreq.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/dcons.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/gre.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipw.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/iwi.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/netgraph.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_fec.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ral.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sysmouse.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#21 integrate .. //depot/projects/trustedbsd/base/share/man/man5/nsswitch.conf.5#7 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#56 integrate .. //depot/projects/trustedbsd/base/share/man/man7/build.7#11 integrate .. //depot/projects/trustedbsd/base/share/man/man9/firmware.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/g_consumer.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/hash.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/mbuf.9#23 integrate .. //depot/projects/trustedbsd/base/share/mk/Makefile#14 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.README#11 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.incs.mk#6 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.info.mk#11 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#28 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#28 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.nls.mk#8 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#12 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#24 integrate .. //depot/projects/trustedbsd/base/share/mk/version_gen.awk#1 branch .. //depot/projects/trustedbsd/base/sys/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/clock.c#15 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_proto.h#17 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_syscall.h#16 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysent.c#16 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysvec.c#19 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/syscalls.master#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/apic_vector.S#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_trace.c#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/io_apic.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#26 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#25 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/asmacros.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/bus.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pmap.h#17 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/trap.h#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/pci/pci_bus.c#14 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/in_cksum.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/files.at91#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/include/in_cksum.h#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/Makefile#14 integrate .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/Makefile.common#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/libi386.h#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/Makefile#14 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sys/boot/powerpc/loader/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/Makefile#15 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#53 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_getcwd.c#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#34 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ipc.c#13 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_mib.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#38 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_signal.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_socket.c#21 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#24 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_sysctl.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_uid16.c#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#69 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#98 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.alpha#28 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#26 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#60 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#34 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#51 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#20 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#45 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#69 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pflog.h#6 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_command.c#20 integrate .. //depot/projects/trustedbsd/base/sys/ddb/ddb.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#51 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-queue.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/sample/sample.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#51 integrate .. //depot/projects/trustedbsd/base/sys/dev/cs/if_cs.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/exca/exca.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ieee488/upd7210.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwireg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwivar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral.c#9 delete .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral_pccard.c#5 delete .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ralreg.h#4 delete .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ralvar.h#4 delete .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560var.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661var.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/vchan.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#44 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#40 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#30 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.h#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror_ctl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.h#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3_ctl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/geode.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#57 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#48 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#47 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_dummy.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#28 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#18 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_rrip.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_aout.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#62 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#63 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#61 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#46 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#35 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#73 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#56 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#74 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi_video/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/ata/atausb/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/ce/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/cp/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/dummynet/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_bridge/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_gif/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/ipfilter/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/modules/ipfw/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/iwi/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/linux/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/Makefile#16 integrate .. //depot/projects/trustedbsd/base/sys/modules/pf/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/modules/pflog/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/ral/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/smbfs/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sys/net/bridgestp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_media.h#17 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tap.c#26 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#34 integrate .. //depot/projects/trustedbsd/base/sys/net/route.h#17 integrate .. //depot/projects/trustedbsd/base/sys/net/rtsock.c#36 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#17 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.c#16 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.h#15 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#19 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.c#15 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_var.h#16 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_pcb.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_usrreq.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#31 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.h#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#39 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.h#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#26 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6_rtr.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_mbuf.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ah.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ipcomp.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_crypt.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_smb.c#11 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_diskless.c#14 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#34 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#35 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#39 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsock.c#19 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#5 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_ioctl.h#1 branch .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#1 branch .. //depot/projects/trustedbsd/base/sys/sys/ata.h#18 integrate .. //depot/projects/trustedbsd/base/sys/sys/cdefs.h#26 integrate .. //depot/projects/trustedbsd/base/sys/sys/disk.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/event.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/hash.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#46 integrate .. //depot/projects/trustedbsd/base/sys/sys/md5.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#37 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#74 integrate .. //depot/projects/trustedbsd/base/sys/sys/protosw.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#43 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#62 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#18 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#38 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#39 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#48 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_inode.c#19 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_lookup.c#19 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#26 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#46 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufsmount.h#13 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#43 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#30 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#43 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#47 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#58 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageq.c#17 integrate .. //depot/projects/trustedbsd/base/tools/regression/aio/aiotest/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/aio/kqueue/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/aio/kqueue/lio/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/audit/audit_pipe_ioctl/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/resolv/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/mlock/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netatalk/simple_send/simple_send.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/msocket/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/tcpfullwindowrst/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/udpconnectjail/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/listenclose/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/reconnect/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/shutdown/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/sigpipe/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/libxx/Makefile#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/libyy/Makefile#4 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athdebug/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/iwi/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/nanobsd.sh#6 integrate .. //depot/projects/trustedbsd/base/tools/tools/ncpus/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ncpus/acpi.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ncpus/biosmptable.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ncpus/ncpus.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlandebug/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanwatch/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/juggle/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/umastat/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/umastat/umastat.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#47 integrate .. //depot/projects/trustedbsd/base/usr.bin/basename/basename.1#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/chkey/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/chpass/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/fetch/Makefile#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/ktrace/ktrace.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/lex/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/Makefile#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/README#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.1#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.access.5#4 delete .. //depot/projects/trustedbsd/base/usr.bin/login/login_access.c#6 delete .. //depot/projects/trustedbsd/base/usr.bin/login/pathnames.h#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/mkuzip/mkuzip.8#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/Makefile#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/newkey/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/passwd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/rpcinfo/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/systat/systat.1#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/systat/vmstat.c#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/Makefile#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/Makefile.am#4 delete .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.c#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar_platform.h#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/configure.ac.in#7 delete .. //depot/projects/trustedbsd/base/usr.bin/tar/read.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/telnet/Makefile#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/xinstall/install.1#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/xinstall/xinstall.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#49 integrate .. //depot/projects/trustedbsd/base/usr.sbin/amd/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/amd/amd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/amd/include/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/Makefile#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 19:48:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3206316A401 for ; Mon, 20 Mar 2006 19:48:43 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB16343D49 for ; Mon, 20 Mar 2006 19:48:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 14D1246C31 for ; Mon, 20 Mar 2006 14:48:36 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B9626742C9; Mon, 20 Mar 2006 19:48:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E28516A427; Mon, 20 Mar 2006 19:48:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D4B216A424 for ; Mon, 20 Mar 2006 19:48:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAB1A43D45 for ; Mon, 20 Mar 2006 19:48: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 k2KJmBHC042196 for ; Mon, 20 Mar 2006 19:48: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 k2KJm9UJ042152 for perforce@freebsd.org; Mon, 20 Mar 2006 19:48:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 20 Mar 2006 19:48:09 GMT Message-Id: <200603201948.k2KJm9UJ042152@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 93658 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 19:48:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=93658 Change 93658 by rwatson@rwatson_zoo on 2006/03/20 19:47:17 Integrate TrustedBSD MAC branch from TrustedBSD base branch, bringing in changes described in P4 change 93655. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile#38 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#64 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#5 integrate .. //depot/projects/trustedbsd/mac/UPDATING#54 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile.inc#14 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/bin/ed/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#24 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FREEBSD-Upgrade#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/TODO#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/config.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/config.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/csup.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/fattr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/globtree.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/idcache.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/idcache.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/lister.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/main.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/misc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/misc.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/proto.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/token.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/token.l#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/updater.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/aes.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/config.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/config.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/config_types.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/defconfig#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/defs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/driver.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_pax.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_psk.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd_cli.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd_ctrl.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd_ctrl.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/logwatch/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/logwatch/hostapd#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/md5.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/md5.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/tls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/version.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/wired.conf#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/wpa_ctrl.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/wpa_ctrl.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/trustedbsd/mac/contrib/netcat/nc.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/libngatm.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/uniaddr.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unifunc.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unimsg.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unisap.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unistruct.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/pflogd/pflogd.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/base64.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/base64.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config_file.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config_types.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/crypto_gnutls.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/developer.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver_hostap.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver_wired.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_pax.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/events.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/hostap_common.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/hostapd.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/main.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/preauth.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/preauth.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls_gnutls.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls_schannel.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_i.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-upgrade#9 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#48 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#17 integrate .. //depot/projects/trustedbsd/mac/etc/hosts.allow#6 integrate .. //depot/projects/trustedbsd/mac/etc/isdn/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#41 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.x11-4.dist#12 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/440.status-mailq#6 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/800.loginfail#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#31 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/jail#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/kernel#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/nsswitch#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/syscons#10 integrate .. //depot/projects/trustedbsd/mac/games/factor/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libdialog/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libg2c/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libgcc/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libgcov/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libobjc/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/bc/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/cvs/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#53 integrate .. //depot/projects/trustedbsd/mac/include/arpa/nameser.h#3 integrate .. //depot/projects/trustedbsd/mac/include/stdlib.h#23 integrate .. //depot/projects/trustedbsd/mac/kerberos5/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libgssapi/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#39 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind9/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/config.mk#6 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isc/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isccc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isccfg/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/lwres/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/INSTALL#2 delete .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile.am#4 delete .. //depot/projects/trustedbsd/mac/lib/libarchive/archive.h.in#8 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_platform.h#10 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tp.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libarchive/configure.ac.in#8 delete .. //depot/projects/trustedbsd/mac/lib/libc/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/lib/libc/Versions.def#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/alpha/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/arm/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/compat-43/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/db/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/db/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gen/Makefile.inc#24 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gen/_pthread_stubs.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/_spinlock_stub.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gmon/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gmon/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/ia64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/include/libc_private.h#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/namespace.h#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/un-namespace.h#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#22 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/nls/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/nls/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#27 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/quad/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/quad/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/regex/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/regex/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/rpc/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/softfloat/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/softfloat/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/Makefile.inc#15 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.3#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#22 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtonum.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtonum.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/string/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/Makefile.inc#19 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/mq.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/sys/recv.2#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/uuid/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/uuid/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/xdr/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/yp/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/yp/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc_r/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/libcrypt/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/lib/libgpib/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libio/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libipsec/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/libmilter/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libncp/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/modules.inc#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_login_access/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_login_access/login.access.5#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_login_access/pam_login_access.8#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_nologin/pam_nologin.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_unix/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpcap/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/libpmc.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/pmc.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/pthread.map#11 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/sys/thr_error.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_accept.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_aio_suspend.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_atfork.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_get_np.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_init.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setguardsize.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setinheritsched.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setschedparam.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setscope.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_barrier.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_barrierattr.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cancel.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_clean.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_close.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_concurrency.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cond.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_condattr_init.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_connect.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_creat.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_create.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_detach.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_equal.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_execve.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_exit.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_fcntl.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_fork.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_fsync.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_getprio.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_getschedparam.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_info.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_init.c#16 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_join.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kill.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_main_np.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mattr_init.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mattr_kind_np.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_msync.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_multi_np.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex.c#15 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex_prioceiling.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex_protocol.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_nanosleep.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_once.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_open.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_pause.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_poll.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#21 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_pselect.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_pspinlock.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_raise.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_read.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_readv.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_resume_np.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_rwlock.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_select.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_self.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sem.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_setprio.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_setschedparam.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#16 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigaction.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigmask.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigpending.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigprocmask.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigsuspend.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigwait.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_single_np.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sleep.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_spec.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_spinlock.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_suspend_np.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_switch_np.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_symbols.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_system.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_tcdrain.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_vfork.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_wait.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_wait4.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_waitpid.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_write.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_writev.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_yield.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libradius/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/librpcsvc/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/librt/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/librt/aio.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/librt/mq.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/librt/sigev_thread.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/librt/timer.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libsm/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libsmb/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/printf.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libtelnet/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/pthread.map#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_init.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_timer.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libwrap/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/libexec/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/libexec/lukemftpd/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/libexec/tcpd/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/libexec/telnetd/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#68 integrate .. //depot/projects/trustedbsd/mac/release/amd64/boot_crunch.conf#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/errata/article.sgml#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate .. //depot/projects/trustedbsd/mac/release/i386/boot_crunch.conf#11 integrate .. //depot/projects/trustedbsd/mac/release/ia64/boot_crunch.conf#9 integrate .. //depot/projects/trustedbsd/mac/release/pc98/boot_crunch.conf#11 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/bridge/crunch.conf#10 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/login/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/release/scripts/kernels-install.sh#1 branch .. //depot/projects/trustedbsd/mac/release/scripts/package-split.py#6 integrate .. //depot/projects/trustedbsd/mac/rescue/librescue/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#34 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/sbin/atacontrol/atacontrol.c#19 integrate .. //depot/projects/trustedbsd/mac/sbin/bsdlabel/bsdlabel.8#10 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/mirror/gmirror.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/ggatec/ggatec.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#29 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifvlan.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#37 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#31 integrate .. //depot/projects/trustedbsd/mac/secure/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/secure/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/secure/lib/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#24 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#19 integrate .. //depot/projects/trustedbsd/mac/secure/libexec/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/secure/usr.sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/share/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/share/doc/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/smm/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/examples/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#38 integrate .. //depot/projects/trustedbsd/mac/share/examples/kld/syscall/test/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/examples/netgraph/ether.bridge#4 integrate .. //depot/projects/trustedbsd/mac/share/man/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ata.4#18 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/cpufreq.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/dcons.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/gre.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ipw.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/iwi.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/netgraph.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_fec.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ral.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sysmouse.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/nsswitch.conf.5#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#45 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/build.7#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/firmware.9#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/g_consumer.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/hash.9#1 branch .. //depot/projects/trustedbsd/mac/share/man/man9/mbuf.9#21 integrate .. //depot/projects/trustedbsd/mac/share/mk/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.README#11 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.incs.mk#6 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.info.mk#11 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.lib.mk#24 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.libnames.mk#26 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.nls.mk#8 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.own.mk#12 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.prog.mk#23 integrate .. //depot/projects/trustedbsd/mac/share/mk/version_gen.awk#1 branch .. //depot/projects/trustedbsd/mac/sys/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/clock.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_proto.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_syscall.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysent.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysvec.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/syscalls.master#14 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/apic_vector.S#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/db_trace.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/machdep.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/NOTES#11 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/asmacros.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/bus.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/pmap.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/trap.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/pci/pci_bus.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/in_cksum.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/files.at91#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/include/in_cksum.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/sys/boot/alpha/common/Makefile.common#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/libi386.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ia64/ski/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/sys/boot/powerpc/loader/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/sys/boot/sparc64/loader/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_misc.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ipc.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_mib.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_signal.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_socket.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_sysctl.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_uid16.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#71 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#126 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.alpha#27 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.amd64#22 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#52 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.ia64#32 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#43 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.powerpc#19 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#38 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#81 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/if_pflog.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_command.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/ddb.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx_osm.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-disk.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-queue.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-fd.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-fd.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/sample/sample.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cs/if_cs.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/exca/exca.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ieee488/upd7210.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwi.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwireg.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwivar.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral.c#8 delete .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral_pccard.c#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ralreg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ralvar.h#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2560.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2560reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2560var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2661.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2661reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2661var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/ich.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/sound.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/sound.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/vchan.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_io.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror_ctl.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3_ctl.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/geode.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#54 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_dummy.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_proto.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_syscall.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysent.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysvec.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/syscalls.master#16 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_rrip.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#63 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#81 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#453 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_resource.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_prf.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#71 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#82 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#80 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#87 integrate .. //depot/projects/trustedbsd/mac/sys/modules/acpi/acpi_video/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ata/atausb/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/ce/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/cp/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/dummynet/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_bridge/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_gif/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ipfilter/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ipfw/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/iwi/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/linux/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/sys/modules/pf/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/sys/modules/pflog/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ral/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/smbfs/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/net/bridgestp.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_media.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/net/route.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_input.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_node.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_node.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_output.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_proto.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_var.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_pcb.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_usrreq.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_pcb.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6_rtr.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/ipsec.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/ipsec_mbuf.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/xform_ah.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/xform_ipcomp.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_crypt.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_smb.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_diskless.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_ioctl.h#1 branch .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_worker.c#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/ata.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/sys/cdefs.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/sys/disk.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/event.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/sys/hash.h#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#48 integrate .. //depot/projects/trustedbsd/mac/sys/sys/md5.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#44 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#69 integrate .. //depot/projects/trustedbsd/mac/sys/sys/protosw.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#46 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#79 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#55 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_inode.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_lookup.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_quota.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#80 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufsmount.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageq.c#16 integrate .. //depot/projects/trustedbsd/mac/tools/regression/aio/aiotest/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/aio/kqueue/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/aio/kqueue/lio/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/audit/audit_pipe_ioctl/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/resolv/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/mlock/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netatalk/simple_send/simple_send.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/msocket/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpfullwindowrst/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/udpconnectjail/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/listenclose/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/reconnect/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/shutdown/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/sigpipe/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/tls/libxx/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/tls/libyy/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ath/athdebug/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/iwi/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/nanobsd.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/acpi.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/biosmptable.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/ncpus.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/net80211/wlandebug/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/net80211/wlanstats/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/net80211/wlanwatch/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/netrate/juggle/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/umastat/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/umastat/umastat.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/Makefile#39 integrate .. //depot/projects/trustedbsd/mac/usr.bin/basename/basename.1#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/chkey/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/chpass/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/fetch/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/usr.bin/ktrace/ktrace.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/lex/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/README#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/login.1#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/login.access.5#4 delete .. //depot/projects/trustedbsd/mac/usr.bin/login/login_access.c#6 delete .. //depot/projects/trustedbsd/mac/usr.bin/login/pathnames.h#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/mkuzip/mkuzip.8#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/netstat/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/newkey/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/passwd/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/rpcinfo/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/systat.1#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/vmstat.c#13 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/Makefile.am#4 delete .. //depot/projects/trustedbsd/mac/usr.bin/tar/bsdtar.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/bsdtar_platform.h#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/configure.ac.in#7 delete .. //depot/projects/trustedbsd/mac/usr.bin/tar/read.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/telnet/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xinstall/install.1#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xinstall/xinstall.c#14 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#47 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/amd/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/amd/amd/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/amd/include/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/bthidd.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/client.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/hid.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/server.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/sdpd/server.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bootparamd/bootparamd/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/bsnmpd/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/modules/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/jail/jail.8#25 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2855/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2alt/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mailwrapper/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/doc/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntp-keygen/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpd/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpdc/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpq/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/add/add.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/add/main.c#14 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/add/perform.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/add/pkg_add.1#13 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/sign/sign.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 20:06:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA82516A401 for ; Mon, 20 Mar 2006 20:06:53 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80D9F43D6B for ; Mon, 20 Mar 2006 20:06:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id DCE4B46C51 for ; Mon, 20 Mar 2006 15:06:41 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CEBFD5C3B2; Mon, 20 Mar 2006 20:06:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C0AD716A420; Mon, 20 Mar 2006 20:06:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A1B516A426 for ; Mon, 20 Mar 2006 20:06:22 +0000 (UTC) (envelope-from csjp@FreeBSD.org) Received: from ems01.seccuris.com (ems01.seccuris.com [204.112.0.35]) by mx1.FreeBSD.org (Postfix) with SMTP id 2306643D5A for ; Mon, 20 Mar 2006 20:06:20 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: (qmail 14682 invoked by uid 0); 20 Mar 2006 20:13:14 -0000 Received: from unknown (HELO ?192.168.11.101?) (unknown) by unknown with SMTP; 20 Mar 2006 20:13:14 -0000 Message-ID: <441F0B39.3000406@FreeBSD.org> Date: Mon, 20 Mar 2006 14:06:17 -0600 From: "Christian S.J. Peron" User-Agent: Mozilla Thunderbird 1.0.7 (Macintosh/20050923) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Todd Miller References: <200603201752.k2KHqO5h027598@repoman.freebsd.org> In-Reply-To: <200603201752.k2KHqO5h027598@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93645 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 20:06:53 -0000 Todd Miller wrote: >http://perforce.freebsd.org/chv.cgi?CH=93645 > >Change 93645 by millert@millert_p3 on 2006/03/20 17:51:24 > > Arg pointer in mac_thread_syscall_{enter,exit} should be > register_t * not int *. Fixes compilation problem on amd64. > >Affected files ... > >.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 edit > >Differences ... > >==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 (text+ko) ==== > >@@ -282,7 +282,7 @@ > } > > int >-mac_thread_syscall_enter(struct thread *td, int *args, int code) >+mac_thread_syscall_enter(struct thread *td, register_t *args, int code) > { > int error; > >@@ -293,7 +293,7 @@ > } > > void >-mac_thread_syscall_exit(struct thread *td, int *args, int code, int errcode) >+mac_thread_syscall_exit(struct thread *td, register_t *args, int code, int errcode) > { > > if (!mac_enforce_syscall) > > > > Does this still build on i386? -- Christian S.J. Peron csjp@FreeBSD.ORG FreeBSD Committer FreeBSD Security Team From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 20:43:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1695216A423 for ; Mon, 20 Mar 2006 20:43:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64D3743D78 for ; Mon, 20 Mar 2006 20:43:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 43EDA46C05 for ; Mon, 20 Mar 2006 15:43:38 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 66228742AB; Mon, 20 Mar 2006 20:41:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 801BA16A426; Mon, 20 Mar 2006 20:41:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D5EF16A422; Mon, 20 Mar 2006 20:41:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBC2943D53; Mon, 20 Mar 2006 20:41:56 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k2KKfphA003109; Mon, 20 Mar 2006 15:41:54 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: "Christian S.J. Peron" Date: Mon, 20 Mar 2006 15:30:37 -0500 User-Agent: KMail/1.9.1 References: <200603201752.k2KHqO5h027598@repoman.freebsd.org> <441F0B39.3000406@FreeBSD.org> In-Reply-To: <441F0B39.3000406@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200603201530.41496.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1345/Mon Mar 20 07:03:16 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-3.6 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Todd Miller , Perforce Change Reviews Subject: Re: PERFORCE change 93645 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 20:43:58 -0000 On Monday 20 March 2006 15:06, Christian S.J. Peron wrote: > Todd Miller wrote: > > >http://perforce.freebsd.org/chv.cgi?CH=93645 > > > >Change 93645 by millert@millert_p3 on 2006/03/20 17:51:24 > > > > Arg pointer in mac_thread_syscall_{enter,exit} should be > > register_t * not int *. Fixes compilation problem on amd64. > > > >Affected files ... > > > >.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 edit > > > >Differences ... > > > >==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 (text+ko) ==== > > > >@@ -282,7 +282,7 @@ > > } > > > > int > >-mac_thread_syscall_enter(struct thread *td, int *args, int code) > >+mac_thread_syscall_enter(struct thread *td, register_t *args, int code) > > { > > int error; > > > >@@ -293,7 +293,7 @@ > > } > > > > void > >-mac_thread_syscall_exit(struct thread *td, int *args, int code, int errcode) > >+mac_thread_syscall_exit(struct thread *td, register_t *args, int code, int errcode) > > { > > > > if (!mac_enforce_syscall) > > > > > > > > > Does this still build on i386? Probably, register_t == int on i386. This is the right change though, syscall arguments are typically passed in registers and/or on the stack, and stack values should fit in registers. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 20:49:23 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF2BF16A400 for ; Mon, 20 Mar 2006 20:49:23 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCEF243D62 for ; Mon, 20 Mar 2006 20:49:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4B26546C8D for ; Mon, 20 Mar 2006 15:49:13 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A3E7B5572F; Mon, 20 Mar 2006 20:47:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 980DF16A43B; Mon, 20 Mar 2006 20:47:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75B2916A434 for ; Mon, 20 Mar 2006 20:47:28 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18A9743D66 for ; Mon, 20 Mar 2006 20:47:24 +0000 (GMT) (envelope-from millert@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 k2KKlNJQ061704 for ; Mon, 20 Mar 2006 20:47:23 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KKlNR1061701 for perforce@freebsd.org; Mon, 20 Mar 2006 20:47:23 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 20:47:23 GMT Message-Id: <200603202047.k2KKlNR1061701@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93661 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 20:49:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=93661 Change 93661 by millert@millert_p3 on 2006/03/20 20:47:12 Update prototypes for {mac,mpo}_thread_syscall_{enter,exit} Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#24 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#19 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#24 (text+ko) ==== @@ -441,8 +441,8 @@ int mac_check_system_swapoff(struct ucred *cred, struct vnode *vp); int mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); -int mac_thread_syscall_enter(struct thread *td, int *args, int code); -void mac_thread_syscall_exit(struct thread *td, int *args, int code, +int mac_thread_syscall_enter(struct thread *td, register_t *args, int code); +void mac_thread_syscall_exit(struct thread *td, register_t *args, int code, int errcode); int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int acc_mode); ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#19 (text+ko) ==== @@ -544,8 +544,8 @@ struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); void (*_mpo_placeholder23)(void); - int (*mpo_thread_syscall_enter)(struct thread *td, int *args, int code); - void (*mpo_thread_syscall_exit)(struct thread *td, int *args, int code, + int (*mpo_thread_syscall_enter)(struct thread *td, register_t *args, int code); + void (*mpo_thread_syscall_exit)(struct thread *td, register_t *args, int code, int error); int (*mpo_check_vnode_access)(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode); From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 21:35:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A75B616A401 for ; Mon, 20 Mar 2006 21:35:53 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F07B43D4C for ; Mon, 20 Mar 2006 21:35:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 20B8D46C16 for ; Mon, 20 Mar 2006 16:35:40 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D349757DFA; Mon, 20 Mar 2006 21:34:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C9E6716A420; Mon, 20 Mar 2006 21:34:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A292A16A41F for ; Mon, 20 Mar 2006 21:34:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E733743D66 for ; Mon, 20 Mar 2006 21:34:23 +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 k2KLYNSD068609 for ; Mon, 20 Mar 2006 21:34:23 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 k2KLYLlU068574 for perforce@freebsd.org; Mon, 20 Mar 2006 21:34:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 20 Mar 2006 21:34:21 GMT Message-Id: <200603202134.k2KLYLlU068574@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 93663 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 21:35:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=93663 Change 93663 by rwatson@rwatson_zoo on 2006/03/20 21:33:22 Integrate TrustedBSD SEBSD branch from TrustedBSD MAC branch, bringing in changes described in P4 change 93655. Affected files ... .. //depot/projects/trustedbsd/sebsd/Makefile#13 integrate .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#13 integrate .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/UPDATING#13 integrate .. //depot/projects/trustedbsd/sebsd/bin/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/ed/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/getfacl/getfacl.1#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/getfacl/getfacl.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/keyword.c#9 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/idcache.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/idcache.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/aes.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/config.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/config.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/config_types.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/defconfig#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/defs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/driver.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_pax.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_psk.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd_cli.1#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd_ctrl.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd_ctrl.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/logwatch/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/logwatch/hostapd#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/md5.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/md5.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/tls.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/version.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/wired.conf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/wpa_ctrl.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/wpa_ctrl.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/netcat/nc.1#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/libngatm.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/uniaddr.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/unifunc.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/unimsg.3#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/unisap.3#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/unistruct.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/pf/pflogd/pflogd.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/base64.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/base64.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/config_file.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/config_types.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/crypto_gnutls.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/developer.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/driver_hostap.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/driver_wired.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_pax.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/events.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/hostap_common.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/hostapd.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/main.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/preauth.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/preauth.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/tls_gnutls.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/tls_schannel.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_i.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/sebsd/etc/Makefile#14 integrate .. //depot/projects/trustedbsd/sebsd/etc/devd.conf#10 integrate .. //depot/projects/trustedbsd/sebsd/etc/hosts.allow#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/isdn/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.include.dist#16 integrate .. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.x11-4.dist#7 integrate .. //depot/projects/trustedbsd/sebsd/etc/mtree/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/periodic/daily/440.status-mailq#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/periodic/security/800.loginfail#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/Makefile#12 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/jail#10 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/kernel#1 branch .. //depot/projects/trustedbsd/sebsd/etc/rc.d/nsswitch#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/syscons#6 integrate .. //depot/projects/trustedbsd/sebsd/games/factor/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libdialog/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libg2c/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libgcc/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libgcov/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libobjc/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/bc/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cc_tools/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cvs/cvs/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/dialog/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/include/Makefile#16 integrate .. //depot/projects/trustedbsd/sebsd/include/arpa/nameser.h#2 integrate .. //depot/projects/trustedbsd/sebsd/include/stdlib.h#8 integrate .. //depot/projects/trustedbsd/sebsd/kerberos5/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/kerberos5/lib/libgssapi/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/Makefile#18 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/bind/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/bind9/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/config.mk#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/dns/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/isc/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/isccc/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/isccfg/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/lwres/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libarchive/INSTALL#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libarchive/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libarchive/Makefile.am#4 delete .. //depot/projects/trustedbsd/sebsd/lib/libarchive/archive.h.in#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libarchive/archive_read_support_format_tp.c#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libarchive/configure.ac.in#4 delete .. //depot/projects/trustedbsd/sebsd/lib/libc/Makefile#11 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/Versions.def#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/alpha/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/amd64/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/arm/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/db/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/db/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/gdtoa/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/gen/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/gen/_pthread_stubs.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/gen/_spinlock_stub.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/gmon/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/gmon/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/i386/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/ia64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/ia64/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/include/libc_private.h#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/include/namespace.h#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/include/un-namespace.h#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/locale/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/locale/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/net/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/net/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/nls/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/nls/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/posix1e/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/posix1e/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/powerpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/quad/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/quad/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/regex/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/regex/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/rpc/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/rpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/softfloat/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/softfloat/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/sparc64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/sparc64/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/stdio/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/stdio/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/malloc.3#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/malloc.c#12 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/strtonum.3#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/strtonum.c#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/stdtime/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/stdtime/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/string/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/string/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/sys/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/sys/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/sys/mq.c#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libc/sys/recv.2#9 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/uuid/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/uuid/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/xdr/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/xdr/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/yp/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/yp/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc_r/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libcrypt/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libfetch/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libgpib/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libio/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libipsec/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libmilter/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libncp/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libncurses/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/modules.inc#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_login_access/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_login_access/login.access.5#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_login_access/pam_login_access.8#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_nologin/pam_nologin.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_unix/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpcap/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpmc/pmc.3#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/pthread.map#10 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/sys/thr_error.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_accept.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_aio_suspend.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_atfork.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_get_np.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getstack.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_init.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setguardsize.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setinheritsched.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setschedparam.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setscope.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setstack.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_barrier.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_barrierattr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_cancel.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_clean.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_close.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_concurrency.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_cond.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_condattr_init.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_connect.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_creat.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_create.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_detach.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_equal.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_execve.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_exit.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_fcntl.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_fork.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_fsync.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_getprio.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_getschedparam.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_info.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_init.c#10 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_join.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_kill.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_main_np.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mattr_init.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mattr_kind_np.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_msync.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_multi_np.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mutex.c#11 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mutex_prioceiling.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mutex_protocol.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_nanosleep.c#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_once.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_open.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_pause.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_poll.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_private.h#12 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_pselect.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_pspinlock.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_raise.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_read.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_readv.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_resume_np.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_rwlock.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_select.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_self.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sem.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_setprio.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_setschedparam.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sig.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigaction.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigmask.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigpending.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigprocmask.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigsuspend.c#9 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigwait.c#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_single_np.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sleep.c#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_spec.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_spinlock.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_suspend_np.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_switch_np.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_symbols.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_system.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_tcdrain.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_vfork.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_wait.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_wait4.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_waitpid.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_write.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_writev.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_yield.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libradius/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/librpcsvc/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/aio.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/mq.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/sigev_thread.h#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/timer.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libsm/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libsmb/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libstand/printf.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libtelnet/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libthr/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libthr/pthread.map#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_init.c#9 integrate .. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_timer.c#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libwrap/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/libexec/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/libexec/ftpd/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/libexec/lukemftpd/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/libexec/tcpd/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/libexec/telnetd/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/release/Makefile#16 integrate .. //depot/projects/trustedbsd/sebsd/release/amd64/boot_crunch.conf#6 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/errata/article.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#3 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#3 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate .. //depot/projects/trustedbsd/sebsd/release/i386/boot_crunch.conf#7 integrate .. //depot/projects/trustedbsd/sebsd/release/ia64/boot_crunch.conf#8 integrate .. //depot/projects/trustedbsd/sebsd/release/pc98/boot_crunch.conf#7 integrate .. //depot/projects/trustedbsd/sebsd/release/picobsd/bridge/crunch.conf#7 integrate .. //depot/projects/trustedbsd/sebsd/release/picobsd/tinyware/login/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/release/scripts/kernels-install.sh#1 branch .. //depot/projects/trustedbsd/sebsd/release/scripts/package-split.py#3 integrate .. //depot/projects/trustedbsd/sebsd/rescue/librescue/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/rescue/rescue/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/sbin/Makefile#14 integrate .. //depot/projects/trustedbsd/sebsd/sbin/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/sebsd/sbin/atacontrol/atacontrol.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sbin/bsdlabel/bsdlabel.8#8 integrate .. //depot/projects/trustedbsd/sebsd/sbin/geom/class/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sbin/geom/class/mirror/gmirror.8#4 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ggate/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ggate/ggatec/ggatec.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ifconfig/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ifconfig/ifconfig.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ifconfig/ifvlan.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ipfw/ipfw.8#11 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ipfw/ipfw2.c#13 integrate .. //depot/projects/trustedbsd/sebsd/secure/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/secure/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/secure/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/secure/lib/libcrypto/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/secure/lib/libcrypto/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/sebsd/secure/lib/libssh/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/secure/libexec/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.bin/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.bin/ssh/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.sbin/sshd/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/share/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/share/doc/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/share/doc/smm/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/share/examples/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/share/examples/etc/make.conf#10 integrate .. //depot/projects/trustedbsd/sebsd/share/examples/kld/syscall/test/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/share/examples/netgraph/ether.bridge#2 integrate .. //depot/projects/trustedbsd/sebsd/share/man/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man3/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/ata.4#8 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/cpufreq.4#3 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/dcons.4#7 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/gre.4#4 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/ipw.4#3 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/iwi.4#3 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/netgraph.4#7 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/ng_fec.4#2 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/ral.4#3 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/sysmouse.4#7 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man5/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man5/nsswitch.conf.5#4 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man7/build.7#8 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man9/firmware.9#2 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man9/g_consumer.9#3 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man9/hash.9#1 branch .. //depot/projects/trustedbsd/sebsd/share/man/man9/mbuf.9#11 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.README#8 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.incs.mk#4 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.info.mk#7 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.lib.mk#9 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.libnames.mk#13 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.nls.mk#3 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.own.mk#7 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.prog.mk#9 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/version_gen.awk#1 branch .. //depot/projects/trustedbsd/sebsd/sys/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/alpha/clock.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/linux/linux_proto.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/linux/linux_syscall.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/linux/linux_sysent.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/linux/linux_sysvec.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/linux/syscalls.master#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/apic_vector.S#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/db_trace.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/pmap.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/trap.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/include/asmacros.h#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/include/bus.h#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/include/pmap.h#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/include/trap.h#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/pci/pci_bus.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/arm/in_cksum.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/files.at91#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/trustedbsd/sebsd/sys/arm/include/in_cksum.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/alpha/common/Makefile.common#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/i386/libi386/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/i386/libi386/libi386.h#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/i386/loader/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/ia64/ski/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/pc98/loader/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/powerpc/loader/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/sparc64/loader/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_getcwd.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_ipc.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_mib.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_signal.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_socket.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_sysctl.c#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_uid16.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/NOTES#15 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files#19 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.alpha#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.amd64#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.i386#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.ia64#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.pc98#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.powerpc#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.sparc64#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/options#17 integrate .. //depot/projects/trustedbsd/sebsd/sys/contrib/pf/net/if_pflog.h#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/ddb/db_command.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/ddb/ddb.h#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/aic7xxx/aic79xx_osm.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-all.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-all.h#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-disk.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-raid.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/atapi-cd.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/atapi-fd.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/atapi-fd.h#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/cs/if_cs.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/exca/exca.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ieee488/upd7210.c#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/mpt/mpt.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/if_ral.c#3 delete .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/if_ral_pccard.c#3 delete .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/if_ralreg.h#3 delete .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/if_ralvar.h#3 delete .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2560.c#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2560reg.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2560var.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2661.c#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2661reg.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2661var.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/sound/pci/ich.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/sound/pcm/sound.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/sound/pcm/sound.h#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/sound/pcm/vchan.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/usb/ehci.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/usb/umass.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/fs/fifofs/fifo_vnops.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/geom_io.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/raid3/g_raid3_ctl.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/i386/geode.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/i386/machdep.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/i386/vm_machdep.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux.h#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux_dummy.c#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux_proto.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux_syscall.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux_sysent.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux_sysvec.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/syscalls.master#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/isofs/cd9660/cd9660_rrip.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/imgact_aout.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#22 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_environment.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_exec.c#18 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_exit.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_fork.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#30 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_resource.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_sig.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_tc.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_thread.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/subr_prf.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/uipc_mbuf.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/uipc_socket2.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_cluster.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_vnops.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/Makefile#16 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/acpi/acpi_video/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/ata/atausb/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/sys/modules/ce/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/cp/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/dummynet/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/if_gif/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/ipfilter/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/iwi/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/linux/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/netgraph/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/pf/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/pflog/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/ral/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/smbfs/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/bridgestp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/if_media.h#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/if_tap.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/if_vlan.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/route.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/rtsock.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_input.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_node.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_node.h#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_proto.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_var.h#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/netatalk/ddp_usrreq.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet/if_ether.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet/in_pcb.h#15 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet6/in6.h#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet6/in6_pcb.c#16 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet6/nd6_rtr.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/netipsec/ipsec.h#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/netipsec/ipsec_mbuf.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/netipsec/xform_ah.c#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/netipsec/xform_ipcomp.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/netnatm/natm.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/netsmb/smb_crypt.c#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/netsmb/smb_smb.c#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/nfsclient/nfs_diskless.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/nfsclient/nfs_socket.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/nfsclient/nfs_vnops.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/nfsserver/nfs_serv.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/nfsserver/nfs_srvsock.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_ioctl.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_worker.c#1 branch .. //depot/projects/trustedbsd/sebsd/sys/security/mac_lomac/mac_lomac.c#18 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/ata.h#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/cdefs.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/disk.h#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/event.h#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/hash.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/sys/mbuf.h#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/md5.h#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/mount.h#15 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/proc.h#16 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/protosw.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/socketvar.h#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/vnode.h#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ffs/ffs_extern.h#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ffs/ffs_snapshot.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ffs/ffs_vfsops.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_inode.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_lookup.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_quota.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_vnops.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufsmount.h#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/swap_pager.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/vm_contig.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/vm_fault.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/vm_map.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/vm_page.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/vm_pageq.c#9 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/aio/aiotest/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/aio/kqueue/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/aio/kqueue/lio/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/audit/audit_pipe_ioctl/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#1 branch .. //depot/projects/trustedbsd/sebsd/tools/regression/lib/libc/resolv/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/mlock/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/netatalk/simple_send/simple_send.c#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/netinet/msocket/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/netinet/tcpfullwindowrst/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/netinet/udpconnectjail/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/sockets/listenclose/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/sockets/reconnect/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/sockets/shutdown/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/sockets/sigpipe/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/tls/libxx/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/tls/libyy/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ath/athdebug/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/iwi/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ncpus/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ncpus/acpi.c#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ncpus/biosmptable.c#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ncpus/ncpus.c#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/net80211/wlandebug/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/net80211/wlanstats/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/net80211/wlanwatch/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/netrate/juggle/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/umastat/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/umastat/umastat.c#2 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/Makefile#12 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/basename/basename.1#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/chkey/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/chpass/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/fetch/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/ktrace/ktrace.c#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/lex/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/login/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/login/README#2 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login.1#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login.access.5#3 delete .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login_access.c#2 delete .. //depot/projects/trustedbsd/sebsd/usr.bin/login/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/mkuzip/mkuzip.8#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/netstat/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/newkey/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/passwd/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/rpcinfo/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/systat/systat.1#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/systat/vmstat.c#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/Makefile.am#3 delete .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/bsdtar.c#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/bsdtar_platform.h#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/configure.ac.in#4 delete .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/read.c#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/telnet/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/xinstall/install.1#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/xinstall/xinstall.c#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/Makefile#15 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/amd/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/amd/amd/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/amd/include/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/bthidd/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/bthidd/bthidd.c#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/bthidd/client.c#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/bthidd/hid.c#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/bthidd/server.c#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/sdpd/server.c#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bootparamd/bootparamd/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bsnmpd/bsnmpd/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bsnmpd/modules/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/jail/jail.8#11 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/lpr/filters.ru/koi2855/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/lpr/filters.ru/koi2alt/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/lpr/filters/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/mailwrapper/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/doc/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/ntp-keygen/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/ntpd/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/ntpdc/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/ntpq/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/add/add.h#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/add/main.c#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/add/perform.c#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/add/pkg_add.1#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 20 22:25:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A7ED16A420 for ; Mon, 20 Mar 2006 22:25:04 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46BBB43D95 for ; Mon, 20 Mar 2006 22:24:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1998046C09 for ; Mon, 20 Mar 2006 17:24:25 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1E01791DE4; Mon, 20 Mar 2006 22:13:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1524B16A425; Mon, 20 Mar 2006 22:13:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0D5916A400 for ; Mon, 20 Mar 2006 22:13:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7538443D46 for ; Mon, 20 Mar 2006 22:13:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KMDD1q075861 for ; Mon, 20 Mar 2006 22:13:13 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 k2KMDDH0075858 for perforce@freebsd.org; Mon, 20 Mar 2006 22:13:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 20 Mar 2006 22:13:13 GMT Message-Id: <200603202213.k2KMDDH0075858@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 93670 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 22:25:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=93670 Change 93670 by rwatson@rwatson_zoo on 2006/03/20 22:12:32 Remove Makefile lines not present in CVS. Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.bin/login/Makefile#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.bin/login/Makefile#9 (text+ko) ==== @@ -8,7 +8,6 @@ CFLAGS+=-DLOGALL DPADD= ${LIBUTIL} ${LIBPAM} LDADD= -lutil ${MINUSLPAM} -lbsm -MAN= login.1 login.access.5 .if ${MK_SETUID_LOGIN} != "no" BINOWN= root From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 21 15:44:33 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D73E416A41F for ; Tue, 21 Mar 2006 15:44:33 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66A9F43D67 for ; Tue, 21 Mar 2006 15:44:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1ED1146C09 for ; Tue, 21 Mar 2006 10:44:21 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 555B6554BE; Tue, 21 Mar 2006 15:44:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E00616A423; Tue, 21 Mar 2006 15:44:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 124C716A400 for ; Tue, 21 Mar 2006 15:44:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D0E543D5F for ; Tue, 21 Mar 2006 15:44:13 +0000 (GMT) (envelope-from millert@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 k2LFiCU0055909 for ; Tue, 21 Mar 2006 15:44:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LFiC9F055906 for perforce@freebsd.org; Tue, 21 Mar 2006 15:44:12 GMT (envelope-from millert@freebsd.org) Date: Tue, 21 Mar 2006 15:44:12 GMT Message-Id: <200603211544.k2LFiC9F055906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93716 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 15:44:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=93716 Change 93716 by millert@millert_p3 on 2006/03/21 15:43:43 This is linux code so use printk for consistency. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.c#9 (text+ko) ==== @@ -614,11 +614,11 @@ !VOP_GETATTR(vp, &va, curthread->td_ucred, curthread)) { - printf(" inode=%ld, mountpoint=%s, ", + printk(" inode=%ld, mountpoint=%s, ", va.va_fileid, vp->v_mount->mnt_stat.f_mntonname); } else { - printf(" fs/inode info not available"); + printk(" fs/inode info not available"); } } break; From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 21 20:49:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC64216A481 for ; Tue, 21 Mar 2006 20:49:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B108243D53 for ; Tue, 21 Mar 2006 20:49:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9166846C51 for ; Tue, 21 Mar 2006 15:49:48 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2D975554CD; Tue, 21 Mar 2006 20:49:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 279B916A420; Tue, 21 Mar 2006 20:49:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F175516A401 for ; Tue, 21 Mar 2006 20:49:41 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4A1943D53 for ; Tue, 21 Mar 2006 20:49:41 +0000 (GMT) (envelope-from millert@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 k2LKnfkO086054 for ; Tue, 21 Mar 2006 20:49:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LKnfGL086051 for perforce@freebsd.org; Tue, 21 Mar 2006 20:49:41 GMT (envelope-from millert@freebsd.org) Date: Tue, 21 Mar 2006 20:49:41 GMT Message-Id: <200603212049.k2LKnfGL086051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93741 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 20:49:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=93741 Change 93741 by millert@millert_p3 on 2006/03/21 20:48:41 Fix mis-merge Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#23 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#23 (text+ko) ==== @@ -39,6 +39,7 @@ #include "opt_compat.h" #include "opt_ddb.h" +#include "opt_mac.h" #include #include @@ -52,6 +53,7 @@ #include #include #include +#include #include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 21 22:18:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7A5016A400 for ; Tue, 21 Mar 2006 22:18:18 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA86743D45 for ; Tue, 21 Mar 2006 22:18:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 368FA46C2F for ; Tue, 21 Mar 2006 17:18:14 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1809555721; Tue, 21 Mar 2006 22:18:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 101B516A425; Tue, 21 Mar 2006 22:18:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E463C16A423 for ; Tue, 21 Mar 2006 22:18:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B51A43D48 for ; Tue, 21 Mar 2006 22:18:11 +0000 (GMT) (envelope-from millert@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 k2LMIB3i090262 for ; Tue, 21 Mar 2006 22:18:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LMIBGA090259 for perforce@freebsd.org; Tue, 21 Mar 2006 22:18:11 GMT (envelope-from millert@freebsd.org) Date: Tue, 21 Mar 2006 22:18:11 GMT Message-Id: <200603212218.k2LMIBGA090259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93757 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 22:18:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=93757 Change 93757 by millert@millert_p3 on 2006/03/21 22:17:29 Remove unused define and variable. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/init.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/init.c#5 (text+ko) ==== @@ -23,10 +23,6 @@ #include #include -#define POLICYDB_PATHPREFIX "/etc/security/sebsd/policy" - -char policyfile[MAXPATHLEN]; - int security_init(void) { int rc; From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 26 13:32:49 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B71016A482 for ; Sun, 26 Mar 2006 13:32:49 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B6DA43D45 for ; Sun, 26 Mar 2006 13:32:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3013046C43 for ; Sun, 26 Mar 2006 08:32:46 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BF15E556A6; Sun, 26 Mar 2006 13:28:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B7FCA16A423; Sun, 26 Mar 2006 13:28:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E88116A422 for ; Sun, 26 Mar 2006 13:28:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 668E543D5D for ; Sun, 26 Mar 2006 13:28:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2QDSSdL005667 for ; Sun, 26 Mar 2006 13:28:28 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 k2QDSS3p005664 for perforce@freebsd.org; Sun, 26 Mar 2006 13:28:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Mar 2006 13:28:28 GMT Message-Id: <200603261328.k2QDSS3p005664@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 94049 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Mar 2006 13:32:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=94049 Change 94049 by rwatson@rwatson_peppercorn on 2006/03/26 13:28:04 Add simple tar script to tar up some pertinent capability files for people who are interested. Affected files ... .. //depot/projects/trustedbsd/cap/tar.sh#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 26 13:34:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 429ED16A422 for ; Sun, 26 Mar 2006 13:34:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0165C43D55 for ; Sun, 26 Mar 2006 13:34:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 44C1046BFB for ; Sun, 26 Mar 2006 08:34:21 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0F6C7631E2; Sun, 26 Mar 2006 13:30:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0815216A430; Sun, 26 Mar 2006 13:30:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C298D16A42D for ; Sun, 26 Mar 2006 13:30:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6131343D60 for ; Sun, 26 Mar 2006 13:30:31 +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 k2QDUVt1005826 for ; Sun, 26 Mar 2006 13:30:31 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 k2QDUVCp005823 for perforce@freebsd.org; Sun, 26 Mar 2006 13:30:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Mar 2006 13:30:31 GMT Message-Id: <200603261330.k2QDUVCp005823@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 94050 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Mar 2006 13:34:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=94050 Change 94050 by rwatson@rwatson_peppercorn on 2006/03/26 13:29:44 Fix sh script. Affected files ... .. //depot/projects/trustedbsd/cap/tar.sh#2 edit Differences ... ==== //depot/projects/trustedbsd/cap/tar.sh#2 (text+ko) ==== @@ -1,10 +1,3 @@ -FILES= sys/sys/capability.h \ - sys/kern/kern_prot.c \ - sys/kern/kern_cap.c \ - lib/libc/posix1e \ - etc/capability - usr.sbin/getpcap \ - usr.sbin/getfcap \ - usr.sbin/setfcap +FILES="sys/sys/capability.h sys/kern/kern_prot.c sys/kern/kern_cap.c lib/libc/posix1e etc/capability usr.sbin/getpcap usr.sbin/getfcap usr.sbin/setfcap" tar -czf 20060326-cap.tgz ${FILES} From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 26 13:36:33 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E3E416A400 for ; Sun, 26 Mar 2006 13:36:33 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D8A143D48 for ; Sun, 26 Mar 2006 13:36:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3FB4C46C2F for ; Sun, 26 Mar 2006 08:36:30 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BCAB358339; Sun, 26 Mar 2006 13:32:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B54E416A41F; Sun, 26 Mar 2006 13:32:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C3DF16A400 for ; Sun, 26 Mar 2006 13:32:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 442D243D45 for ; Sun, 26 Mar 2006 13:32: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 k2QDWYDR005927 for ; Sun, 26 Mar 2006 13:32: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 k2QDWXUC005924 for perforce@freebsd.org; Sun, 26 Mar 2006 13:32:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Mar 2006 13:32:33 GMT Message-Id: <200603261332.k2QDWXUC005924@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 94051 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Mar 2006 13:36:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=94051 Change 94051 by rwatson@rwatson_peppercorn on 2006/03/26 13:32:04 Add more things to tarball. Affected files ... .. //depot/projects/trustedbsd/cap/tar.sh#3 edit Differences ... ==== //depot/projects/trustedbsd/cap/tar.sh#3 (text+ko) ==== @@ -1,3 +1,3 @@ -FILES="sys/sys/capability.h sys/kern/kern_prot.c sys/kern/kern_cap.c lib/libc/posix1e etc/capability usr.sbin/getpcap usr.sbin/getfcap usr.sbin/setfcap" +FILES="sys/sys/capability.h sys/kern/kern_prot.c sys/kern/kern_cap.c lib/libc/posix1e etc/capability usr.sbin/getpcap usr.sbin/getfcap usr.sbin/setfcap bin/sh/cap.c share/man/man5/capability.5 lib/libc_r/uthread/*cap*" tar -czf 20060326-cap.tgz ${FILES} From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 26 13:40:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E27116A401 for ; Sun, 26 Mar 2006 13:40:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBAE143D48 for ; Sun, 26 Mar 2006 13:40:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6211A46C06 for ; Sun, 26 Mar 2006 08:40:28 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CC6E091996; Sun, 26 Mar 2006 13:34:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0839216A45D; Sun, 26 Mar 2006 13:34:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D9C7716A45A for ; Sun, 26 Mar 2006 13:34:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9792643D75 for ; Sun, 26 Mar 2006 13:34:37 +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 k2QDYbYo005995 for ; Sun, 26 Mar 2006 13:34:37 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 k2QDYbeP005992 for perforce@freebsd.org; Sun, 26 Mar 2006 13:34:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Mar 2006 13:34:37 GMT Message-Id: <200603261334.k2QDYbeP005992@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 94053 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Mar 2006 13:40:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=94053 Change 94053 by rwatson@rwatson_fledge on 2006/03/26 13:34:25 Add 20060326 cap tarball download for people looking for BSD-licensed POSIX.1e files. These are from a very early 6.0 POSIX.1e capability snapshot found in the trustedbsd_cap branch. Affected files ... .. //depot/projects/trustedbsd/www/cap.page#3 edit Differences ... ==== //depot/projects/trustedbsd/www/cap.page#3 (text+ko) ==== @@ -6,10 +6,10 @@ 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. + 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. + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/cap.page#2 $ + $P4: //depot/projects/trustedbsd/www/cap.page#3 $ @@ -74,6 +74,9 @@ MAC modules to deny privilege based on the POSIX.1e privilege categories.

    +

    2006-03-26 FreeBSD 5.0 POSIX.1e capability reference files + snapshot Download.

    + From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 26 13:40:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C87D16A400 for ; Sun, 26 Mar 2006 13:40:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCF7443D45 for ; Sun, 26 Mar 2006 13:40:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EBD6446C43 for ; Sun, 26 Mar 2006 08:40:53 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 335805C3D1; Sun, 26 Mar 2006 13:36:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C4E516A429; Sun, 26 Mar 2006 13:36:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5F1916A41F for ; Sun, 26 Mar 2006 13:36:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AB0F43D46 for ; Sun, 26 Mar 2006 13:36:40 +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 k2QDaegc006164 for ; Sun, 26 Mar 2006 13:36:40 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 k2QDaeSu006161 for perforce@freebsd.org; Sun, 26 Mar 2006 13:36:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Mar 2006 13:36:40 GMT Message-Id: <200603261336.k2QDaeSu006161@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 94054 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Mar 2006 13:40:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=94054 Change 94054 by rwatson@rwatson_fledge on 2006/03/26 13:36:07 Better description of 20060326 cap snapshot tarball. Affected files ... .. //depot/projects/trustedbsd/www/cap.page#4 edit Differences ... ==== //depot/projects/trustedbsd/www/cap.page#4 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/cap.page#3 $ + $P4: //depot/projects/trustedbsd/www/cap.page#4 $ @@ -75,7 +75,10 @@ categories.

    2006-03-26 FreeBSD 5.0 POSIX.1e capability reference files - snapshot Download.

    + snapshot. These are reference BSD-licensed POSIX.1e privilege + files derived from an early TrustedBSD implementation, and do + not represent a complete or supported implementation. + Download.

    From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 26 13:52:04 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A909016A400 for ; Sun, 26 Mar 2006 13:52:04 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95E7D43D5D for ; Sun, 26 Mar 2006 13:51:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 78B4046C06 for ; Sun, 26 Mar 2006 08:51:50 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BD9C0567AD; Sun, 26 Mar 2006 12:23:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B666B16A41F; Sun, 26 Mar 2006 12:23:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58F3F16A400 for ; Sun, 26 Mar 2006 12:23:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01ACB43D53 for ; Sun, 26 Mar 2006 12:23:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2QCNgMc094996 for ; Sun, 26 Mar 2006 12:23: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 k2QCNgae094993 for perforce@freebsd.org; Sun, 26 Mar 2006 12:23:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Mar 2006 12:23:42 GMT Message-Id: <200603261223.k2QCNgae094993@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 94040 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Mar 2006 13:52:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=94040 Change 94040 by rwatson@rwatson_peppercorn on 2006/03/26 12:22:42 Break capabilities out into their own page, discuss what's up with the implementation, where to find it, and the fact that portions of it are present in the SEBSD branch. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#4 edit .. //depot/projects/trustedbsd/www/components.page#5 edit .. //depot/projects/trustedbsd/www/sidebar.xml#5 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#4 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#3 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#4 $ STYLESHEET= page.xsl @@ -45,6 +45,7 @@ SRCS+= sebsd.page SRCS+= sedarwin.page SRCS+= audit.page +SRCS+= cap.page IMGS= components.gif componentsgray.gif IMGS+= developers.gif developersgray.gif docs.gif ==== //depot/projects/trustedbsd/www/components.page#5 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/components.page#4 $ + $P4: //depot/projects/trustedbsd/www/components.page#5 $ @@ -153,8 +153,10 @@ compromise. The capabilities development branch is largely complete, but is based on an older FreeBSD 5.0-CURRENT snapshot. Elements of this implementation - are being updated for FreeBSD 5.2 and will be available - in 2003Q3 as part of the MAC Framework.

    + are being updated for FreeBSD 5.2 and are available as + part of the SEBSD version of the TrustedBSD MAC Framework. + For more information, see the Capability + Page.

    ==== //depot/projects/trustedbsd/www/sidebar.xml#5 (text+ko) ==== @@ -6,7 +6,7 @@
  • ACLs
  • Audit
  • Extended Attributes
    • -
  • Capabilities
    • +
  • Capabilities
  • GEOM
  • MAC
  • OpenBSM
    • @@ -23,7 +23,7 @@
  • ACLs
  • Audit
  • Extended Attributes
    • -
  • Capabilities
    • +
  • Capabilities
  • GEOM
  • MAC
  • OpenBSM
    • From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 26 13:53:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F53F16A423 for ; Sun, 26 Mar 2006 13:53:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AFF943D70 for ; Sun, 26 Mar 2006 13:53:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8E6E846C06 for ; Sun, 26 Mar 2006 08:53:23 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 432EF563D6; Sun, 26 Mar 2006 12:35:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B93D16A425; Sun, 26 Mar 2006 12:35:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F196716A423 for ; Sun, 26 Mar 2006 12:35:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A8B643D58 for ; Sun, 26 Mar 2006 12:35:01 +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 k2QCZ1ef095809 for ; Sun, 26 Mar 2006 12:35:01 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 k2QCZ0Cf095806 for perforce@freebsd.org; Sun, 26 Mar 2006 12:35:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Mar 2006 12:35:00 GMT Message-Id: <200603261235.k2QCZ0Cf095806@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 94045 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Mar 2006 13:53:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=94045 Change 94045 by rwatson@rwatson_peppercorn on 2006/03/26 12:34:52 Add capability page missed in previous submit. Affected files ... .. //depot/projects/trustedbsd/www/cap.page#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Sun Mar 26 13:58:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C27C16A423 for ; Sun, 26 Mar 2006 13:58:53 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9495443D49 for ; Sun, 26 Mar 2006 13:58:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 08DA146C43 for ; Sun, 26 Mar 2006 08:58:49 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8244957ECB; Sun, 26 Mar 2006 12:38:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A87416A42A; Sun, 26 Mar 2006 12:38:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3408116A426 for ; Sun, 26 Mar 2006 12:38:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4FC143D5D for ; Sun, 26 Mar 2006 12:38:05 +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 k2QCc5EY095973 for ; Sun, 26 Mar 2006 12:38:05 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 k2QCc53o095970 for perforce@freebsd.org; Sun, 26 Mar 2006 12:38:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Mar 2006 12:38:05 GMT Message-Id: <200603261238.k2QCc53o095970@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 94046 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Mar 2006 13:58:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=94046 Change 94046 by rwatson@rwatson_peppercorn on 2006/03/26 12:37:22 More information on what POSIX.1e privileges do. Affected files ... .. //depot/projects/trustedbsd/www/cap.page#2 edit Differences ... ==== //depot/projects/trustedbsd/www/cap.page#2 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/cap.page#1 $ + $P4: //depot/projects/trustedbsd/www/cap.page#2 $ @@ -44,10 +44,14 @@ p4-cvs-trustedbsd-cap

    -

    POSIX.1e breaks down root privilege into a set of capabilities, or - more strictly, privileges, which allow the meeting of specific +

    POSIX.1e breaks root privilege into a set of capabilities, or + more strictly, privileges, which allow the granting of specific privilege requirements for POSIX calls, such as setuid(). - The TrustedBSD capability project is currently inactive, but an + POSIX.1e defines extension to process and file state to allow + privileges to be granted to processes, either by inheritence or + a file privilege model similar to setuid/setgid.

    + +

    The TrustedBSD capability project is currently inactive, but an implementation of POSIX.1e capabilities for an older FreeBSD release is available and functional, and may be found in Perforce/cvsup. Certain key files are provided in a tarball for download on this From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 27 15:44:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0445616A420 for ; Mon, 27 Mar 2006 15:44:43 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04CEB43D4C for ; Mon, 27 Mar 2006 15:44:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0BBA846CE2 for ; Mon, 27 Mar 2006 10:44:29 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C82B4555CE; Mon, 27 Mar 2006 15:44:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C1F0616A422; Mon, 27 Mar 2006 15:44:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B5C916A401 for ; Mon, 27 Mar 2006 15:44:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63D8143D46 for ; Mon, 27 Mar 2006 15:44: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 k2RFiQeB022580 for ; Mon, 27 Mar 2006 15:44: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 k2RFiQTK022577 for perforce@freebsd.org; Mon, 27 Mar 2006 15:44:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Mar 2006 15:44:26 GMT Message-Id: <200603271544.k2RFiQTK022577@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 94112 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2006 15:44:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=94112 Change 94112 by rwatson@rwatson_zoo on 2006/03/27 15:43:34 Add missing err.h include, sort includes. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#14 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#14 $ */ /* @@ -42,11 +42,12 @@ #include +#include +#include +#include #include #include #include -#include -#include #include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 27 21:12:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AC3616A400 for ; Mon, 27 Mar 2006 21:12:44 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F1A643D69 for ; Mon, 27 Mar 2006 21:12:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5AD0346BF9 for ; Mon, 27 Mar 2006 16:12:33 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CAC5A556B7; Mon, 27 Mar 2006 21:07:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B9DB16A427; Mon, 27 Mar 2006 21:07:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D02016A425 for ; Mon, 27 Mar 2006 21:07:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E22C643D45 for ; Mon, 27 Mar 2006 21:07:03 +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 k2RL73KD054982 for ; Mon, 27 Mar 2006 21:07:03 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 k2RL73Lg054979 for perforce@freebsd.org; Mon, 27 Mar 2006 21:07:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Mar 2006 21:07:03 GMT Message-Id: <200603272107.k2RL73Lg054979@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 94126 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2006 21:12:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=94126 Change 94126 by rwatson@rwatson_zoo on 2006/03/27 21:06:02 Add audit_filter.h, which defines a shared object interface for pluggable modules interested in tracking live audit records. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 27 21:13:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B63F816A423 for ; Mon, 27 Mar 2006 21:13:53 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88EEA43D49 for ; Mon, 27 Mar 2006 21:13:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C4BA746B0C for ; Mon, 27 Mar 2006 16:13:50 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 655DA5B98A; Mon, 27 Mar 2006 21:08:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EB1416A429; Mon, 27 Mar 2006 21:08:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D51516A427 for ; Mon, 27 Mar 2006 21:08:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F39B43D49 for ; Mon, 27 Mar 2006 21:08:05 +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 k2RL85ob055106 for ; Mon, 27 Mar 2006 21:08:05 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 k2RL85FE055103 for perforce@freebsd.org; Mon, 27 Mar 2006 21:08:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Mar 2006 21:08:05 GMT Message-Id: <200603272108.k2RL85FE055103@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 94127 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2006 21:13:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=94127 Change 94127 by rwatson@rwatson_zoo on 2006/03/27 21:07:12 First very basic cut at an audit filter daemon, which monitors /etc/auditpipe and feeds records to shared objects registered via /etc/security/audit_filter. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 27 21:14:15 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D97B116A401 for ; Mon, 27 Mar 2006 21:14:15 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3786843D5C for ; Mon, 27 Mar 2006 21:14:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8E77C46CD9 for ; Mon, 27 Mar 2006 16:14:11 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B0B9D92797; Mon, 27 Mar 2006 21:09:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A06816A491; Mon, 27 Mar 2006 21:09:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F283C16A458 for ; Mon, 27 Mar 2006 21:09:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1795643D67 for ; Mon, 27 Mar 2006 21:09:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2RL976l055142 for ; Mon, 27 Mar 2006 21:09:07 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 k2RL971N055139 for perforce@freebsd.org; Mon, 27 Mar 2006 21:09:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Mar 2006 21:09:07 GMT Message-Id: <200603272109.k2RL971N055139@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 94129 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2006 21:14:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=94129 Change 94129 by rwatson@rwatson_zoo on 2006/03/27 21:08:48 Sample no-op audit filter module. Affected files ... .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 27 21:14:23 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE19A16A400 for ; Mon, 27 Mar 2006 21:14:23 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A50F043D80 for ; Mon, 27 Mar 2006 21:14:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6ACC546C39 for ; Mon, 27 Mar 2006 16:14:04 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DFF75565C4; Mon, 27 Mar 2006 21:09:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D8C4F16A422; Mon, 27 Mar 2006 21:09:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B7E2316A41F for ; Mon, 27 Mar 2006 21:09:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3F0443D64 for ; Mon, 27 Mar 2006 21:09:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2RL97Jf055136 for ; Mon, 27 Mar 2006 21:09:07 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 k2RL97gY055133 for perforce@freebsd.org; Mon, 27 Mar 2006 21:09:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Mar 2006 21:09:07 GMT Message-Id: <200603272109.k2RL97gY055133@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 94128 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2006 21:14:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=94128 Change 94128 by rwatson@rwatson_zoo on 2006/03/27 21:08:17 Sample audit_filter configuration file. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_filter#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 27 21:16:32 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C99E616A422 for ; Mon, 27 Mar 2006 21:16:32 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AD5243D5C for ; Mon, 27 Mar 2006 21:16:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3FBBA46C3D for ; Mon, 27 Mar 2006 16:16:20 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AB87955735; Mon, 27 Mar 2006 21:16:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A56A016A420; Mon, 27 Mar 2006 21:16:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65AD616A401 for ; Mon, 27 Mar 2006 21:16:18 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6E3F43D6D for ; Mon, 27 Mar 2006 21:16:16 +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 k2RLGGwC055558 for ; Mon, 27 Mar 2006 21:16:16 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 k2RLGGkZ055555 for perforce@freebsd.org; Mon, 27 Mar 2006 21:16:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Mar 2006 21:16:16 GMT Message-Id: <200603272116.k2RLGGkZ055555@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 94130 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2006 21:16:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=94130 Change 94130 by rwatson@rwatson_zoo on 2006/03/27 21:15:19 Don't mask global 'debug' variable with uninitialized local one. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#2 $ */ #include @@ -169,7 +169,7 @@ const char *conffile; FILE *trail_fp; FILE *conf_fp; - int ch, debug; + int ch; conffile = AUDITFILTERD_CONFFILE; trailfile = AUDITFILTERD_TRAILFILE; From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 27 23:05:21 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B15116A420 for ; Mon, 27 Mar 2006 23:05:21 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE5FF43D48 for ; Mon, 27 Mar 2006 23:05:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F304346B9E for ; Mon, 27 Mar 2006 18:05:16 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 51DA55721A; Mon, 27 Mar 2006 23:05:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C05A16A41F; Mon, 27 Mar 2006 23:05:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2471016A400 for ; Mon, 27 Mar 2006 23:05:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDB8B43D60 for ; Mon, 27 Mar 2006 23:05: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 k2RN5Fj7060144 for ; Mon, 27 Mar 2006 23:05: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 k2RN5F4U060141 for perforce@freebsd.org; Mon, 27 Mar 2006 23:05:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Mar 2006 23:05:15 GMT Message-Id: <200603272305.k2RN5F4U060141@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 94132 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2006 23:05:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=94132 Change 94132 by rwatson@rwatson_zoo on 2006/03/27 23:04:29 Update configure.ac, Makefile.am's, for auditfilterd, sample filter module, etc. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.am#2 edit .. //depot/projects/trustedbsd/openbsm/bin/Makefile.am#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.am#2 edit .. //depot/projects/trustedbsd/openbsm/modules/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.am#1 add Differences ... ==== //depot/projects/trustedbsd/openbsm/Makefile.am#2 (text+ko) ==== @@ -1,12 +1,13 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#2 $ # SUBDIRS = \ bsm \ libbsm \ bin \ - man + man \ + modules EXTRA_DIST = \ CHANGELOG \ ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.am#3 (text+ko) ==== @@ -1,8 +1,9 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#3 $ # SUBDIRS = \ + auditfilterd \ auditreduce \ praudit ==== //depot/projects/trustedbsd/openbsm/bsm/Makefile.am#2 (text+ko) ==== @@ -1,11 +1,12 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.am#2 $ # openbsmdir = $(includedir)/bsm openbsm_HEADERS = \ audit.h \ + audit_filter.h \ audit_internal.h \ audit_kevents.h \ audit_record.h \ From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 27 23:27:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 193E916A4E3 for ; Mon, 27 Mar 2006 23:27:22 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EFEC43D5E for ; Mon, 27 Mar 2006 23:27:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1C98C46C14 for ; Mon, 27 Mar 2006 18:27:06 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AD10157A8A; Mon, 27 Mar 2006 23:26:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A5A2D16A420; Mon, 27 Mar 2006 23:26:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8205D16A401 for ; Mon, 27 Mar 2006 23:26:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A0E243D64 for ; Mon, 27 Mar 2006 23:26: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 k2RNQgm6062088 for ; Mon, 27 Mar 2006 23:26: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 k2RNQfs9062084 for perforce@freebsd.org; Mon, 27 Mar 2006 23:26:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Mar 2006 23:26:41 GMT Message-Id: <200603272326.k2RNQfs9062084@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 94133 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2006 23:27:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=94133 Change 94133 by rwatson@rwatson_zoo on 2006/03/27 23:25:43 Update configure.ac for new makefiles, regenerate. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/configure#16 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#18 edit .. //depot/projects/trustedbsd/openbsm/modules/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#1 add Differences ... ==== //depot/projects/trustedbsd/openbsm/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#4 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -181,7 +181,8 @@ bsm \ libbsm \ bin \ - man + man \ + modules EXTRA_DIST = \ CHANGELOG \ ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#4 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -62,7 +62,7 @@ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = auditreduce praudit audit auditd +DIST_SUBDIRS = auditfilterd auditreduce praudit audit auditd DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -165,7 +165,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = auditreduce praudit $(am__append_1) +SUBDIRS = auditfilterd auditreduce praudit $(am__append_1) all: all-recursive .SUFFIXES: ==== //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#4 $ # srcdir = @srcdir@ @@ -168,6 +168,7 @@ openbsmdir = $(includedir)/bsm openbsm_HEADERS = \ audit.h \ + audit_filter.h \ audit_internal.h \ audit_kevents.h \ audit_record.h \ ==== //depot/projects/trustedbsd/openbsm/configure#16 (xtext) ==== @@ -22895,7 +22895,7 @@ fi - ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile test/Makefile test/bsm/Makefile tools/Makefile" + ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditfilterd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile modules/Makefile modules/auditfilter_noop/Makefile man/Makefile test/Makefile test/bsm/Makefile tools/Makefile" cat >confcache <<\_ACEOF @@ -23472,10 +23472,13 @@ "bin/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;; "bin/audit/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/audit/Makefile" ;; "bin/auditd/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/auditd/Makefile" ;; + "bin/auditfilterd/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/auditfilterd/Makefile" ;; "bin/auditreduce/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/auditreduce/Makefile" ;; "bin/praudit/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/praudit/Makefile" ;; "bsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES bsm/Makefile" ;; "libbsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbsm/Makefile" ;; + "modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; + "modules/auditfilter_noop/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/auditfilter_noop/Makefile" ;; "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "test/bsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/bsm/Makefile" ;; ==== //depot/projects/trustedbsd/openbsm/configure.ac#18 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#17 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#18 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -99,10 +99,13 @@ bin/Makefile bin/audit/Makefile bin/auditd/Makefile + bin/auditfilterd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile + modules/Makefile + modules/auditfilter_noop/Makefile man/Makefile test/Makefile test/bsm/Makefile From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 27 23:28:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EEBA16A401 for ; Mon, 27 Mar 2006 23:28:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BE9D43D58 for ; Mon, 27 Mar 2006 23:28:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id AF97A46CDA for ; Mon, 27 Mar 2006 18:28:26 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AD39856AF7; Mon, 27 Mar 2006 23:27:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A551616A423; Mon, 27 Mar 2006 23:27:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C59D16A420 for ; Mon, 27 Mar 2006 23:27:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E58F143D6B for ; Mon, 27 Mar 2006 23:27:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2RNRhER062184 for ; Mon, 27 Mar 2006 23:27:43 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 k2RNRhXS062181 for perforce@freebsd.org; Mon, 27 Mar 2006 23:27:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Mar 2006 23:27:43 GMT Message-Id: <200603272327.k2RNRhXS062181@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 94134 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2006 23:28:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=94134 Change 94134 by rwatson@rwatson_zoo on 2006/03/27 23:27:33 Add Makefile.in. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Mon Mar 27 23:32:02 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AD4F16A42C for ; Mon, 27 Mar 2006 23:32:02 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 578AC43D46 for ; Mon, 27 Mar 2006 23:31:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C33FE46C3F for ; Mon, 27 Mar 2006 18:31:57 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7B72355AED; Mon, 27 Mar 2006 23:31:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7457B16A42A; Mon, 27 Mar 2006 23:31:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5427716A428 for ; Mon, 27 Mar 2006 23:31:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 240CD43D79 for ; Mon, 27 Mar 2006 23:31:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2RNVn6N062536 for ; Mon, 27 Mar 2006 23:31:49 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 k2RNVnUr062533 for perforce@freebsd.org; Mon, 27 Mar 2006 23:31:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Mar 2006 23:31:49 GMT Message-Id: <200603272331.k2RNVnUr062533@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 94136 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2006 23:32:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=94136 Change 94136 by rwatson@rwatson_zoo on 2006/03/27 23:31:12 Use configure results for queue macro inclusion. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#3 (text+ko) ==== @@ -25,11 +25,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#3 $ */ +#include +#include + +#include +#ifdef HAVE_FULL_QUEUE_H #include -#include +#else +#include +#endif #include #include ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 $ */ /* @@ -40,7 +40,14 @@ * and a call to its reinit method fails, we will detach it. */ +#include + +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else +#include +#endif #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 28 10:41:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D2D3516A41F for ; Tue, 28 Mar 2006 10:41:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 325F743D45 for ; Tue, 28 Mar 2006 10:41:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5951446C0E for ; Tue, 28 Mar 2006 05:41:39 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5253C92CA2; Tue, 28 Mar 2006 10:39:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CF5F16A425; Tue, 28 Mar 2006 10:39:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0916A16A423 for ; Tue, 28 Mar 2006 10:39:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A96CD43D49 for ; Tue, 28 Mar 2006 10:39: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 k2SAdtDm012406 for ; Tue, 28 Mar 2006 10:39: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 k2SAdsx9012403 for perforce@freebsd.org; Tue, 28 Mar 2006 10:39:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Mar 2006 10:39:54 GMT Message-Id: <200603281039.k2SAdsx9012403@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 94153 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 10:41:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=94153 Change 94153 by rwatson@rwatson_sesame on 2006/03/28 10:38:57 Conditionalize generating test token files on '-t', and record files on '-r'. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#3 $ */ /* @@ -52,11 +52,13 @@ #include #include +static int do_records, do_tokens; + static void usage(void) { - fprintf(stderr, "generate path\n"); + fprintf(stderr, "generate [-rt] path\n"); exit(EX_USAGE); } @@ -185,8 +187,7 @@ static char data_token_unit_count = sizeof("SomeData") + 1; static void -generate_data_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_data_token(const char *directory, const char *token_filename) { token_t *data_token; @@ -195,7 +196,13 @@ if (data_token == NULL) err(EX_UNAVAILABLE, "au_to_data"); write_token(directory, token_filename, data_token); +} +static void +generate_data_record(const char *directory, const char *record_filename) +{ + token_t *data_token; + data_token = au_to_data(data_token_unit_print, data_token_unit_type, data_token_unit_count, data_token_data); if (data_token == NULL) @@ -207,8 +214,7 @@ static int ipc_id = 0x12345678; static void -generate_ipc_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_ipc_token(const char *directory, const char *token_filename) { token_t *ipc_token; @@ -216,7 +222,13 @@ if (ipc_token == NULL) err(EX_UNAVAILABLE, "au_to_ipc"); write_token(directory, token_filename, ipc_token); +} +static void +generate_ipc_record(const char *directory, const char *record_filename) +{ + token_t *ipc_token; + ipc_token = au_to_ipc(ipc_type, ipc_id); if (ipc_token == NULL) err(EX_UNAVAILABLE, "au_to_ipc"); @@ -226,8 +238,7 @@ static char *path_token_path = "/test/this/is/a/test"; static void -generate_path_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_path_token(const char *directory, const char *token_filename) { token_t *path_token; @@ -235,7 +246,13 @@ if (path_token == NULL) err(EX_UNAVAILABLE, "au_to_path"); write_token(directory, token_filename, path_token); +} +static void +generate_path_record(const char *directory, const char *record_filename) +{ + token_t *path_token; + path_token = au_to_path(path_token_path); if (path_token == NULL) err(EX_UNAVAILABLE, "au_to_path"); @@ -252,8 +269,7 @@ static au_tid_t subject32_tid = { 0x16593746 }; static void -generate_subject32_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_subject32_token(const char *directory, const char *token_filename) { token_t *subject32_token; @@ -265,7 +281,15 @@ if (subject32_token == NULL) err(EX_UNAVAILABLE, "au_to_subject32"); write_token(directory, token_filename, subject32_token); +} +static void +generate_subject32_record(const char *directory, const char *record_filename) +{ + token_t *subject32_token; + + subject32_tid.machine = inet_addr("127.0.0.1"); + subject32_token = au_to_subject32(subject32_auid, subject32_euid, subject32_egid, subject32_ruid, subject32_rgid, subject32_pid, subject32_sid, &subject32_tid); @@ -284,8 +308,7 @@ static au_tid_t process32_tid = { 0x16593746 }; static void -generate_process32_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_process32_token(const char *directory, const char *token_filename) { token_t *process32_token; @@ -297,6 +320,14 @@ if (process32_token == NULL) err(EX_UNAVAILABLE, "au_to_process32"); write_token(directory, token_filename, process32_token); +} + +static void +generate_process32_record(const char *directory, const char *record_filename) +{ + token_t *process32_token; + + process32_tid.machine = inet_addr("127.0.0.1"); process32_token = au_to_process32(process32_auid, process32_euid, process32_egid, process32_ruid, process32_rgid, process32_pid, @@ -310,8 +341,7 @@ static uint32_t return32_ret = 0x12345678; static void -generate_return32_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_return32_token(const char *directory, const char *token_filename) { token_t *return32_token; @@ -319,6 +349,12 @@ if (return32_token == NULL) err(EX_UNAVAILABLE, "au_to_return32"); write_token(directory, token_filename, return32_token); +} + +static void +generate_return32_record(const char *directory, const char *record_filename) +{ + token_t *return32_token; return32_token = au_to_return32(return32_status, return32_ret); if (return32_token == NULL) @@ -329,8 +365,7 @@ static char *text_token_text = "This is a test."; static void -generate_text_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_text_token(const char *directory, const char *token_filename) { token_t *text_token; @@ -338,7 +373,13 @@ if (text_token == NULL) err(EX_UNAVAILABLE, "au_to_text"); write_token(directory, token_filename, text_token); +} +static void +generate_text_record(const char *directory, const char *record_filename) +{ + token_t *text_token; + text_token = au_to_text(text_token_text); if (text_token == NULL) err(EX_UNAVAILABLE, "au_to_text"); @@ -349,8 +390,7 @@ static int opaque_token_bytes = sizeof(opaque_token_data); static void -generate_opaque_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_opaque_token(const char *directory, const char *token_filename) { token_t *opaque_token; @@ -358,6 +398,12 @@ if (opaque_token == NULL) err(EX_UNAVAILABLE, "au_to_opaque"); write_token(directory, token_filename, opaque_token); +} + +static void +generate_opaque_record(const char *directory, const char *record_filename) +{ + token_t *opaque_token; opaque_token = au_to_opaque(opaque_token_data, opaque_token_bytes); if (opaque_token == NULL) @@ -368,8 +414,7 @@ static struct in_addr in_addr_token_addr; static void -generate_in_addr_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_in_addr_token(const char *directory, const char *token_filename) { token_t *in_addr_token; @@ -379,6 +424,14 @@ if (in_addr_token == NULL) err(EX_UNAVAILABLE, "au_to_in_addr"); write_token(directory, token_filename, in_addr_token); +} + +static void +generate_in_addr_record(const char *directory, const char *record_filename) +{ + token_t *in_addr_token; + + in_addr_token_addr.s_addr = inet_addr("192.168.100.15"); in_addr_token = au_to_in_addr(&in_addr_token_addr); if (in_addr_token == NULL) @@ -395,8 +448,7 @@ static struct in_addr ip_token_ip_dst; static void -generate_ip_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_ip_token(const char *directory, const char *token_filename) { token_t *ip_token; @@ -416,7 +468,25 @@ if (ip_token == NULL) err(EX_UNAVAILABLE, "au_to_ip"); write_token(directory, token_filename, ip_token); +} + +static void +generate_ip_record(const char *directory, const char *record_filename) +{ + token_t *ip_token; + ip_token_ip_src.s_addr = inet_addr("192.168.100.155"); + ip_token_ip_dst.s_addr = inet_addr("192.168.110.48"); + + memset(&ip_token_ip, 0, sizeof(ip_token_ip)); + ip_token_ip.ip_v = ip_token_ip_v; + ip_token_ip.ip_len = htons(sizeof(ip_token_ip)); + ip_token_ip.ip_id = htons(ip_token_ip_id); + ip_token_ip.ip_ttl = ip_token_ip_ttl; + ip_token_ip.ip_p = ip_token_ip_p; + ip_token_ip.ip_src = ip_token_ip_src; + ip_token_ip.ip_dst = ip_token_ip_dst; + ip_token = au_to_ip(&ip_token_ip); if (ip_token == NULL) err(EX_UNAVAILABLE, "au_to_ip"); @@ -426,8 +496,7 @@ static u_int16_t iport_token_iport; static void -generate_iport_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_iport_token(const char *directory, const char *token_filename) { token_t *iport_token; @@ -437,7 +506,15 @@ if (iport_token == NULL) err(EX_UNAVAILABLE, "au_to_iport"); write_token(directory, token_filename, iport_token); +} +static void +generate_iport_record(const char *directory, const char *record_filename) +{ + token_t *iport_token; + + iport_token_iport = htons(80); + iport_token = au_to_iport(iport_token_iport); if (iport_token == NULL) err(EX_UNAVAILABLE, "au_to_iport"); @@ -449,8 +526,7 @@ static uint32_t arg32_token_v = 0xabcdef00; static void -generate_arg32_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_arg32_token(const char *directory, const char *token_filename) { token_t *arg32_token; @@ -459,7 +535,13 @@ if (arg32_token == NULL) err(EX_UNAVAILABLE, "au_to_arg32"); write_token(directory, token_filename, arg32_token); +} +static void +generate_arg32_record(const char *directory, const char *record_filename) +{ + token_t *arg32_token; + arg32_token = au_to_arg32(arg32_token_n, arg32_token_text, arg32_token_v); if (arg32_token == NULL) @@ -467,12 +549,28 @@ write_record(directory, record_filename, arg32_token, AUE_NULL); } +static long seq_audit_count = 0x12345678; + +static void +generate_seq_token(const char *directory, const char *token_filename) +{ + token_t *seq_token; + + seq_token = au_to_seq(seq_audit_count); + if (seq_token == NULL) + err(EX_UNAVAILABLE, "au_to_seq"); + write_token(directory, token_filename, seq_token); +} + static void -generate_seq_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_seq_record(const char *directory, const char *record_filename) { token_t *seq_token; + seq_token = au_to_seq(seq_audit_count); + if (seq_token == NULL) + err(EX_UNAVAILABLE, "au_to_seq"); + write_record(directory, record_filename, seq_token, AUE_NULL); } /* @@ -480,16 +578,28 @@ */ static void -generate_attr_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_attr_token(const char *directory, const char *token_filename) +{ + token_t *attr_token; + +} + +static void +generate_attr_record(const char *directory, const char *record_filename) { token_t *attr_token; } static void -generate_ipc_perm_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_ipc_perm_token(const char *directory, const char *token_filename) +{ + token_t *ipc_perm_token; + +} + +static void +generate_ipc_perm_record(const char *directory, const char *record_filename) { token_t *ipc_perm_token; @@ -500,8 +610,14 @@ */ static void -generate_groups_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_groups_token(const char *directory, const char *token_filename) +{ + token_t *groups_token; + +} + +static void +generate_groups_record(const char *directory, const char *record_filename) { token_t *groups_token; @@ -544,8 +660,14 @@ */ static void -generate_attr32_token(const char *directory, const char *token_filename, - const char *record_filename) +generate_attr32_token(const char *directory, const char *token_filename) +{ + token_t *attr32_token; + +} + +static void +generate_attr32_record(const char *directory, const char *record_filename) { token_t *attr32_token; @@ -555,41 +677,79 @@ main(int argc, char *argv[]) { const char *directory; + int ch; + + while ((ch = getopt(argc, argv, "rt")) != -1) { + switch (ch) { + case 'r': + do_records++; + break; + + case 't': + do_tokens++; + break; + + default: + usage(); + } + } - if (argc != 2) + argc -= optind; + argv += optind; + + if (argc != 1) usage(); - directory = argv[1]; + directory = argv[0]; if (mkdir(directory, 0755) < 0 && errno != EEXIST) err(EX_OSERR, "mkdir: %s", directory); - generate_file_token(directory, "file_token"); - generate_trailer_token(directory, "trailer_token"); - generate_header32_token(directory, "header32_token"); - generate_data_token(directory, "data_token", "data_record"); - generate_ipc_token(directory, "ipc_token", "ipc_record"); - generate_path_token(directory, "path_token", "path_record"); - generate_subject32_token(directory, "subject32_token", - "subject32_record"); - generate_process32_token(directory, "process32_token", - "process32_record"); - generate_return32_token(directory, "return32_token", - "return32_record"); - generate_text_token(directory, "text_token", "text_record"); - generate_opaque_token(directory, "opaque_token", "opaque_record"); - generate_in_addr_token(directory, "in_addr_token", "in_addr_record"); - generate_ip_token(directory, "ip_token", "ip_record"); - generate_iport_token(directory, "iport_token", "iport_record"); + if (do_tokens) { + generate_file_token(directory, "file_token"); + generate_trailer_token(directory, "trailer_token"); + generate_header32_token(directory, "header32_token"); + generate_data_token(directory, "data_token"); + generate_ipc_token(directory, "ipc_token"); + generate_path_token(directory, "path_token"); + generate_subject32_token(directory, "subject32_token"); + generate_process32_token(directory, "process32_token"); + generate_return32_token(directory, "return32_token"); + generate_text_token(directory, "text_token"); + generate_opaque_token(directory, "opaque_token"); + generate_in_addr_token(directory, "in_addr_token"); + generate_ip_token(directory, "ip_token"); + generate_iport_token(directory, "iport_token"); + generate_arg32_token(directory, "arg32_token"); + generate_seq_token(directory, "seq_token"); + generate_attr_token(directory, "attr_token"); + generate_ipc_perm_token(directory, "ipc_perm_token"); + generate_groups_token(directory, "groups_token"); + generate_attr32_token(directory, "attr32_token"); + } - generate_arg32_token(directory, "arg32_token", "arg32_record"); - generate_seq_token(directory, "seq_token", "seq_record"); - generate_attr_token(directory, "attr_token", "attr_record"); - generate_ipc_perm_token(directory, "ipc_perm_token", - "ipc_perm_record"); - generate_groups_token(directory, "groups_token", "groups_record"); - generate_attr32_token(directory, "attr32_token", "attr32_record"); - + if (do_records) { + generate_file_token(directory, "file_token"); + generate_trailer_token(directory, "trailer_token"); + generate_header32_token(directory, "header32_token"); + generate_data_token(directory, "data_record"); + generate_ipc_token(directory, "ipc_record"); + generate_path_token(directory, "path_record"); + generate_subject32_token(directory, "subject32_record"); + generate_process32_token(directory, "process32_record"); + generate_return32_token(directory, "return32_record"); + generate_text_token(directory, "text_record"); + generate_opaque_token(directory, "opaque_record"); + generate_in_addr_token(directory, "in_addr_record"); + generate_ip_token(directory, "ip_record"); + generate_iport_token(directory, "iport_record"); + generate_arg32_token(directory, "arg32_record"); + generate_seq_token(directory, "seq_record"); + generate_attr_token(directory, "attr_record"); + generate_ipc_perm_token(directory, "ipc_perm_record"); + generate_groups_token(directory, "groups_record"); + generate_attr32_token(directory, "attr32_record"); + } return (0); } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 28 11:56:20 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0BD2D16A482 for ; Tue, 28 Mar 2006 11:56:20 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D6A943D46 for ; Tue, 28 Mar 2006 11:56:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CAFEF46BB0 for ; Tue, 28 Mar 2006 06:56:14 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 10751557C9; Tue, 28 Mar 2006 11:56:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B03516A420; Tue, 28 Mar 2006 11:56:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C67A816A400 for ; Tue, 28 Mar 2006 11:56:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FF8F43D46 for ; Tue, 28 Mar 2006 11:56:12 +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 k2SBuC0U016287 for ; Tue, 28 Mar 2006 11:56:12 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 k2SBuC2C016273 for perforce@freebsd.org; Tue, 28 Mar 2006 11:56:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Mar 2006 11:56:12 GMT Message-Id: <200603281156.k2SBuC2C016273@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 94156 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 11:56:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=94156 Change 94156 by rwatson@rwatson_zoo on 2006/03/28 11:56:08 Don't test for -lbsm, since we're going to use our own copy anyway. Do test for dlsym() in libc, then libdl, since that's required on Linux. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#7 edit .. //depot/projects/trustedbsd/openbsm/configure#17 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#7 (text+ko) ==== @@ -42,9 +42,6 @@ /* Define if ipc_perm.__seq instead of seq */ #undef HAVE_IPC_PERM___SEQ -/* Define to 1 if you have the `bsm' library (-lbsm). */ -#undef HAVE_LIBBSM - /* Define to 1 if you have the header file. */ #undef HAVE_MACHINE_ENDIAN_H ==== //depot/projects/trustedbsd/openbsm/configure#17 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#17 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#18 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -19627,16 +19627,13 @@ -# Checks for libraries. -# FIXME: Replace `main' with a function in `-lbsm': - -echo "$as_me:$LINENO: checking for main in -lbsm" >&5 -echo $ECHO_N "checking for main in -lbsm... $ECHO_C" >&6 -if test "${ac_cv_lib_bsm_main+set}" = set; then +echo "$as_me:$LINENO: checking for library containing dlsym" >&5 +echo $ECHO_N "checking for library containing dlsym... $ECHO_C" >&6 +if test "${ac_cv_search_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsm $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_dlsym=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19644,11 +19641,72 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlsym (); +int +main () +{ +dlsym (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' + { (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_search_dlsym="none required" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_dlsym" = no; then + for ac_lib in -ldl; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlsym (); int main () { -main (); +dlsym (); ; return 0; } @@ -19675,25 +19733,23 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_bsm_main=yes + ac_cv_search_dlsym="-l$ac_lib" +break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_bsm_main=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + done +fi +LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsm_main" >&5 -echo "${ECHO_T}$ac_cv_lib_bsm_main" >&6 -if test $ac_cv_lib_bsm_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBBSM 1 -_ACEOF - - LIBS="-lbsm $LIBS" +echo "$as_me:$LINENO: result: $ac_cv_search_dlsym" >&5 +echo "${ECHO_T}$ac_cv_search_dlsym" >&6 +if test "$ac_cv_search_dlsym" != no; then + test "$ac_cv_search_dlsym" = "none required" || LIBS="$ac_cv_search_dlsym $LIBS" fi ==== //depot/projects/trustedbsd/openbsm/configure.ac#19 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#18 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#19 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -16,9 +16,7 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -# Checks for libraries. -# FIXME: Replace `main' with a function in `-lbsm': -AC_CHECK_LIB([bsm], [main]) +AC_SEARCH_LIBS(dlsym, -ldl,,) # Checks for header files. AC_HEADER_STDC From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 28 12:06:21 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6644016A400 for ; Tue, 28 Mar 2006 12:06:21 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0EB343D46 for ; Tue, 28 Mar 2006 12:06:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 340AA46BD2 for ; Tue, 28 Mar 2006 07:06:18 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 210B557BF6; Tue, 28 Mar 2006 12:06:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 196CB16A41F; Tue, 28 Mar 2006 12:06:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E610A16A400 for ; Tue, 28 Mar 2006 12:06:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B85843D58 for ; Tue, 28 Mar 2006 12:06: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 k2SC6FVg016943 for ; Tue, 28 Mar 2006 12:06: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 k2SC6ER3016940 for perforce@freebsd.org; Tue, 28 Mar 2006 12:06:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Mar 2006 12:06:15 GMT Message-Id: <200603281206.k2SC6ER3016940@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 94157 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 12:06:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=94157 Change 94157 by rwatson@rwatson_zoo on 2006/03/28 12:05:18 Try alternative invocation with more configure-happy syntax. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#18 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#20 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#18 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#18 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#19 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -19687,7 +19687,7 @@ rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_dlsym" = no; then - for ac_lib in -ldl; do + for ac_lib in dl; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ ==== //depot/projects/trustedbsd/openbsm/configure.ac#20 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#19 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#20 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -16,7 +16,7 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -AC_SEARCH_LIBS(dlsym, -ldl,,) +AC_SEARCH_LIBS(dlsym, dl) # Checks for header files. AC_HEADER_STDC From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 28 12:16:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF9E216A420 for ; Tue, 28 Mar 2006 12:16:08 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDA6143D49 for ; Tue, 28 Mar 2006 12:16:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8317546C39 for ; Tue, 28 Mar 2006 07:15:56 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1B79F55F7F; Tue, 28 Mar 2006 12:15:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 157B516A420; Tue, 28 Mar 2006 12:15:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C350816A401 for ; Tue, 28 Mar 2006 12:15:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DCD343D46 for ; Tue, 28 Mar 2006 12:15:51 +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 k2SCFpBu017869 for ; Tue, 28 Mar 2006 12:15:51 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 k2SCFpU7017866 for perforce@freebsd.org; Tue, 28 Mar 2006 12:15:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Mar 2006 12:15:51 GMT Message-Id: <200603281215.k2SCFpU7017866@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 94159 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 12:16:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=94159 Change 94159 by rwatson@rwatson_zoo on 2006/03/28 12:15:20 Check for clock_gettime() in libc and librt. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#19 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#21 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#19 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#19 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#20 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -19753,6 +19753,132 @@ fi +echo "$as_me:$LINENO: checking for library containing clock_gettime" >&5 +echo $ECHO_N "checking for library containing clock_gettime... $ECHO_C" >&6 +if test "${ac_cv_search_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +ac_cv_search_clock_gettime=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (); +int +main () +{ +clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' + { (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_search_clock_gettime="none required" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_clock_gettime" = no; then + for ac_lib in rt; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (); +int +main () +{ +clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' + { (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_search_clock_gettime="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_search_clock_gettime" >&6 +if test "$ac_cv_search_clock_gettime" != no; then + test "$ac_cv_search_clock_gettime" = "none required" || LIBS="$ac_cv_search_clock_gettime $LIBS" + +fi + # Checks for header files. echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ==== //depot/projects/trustedbsd/openbsm/configure.ac#21 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#20 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#21 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -17,6 +17,7 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AC_SEARCH_LIBS(dlsym, dl) +AC_SEARCH_LIBS(clock_gettime, rt) # Checks for header files. AC_HEADER_STDC From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 28 13:32:39 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2002916A428 for ; Tue, 28 Mar 2006 13:32:39 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3208943D4C for ; Tue, 28 Mar 2006 13:32:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3046B46BBA for ; Tue, 28 Mar 2006 08:32:37 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C9DC6586B2; Tue, 28 Mar 2006 13:32:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C357F16A422; Tue, 28 Mar 2006 13:32:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86C3616A41F for ; Tue, 28 Mar 2006 13:32:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D87E43D45 for ; Tue, 28 Mar 2006 13:32:31 +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 k2SDWVUr029008 for ; Tue, 28 Mar 2006 13:32:31 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 k2SDWVBa029005 for perforce@freebsd.org; Tue, 28 Mar 2006 13:32:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Mar 2006 13:32:31 GMT Message-Id: <200603281332.k2SDWVBa029005@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 94164 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 13:32:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=94164 Change 94164 by rwatson@rwatson_zoo on 2006/03/28 13:31:30 Add auditfilterd and audit filters to the history file. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#11 (text+ko) ==== @@ -31,6 +31,11 @@ This code is not built or installed by default. - auditd now assigns more appropriate syslog levels to its debugging and error information. +- Support for audit filters introduced: audit filters are dynamically + loaded shared objects that run in the context of a new daemon, + auditfilterd. The daemon reads from an audit pipe and feeds both BSM and + parsed versions of records to shared objects using a module API. This + will provide a framework for the writing of intrusion detection services. OpenBSM 1.0 alpha 5 @@ -158,4 +163,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#10 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#11 $ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 28 13:36:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22A7316A424 for ; Tue, 28 Mar 2006 13:36:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6780543D55 for ; Tue, 28 Mar 2006 13:36:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CA10746B0D for ; Tue, 28 Mar 2006 08:36:38 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4F6DE5624F; Tue, 28 Mar 2006 13:36:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 48E8D16A422; Tue, 28 Mar 2006 13:36:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D03E16A400 for ; Tue, 28 Mar 2006 13:36:37 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9C3C43D55 for ; Tue, 28 Mar 2006 13:36:36 +0000 (GMT) (envelope-from brueffer@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 k2SDaagZ029137 for ; Tue, 28 Mar 2006 13:36:36 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2SDaaL0029134 for perforce@freebsd.org; Tue, 28 Mar 2006 13:36:36 GMT (envelope-from brueffer@freebsd.org) Date: Tue, 28 Mar 2006 13:36:36 GMT Message-Id: <200603281336.k2SDaaL0029134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 94165 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 13:36:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=94165 Change 94165 by brueffer@brueffer_serenity on 2006/03/28 13:35:41 Remove a superfluous .Bl macro that messed up formatting. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#1 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#2 $ .\" .Dd March 27, 2006 .Dt AUDITFILTERD 8 @@ -59,7 +59,6 @@ .It Pa /etc/security/audit_filterd Default configuration file for .Nm . -.Bl -tag -width "/dev/auditpipe" -compact .It Pa /dev/auditpipe Default audit record source for .Nm . From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 28 17:49:51 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE2D316A400 for ; Tue, 28 Mar 2006 17:49:51 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE9CE43D79 for ; Tue, 28 Mar 2006 17:49:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 30EAC46C50 for ; Tue, 28 Mar 2006 12:49:40 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 40D9ECF9FF; Tue, 28 Mar 2006 17:48:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 378EE16A422; Tue, 28 Mar 2006 17:48:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFB3716A401 for ; Tue, 28 Mar 2006 17:48:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6A7243D79 for ; Tue, 28 Mar 2006 17:48:49 +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 k2SHmneA050800 for ; Tue, 28 Mar 2006 17:48:49 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 k2SHmnJW050797 for perforce@freebsd.org; Tue, 28 Mar 2006 17:48:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Mar 2006 17:48:49 GMT Message-Id: <200603281748.k2SHmnJW050797@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 94185 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 17:49:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=94185 Change 94185 by rwatson@rwatson_zoo on 2006/03/28 17:48:17 Clear the audit mask of the audit daemon on start. Hook up reap_children(), which was apparently not hooked up. This should prevent large numbers of zombies from accumulating over time. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#16 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#16 $ */ #include @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -63,6 +64,7 @@ static char *lastfile = NULL; static int allhardcount = 0; static int triggerfd = 0; +static int sigchlds, sigchlds_handled; static int sighups, sighups_handled; static int sigterms, sigterms_handled; static long global_flags; @@ -422,6 +424,8 @@ sighups++; if (signal == SIGTERM) sigterms++; + if (signal == SIGCHLD) + sigchlds++; } /* @@ -489,7 +493,6 @@ static int last_trigger; static time_t last_time; struct dir_ent *dirent; - int rc; /* * Suppres duplicate messages from the kernel within the specified @@ -595,6 +598,34 @@ } /* + * Reap our children. + */ +static void +reap_children(void) +{ + pid_t child; + int wstatus; + + while ((child = waitpid(-1, &wstatus, WNOHANG)) > 0) { + if (!wstatus) + continue; + syslog(LOG_INFO, "warn process [pid=%d] %s %d.", child, + ((WIFEXITED(wstatus)) ? "exited with non-zero status" : + "exited as a result of signal"), + ((WIFEXITED(wstatus)) ? WEXITSTATUS(wstatus) : + WTERMSIG(wstatus))); + } +} + +static void +handle_sigchld(void) +{ + + sigchlds_handled = sigchlds; + reap_children(); +} + +/* * Read the control file for triggers/signals and handle appropriately. */ static int @@ -613,6 +644,10 @@ syslog(LOG_DEBUG, "%s: SIGTERM", __FUNCTION__); break; } + if (sigchlds != sigchlds_handled) { + syslog(LOG_DEBUG, "%s: SIGCHLD", __FUNCTION__); + handle_sigchld(); + } if (sighups != sighups_handled) { syslog(LOG_DEBUG, "%s: SIGHUP", __FUNCTION__); handle_sighup(); @@ -633,26 +668,6 @@ } /* - * Reap our children. - */ -static void -reap_children(void) -{ - pid_t child; - int wstatus; - - while ((child = waitpid(-1, &wstatus, WNOHANG)) > 0) { - if (!wstatus) - continue; - syslog(LOG_INFO, "warn process [pid=%d] %s %d.", child, - ((WIFEXITED(wstatus)) ? "exited with non-zero status" : - "exited as a result of signal"), - ((WIFEXITED(wstatus)) ? WEXITSTATUS(wstatus) : - WTERMSIG(wstatus))); - } -} - -/* * Configure the audit controls in the kernel: the event to class mapping, * kernel preselection mask, etc. */ @@ -730,6 +745,7 @@ static void setup(void) { + auditinfo_t auinfo; int aufd; token_t *tok; @@ -738,6 +754,23 @@ fail_exit(); } + /* + * To provide event feedback cycles and avoid auditd becoming + * stalled if auditing is suspended, auditd and its children run + * without their events being audited. We allow the uid, tid, and + * mask fields to be implicitly set to zero, but do set the pid. We + * run this after opening the trigger device to avoid configuring + * audit state without audit present in the system. + * + * XXXRW: Is there more to it than this? + */ + bzero(&auinfo, sizeof(auinfo)); + auinfo.ai_asid = getpid(); + if (setaudit(&auinfo) == -1) { + syslog(LOG_ERR, "Error setting audit stat"); + fail_exit(); + } + TAILQ_INIT(&dir_q); if (read_control_file() == -1) { syslog(LOG_ERR, "Error reading control file"); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 28 18:27:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 42FF916A500 for ; Tue, 28 Mar 2006 18:27:54 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF33A44335 for ; Tue, 28 Mar 2006 18:27:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D9ED546BF6 for ; Tue, 28 Mar 2006 13:27:41 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DD25855637; Tue, 28 Mar 2006 18:27:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D3C4D16A423; Tue, 28 Mar 2006 18:27:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B7CC16A420 for ; Tue, 28 Mar 2006 18:27:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF46844336 for ; Tue, 28 Mar 2006 18:27: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 k2SIRc1A052416 for ; Tue, 28 Mar 2006 18:27: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 k2SIRcM6052413 for perforce@freebsd.org; Tue, 28 Mar 2006 18:27:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Mar 2006 18:27:38 GMT Message-Id: <200603281827.k2SIRcM6052413@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 94188 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 18:27:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=94188 Change 94188 by rwatson@rwatson_zoo on 2006/03/28 18:27:19 Don't need a pointer to a pointer, just a pointer. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#2 $ */ #define AUDITFILTERD_CONFFILE "/etc/security/audit_filter" @@ -54,11 +54,11 @@ * Fields provided by or extracted from the module. */ void *am_instance; - audit_filter_attach_t *am_attach; - audit_filter_reinit_t *am_reinit; - audit_filter_record_t *am_record; - audit_filter_bsmrecord_t *am_bsmrecord; - audit_filter_detach_t *am_detach; + audit_filter_attach_t am_attach; + audit_filter_reinit_t am_reinit; + audit_filter_record_t am_record; + audit_filter_bsmrecord_t am_bsmrecord; + audit_filter_detach_t am_detach; /* * Fields for maintaining the list of modules. From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 28 18:29:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9FA4016A4C7 for ; Tue, 28 Mar 2006 18:29:07 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B16C643D45 for ; Tue, 28 Mar 2006 18:28:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2C3E646CE0 for ; Tue, 28 Mar 2006 13:28:55 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B7A025B73E; Tue, 28 Mar 2006 18:28:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AB71316A44E; Tue, 28 Mar 2006 18:28:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 395AB16A43A for ; Tue, 28 Mar 2006 18:28:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD46143DDD for ; Tue, 28 Mar 2006 18:28:40 +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 k2SISeSq052599 for ; Tue, 28 Mar 2006 18:28:40 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 k2SISee0052596 for perforce@freebsd.org; Tue, 28 Mar 2006 18:28:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Mar 2006 18:28:40 GMT Message-Id: <200603281828.k2SISee0052596@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 94189 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 18:29:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=94189 Change 94189 by rwatson@rwatson_zoo on 2006/03/28 18:27:56 Don't compile filter functions as static, or the compiler will helpfully omit them as unused. As module symbols are local to the moduly with dlopen(), this won't generate conflicts. Affected files ... .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 $ */ /* @@ -38,33 +38,36 @@ #include #include -static int +int AUDIT_FILTER_ATTACH(void **instance, int argc, char *argv[]) { return (0); } -static int +int AUDIT_FILTER_REINIT(void *instance, int argc, char *argv[]) { return (0); } -static void +void AUDIT_FILTER_RECORD(void *instance, struct timespec *ts, int token_count, const tokenstr_t *tok[]) { + } -static void +void AUDIT_FILTER_BSMRECORD(void *instance, struct timespec *ts, u_char *data, u_int len) { + } -static void +void AUDIT_FILTER_DETACH(void *instance) { + } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 28 19:12:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A73D116A41F for ; Tue, 28 Mar 2006 19:12:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2D5B43D5E for ; Tue, 28 Mar 2006 19:12:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 483ED46BCA for ; Tue, 28 Mar 2006 14:12:41 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5208E62F8B; Tue, 28 Mar 2006 19:12:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4919F16A422; Tue, 28 Mar 2006 19:12:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2151E16A401 for ; Tue, 28 Mar 2006 19:12:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6958D43D6B for ; Tue, 28 Mar 2006 19:12:35 +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 k2SJCZ1C054380 for ; Tue, 28 Mar 2006 19:12:35 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 k2SJCZ1P054377 for perforce@freebsd.org; Tue, 28 Mar 2006 19:12:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Mar 2006 19:12:35 GMT Message-Id: <200603281912.k2SJCZ1P054377@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 94195 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 19:12:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=94195 Change 94195 by rwatson@rwatson_zoo on 2006/03/28 19:12:20 Canonicalize calling of functions via pointers, one or two minor style/warning nits. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#4 $ */ #include @@ -86,7 +86,6 @@ case SIGQUIT: quit++; break; - } } @@ -96,8 +95,8 @@ struct auditfilter_module *am; TAILQ_FOREACH(am, &filter_list, am_list) { - if (am->am_record != NULL) - (*am->am_bsmrecord)(am->am_instance, ts, data, len); + if (am->am_bsmrecord != NULL) + (am->am_bsmrecord)(am->am_instance, ts, data, len); } } @@ -115,7 +114,8 @@ bytesread += tok.len; } TAILQ_FOREACH(am, &filter_list, am_list) { - + if (am->am_record != NULL) + (am->am_record)(am->am_instance, ts, 0, NULL); } } ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#3 $ */ /* @@ -70,7 +70,6 @@ static void auditfilter_module_free(struct auditfilter_module *am) { - int i; if (am->am_modulename != NULL) free(am->am_modulename); @@ -106,7 +105,7 @@ { if (am->am_detach != NULL) - (*am->am_detach)(am->am_instance); + am->am_detach(am->am_instance); am->am_instance = NULL; (void)dlclose(am->am_dlhandle); am->am_dlhandle = NULL; @@ -155,8 +154,8 @@ am->am_detach = dlsym(am->am_dlhandle, AUDIT_FILTER_DETACH_STRING); if (am->am_attach != NULL) { - if ((*am->am_attach)(&am->am_instance, am->am_argc, - am->am_argv) != AUDIT_FILTER_SUCCESS) { + if (am->am_attach(&am->am_instance, am->am_argc, am->am_argv) + != AUDIT_FILTER_SUCCESS) { warnx("auditfilter_module_attach: %s: failed", am->am_modulename); dlclose(am->am_dlhandle); @@ -185,7 +184,7 @@ if (am->am_reinit == NULL) return (0); - if ((*am->am_reinit)(&am->am_instance, am->am_argc, am->am_argv) != + if (am->am_reinit(&am->am_instance, am->am_argc, am->am_argv) != AUDIT_FILTER_SUCCESS) { warnx("auditfilter_module_reinit: %s: failed", am->am_modulename); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Apr 4 13:59:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2ABCE16A400 for ; Tue, 4 Apr 2006 13:59:43 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3ED9E43D5D for ; Tue, 4 Apr 2006 13:59:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 93E1F46CC1 for ; Tue, 4 Apr 2006 09:59:27 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id F24D162D2C; Tue, 4 Apr 2006 13:59:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EAFC916A423; Tue, 4 Apr 2006 13:59:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD57116A401 for ; Tue, 4 Apr 2006 13:59:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6093643D75 for ; Tue, 4 Apr 2006 13:59:03 +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 k34Dx3jr056667 for ; Tue, 4 Apr 2006 13:59:03 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 k34Dx3X0056664 for perforce@freebsd.org; Tue, 4 Apr 2006 13:59:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 4 Apr 2006 13:59:03 GMT Message-Id: <200604041359.k34Dx3X0056664@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 94601 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Apr 2006 13:59:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=94601 Change 94601 by rwatson@rwatson_zoo on 2006/04/04 13:58:04 Teach auditfilterd to parse BSM records and pass pre-parsed tokens as an array to registered filters, allowing us to avoid the cost of parsing the same BSM multiple times when multiple filters are registered. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#5 $ */ #include @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -49,8 +50,17 @@ #include "auditfilterd.h" +/* + * Global list of registered filters. + */ struct auditfilter_module_list filter_list; -int debug, reread_config, quit; + +/* + * Configuration and signal->main flags. + */ +int debug; /* Debugging mode requested, don't detach. */ +int reread_config; /* SIGHUP has been received. */ +int quit; /* SIGQUIT/TERM/INT has been received. */ static void usage(void) @@ -89,6 +99,9 @@ } } +/* + * Present raw BSM to a set of registered and interested filters. + */ static void present_bsmrecord(struct timespec *ts, u_char *data, u_int len) { @@ -100,25 +113,39 @@ } } +/* + * Parse the BSM into a set of tokens, which will be pased to registered + * and interested filters. + */ +#define MAX_TOKENS 128 /* Maximum tokens we handle per record. */ static void present_tokens(struct timespec *ts, u_char *data, u_int len) { struct auditfilter_module *am; + tokenstr_t tokens[MAX_TOKENS]; u_int bytesread; - tokenstr_t tok; + int tokencount; + tokencount = 0; while (bytesread < len) { - if (au_fetch_tok(&tok, data + bytesread, len - bytesread) - == -1) + if (au_fetch_tok(&tokens[tokencount], data + bytesread, + len - bytesread) == -1) break; - bytesread += tok.len; + bytesread += tokens[tokencount].len; + tokencount++; } + TAILQ_FOREACH(am, &filter_list, am_list) { if (am->am_record != NULL) - (am->am_record)(am->am_instance, ts, 0, NULL); + (am->am_record)(am->am_instance, ts, tokencount, + tokens); } } +/* + * The main loop spins pulling records out of the record source and passing + * them to modules for processing. + */ static void mainloop(const char *conffile, const char *trailfile, FILE *trail_fp) { @@ -172,10 +199,8 @@ int main(int argc, char *argv[]) { - const char *trailfile; - const char *conffile; - FILE *trail_fp; - FILE *conf_fp; + const char *trailfile, *conffile; + FILE *trail_fp, *conf_fp; int ch; conffile = AUDITFILTERD_CONFFILE; From owner-trustedbsd-cvs@FreeBSD.ORG Wed Apr 5 18:48:41 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A52A16A41F for ; Wed, 5 Apr 2006 18:48:41 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7931F43D49 for ; Wed, 5 Apr 2006 18:48:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5F8BF46B8C for ; Wed, 5 Apr 2006 14:48:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id ABA41567DD; Wed, 5 Apr 2006 18:48:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A30AF16A425; Wed, 5 Apr 2006 18:48:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5EA4316A420 for ; Wed, 5 Apr 2006 18:48:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC6B543D5E for ; Wed, 5 Apr 2006 18:48: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 k35ImFK4025704 for ; Wed, 5 Apr 2006 18:48: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 k35Ilgk0025697 for perforce@freebsd.org; Wed, 5 Apr 2006 18:47:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Apr 2006 18:47:42 GMT Message-Id: <200604051847.k35Ilgk0025697@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 94689 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Apr 2006 18:48:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=94689 Change 94689 by rwatson@rwatson_peppercorn on 2006/04/05 18:46:51 Integrate trustedbsd_acl_nfsv4, an NFSv4 ACL implementation for FreeBSD. Affected files ... .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/conf/DEFAULTS#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/_types.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/cpuconf.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/kdb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/param.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/include/smp.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_dummy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/osf1/osf1_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/osf1/osf1_signal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/bus.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/include/trap.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/_types.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/armreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/cpu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/frame.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/param.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/help.common#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/module.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/coda/coda.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_sysctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_signal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.alpha#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.amd64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.arm#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.i386#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.ia64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.pc98#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/ldscript.arm#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options.amd64#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options.arm#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options.i386#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options.pc98#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/systags.sh#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acnames.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acopcode.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/aecommon.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/aeexec.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asldefine.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psloop.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsinfo.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utcache.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utmutex.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utstate.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/dev/oltr/if_oltr_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/ddb/db_access.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_hpet.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_smbat.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_smbus.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amrio.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/asr/dptsig.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_card.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/bktr/bktr_tuner.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cardbus/cardbusreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/cy/cy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/dc/dcphy.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/dc/if_dc.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/dc/if_dcreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/dc/pnphy.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/de/if_de.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/de/if_devar.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/digi/digi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm-preprocess.sh#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm-subprocess.pl#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_ucode.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_drm.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_ds.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_ds.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/tdfx_drv.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/README#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/en/midway.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/exca/exca.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/boot_font.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/gfb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/tga.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/00README#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ic/i8259.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ic/via6522reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ieee488/upd7210.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ips/ipsreg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_inline.h#2 delete .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ixgb/README#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/joy/joy.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am7990.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am79900.c#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am79900var.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/le/am7990var.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Mon Apr 10 08:14:04 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1207E16A406 for ; Mon, 10 Apr 2006 08:14:04 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2845043D45 for ; Mon, 10 Apr 2006 08:14:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 85D9546C7F for ; Mon, 10 Apr 2006 04:14:01 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 08ED75592C; Mon, 10 Apr 2006 08:14:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F20E616A405; Mon, 10 Apr 2006 08:13:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C30B516A400 for ; Mon, 10 Apr 2006 08:13:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A94143D4C for ; Mon, 10 Apr 2006 08:13:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3A8DwPX054604 for ; Mon, 10 Apr 2006 08:13:59 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 k3A8DwQV054567 for perforce@freebsd.org; Mon, 10 Apr 2006 08:13:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 10 Apr 2006 08:13:58 GMT Message-Id: <200604100813.k3A8DwQV054567@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 94907 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 08:14:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=94907 Change 94907 by rwatson@rwatson_sesame on 2006/04/10 08:12:57 Integrate trustedbsd_acl_nfsv4. Affected files ... .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/trap.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/include/pmap.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/xscale/i80321/i80321_timer.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/conf/options.arm#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/i915_mem.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/savage_state.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_ds.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/drm/sis_mm.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/LICENSE#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/README#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_bsd.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_disk.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_slice.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/geom/geom_subr.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/i386/isa/npx.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/kern/uipc_proto.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/netnatm/natm.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/posix4/ksched.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/sys/filedesc.h#2 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/sys/mac.h#3 integrate .. //depot/projects/trustedbsd/acl_nfsv4/src/sys/sys/mac_policy.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/amd64/amd64/io_apic.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.23 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -89,6 +89,7 @@ u_int io_edgetrigger:1; u_int io_masked:1; int io_bus:4; + uint32_t io_lowreg; }; struct ioapic { @@ -207,9 +208,7 @@ mtx_lock_spin(&icu_lock); if (intpin->io_masked) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags &= ~(IOART_INTMASK); + flags = intpin->io_lowreg & ~IOART_INTMASK; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 0; @@ -226,9 +225,7 @@ mtx_lock_spin(&icu_lock); if (!intpin->io_masked && !intpin->io_edgetrigger) { - flags = ioapic_read(io->io_addr, - IOAPIC_REDTBL_LO(intpin->io_intpin)); - flags |= IOART_INTMSET; + flags = intpin->io_lowreg | IOART_INTMSET; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), flags); intpin->io_masked = 1; @@ -313,6 +310,7 @@ /* Write the values to the APIC. */ mtx_lock_spin(&icu_lock); + intpin->io_lowreg = low; ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low); value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin)); value &= ~IOART_DEST; ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/cpufunc.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.9 2005/05/25 13:46:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.10 2006/04/09 23:07:31 cognet Exp $"); #include @@ -1530,7 +1530,8 @@ cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE - | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE; + | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE | + CPU_CONTROL_ROUNDROBIN; cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/swtch.S#3 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.18 2005/10/04 20:47:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.19 2006/04/09 20:16:47 cognet Exp $"); /* @@ -467,7 +467,7 @@ bl _C_LABEL(fork_exit) /* Kill irq"s */ mrs r0, cpsr - orr r0, r0, #(I32_bit) + orr r0, r0, #(I32_bit|F32_bit) msr cpsr_c, r0 DO_AST PULLFRAME ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/trap.c#3 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.23 2006/03/01 20:43:51 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.24 2006/04/09 20:16:47 cognet Exp $"); #include @@ -271,9 +271,13 @@ /* Grab the current pcb */ pcb = td->td_pcb; /* Re-enable interrupts if they were enabled previously */ - if (td->td_md.md_spinlock_count == 0 && - __predict_true(tf->tf_spsr & I32_bit) == 0) - enable_interrupts(I32_bit); + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(tf->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(tf->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + /* Invoke the appropriate handler, if necessary */ if (__predict_false(data_aborts[fsr & FAULT_TYPE_MASK].func != NULL)) { @@ -487,6 +491,7 @@ mode = TRAP_USERMODE(tf) ? "user" : "kernel"; + disable_interrupts(I32_bit|F32_bit); if (td != NULL) { printf("Fatal %s mode data abort: '%s'\n", mode, data_aborts[fsr & FAULT_TYPE_MASK].desc); @@ -730,9 +735,13 @@ thread_user_enter(td); } fault_pc = tf->tf_pc; - if (td->td_md.md_spinlock_count == 0 && - __predict_true((tf->tf_spsr & I32_bit) == 0)) - enable_interrupts(I32_bit); + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(tf->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(tf->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + /* See if the cpu state needs to be fixed up */ @@ -1012,9 +1021,13 @@ * Since all syscalls *should* come from user mode it will always * be safe to enable them, but check anyway. */ - if (td->td_md.md_spinlock_count == 0 && !(frame->tf_spsr & I32_bit)) - enable_interrupts(I32_bit); - + if (td->td_md.md_spinlock_count == 0) { + if (__predict_true(frame->tf_spsr & I32_bit) == 0) + enable_interrupts(I32_bit); + if (__predict_true(frame->tf_spsr & F32_bit) == 0) + enable_interrupts(F32_bit); + } + syscall(td, frame, insn); } ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/arm/undefined.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.12 2006/03/01 18:33:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.13 2006/04/09 20:16:47 cognet Exp $"); #include #include @@ -189,7 +189,7 @@ /* Enable interrupts if they were enabled before the exception. */ if (!(frame->tf_spsr & I32_bit)) - enable_interrupts(I32_bit); + enable_interrupts(I32_bit|F32_bit); frame->tf_pc -= INSN_SIZE; PCPU_LAZY_INC(cnt.v_trap); ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.3 2006/03/18 01:35:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.4 2006/04/06 04:32:29 imp Exp $"); #include #include @@ -201,11 +201,14 @@ struct at91_ivar *ivar; kid = device_add_child_ordered(dev, prio, name, unit); - if (kid == NULL) - return; + if (kid == NULL) { + printf("Can't add child %s%d ordered\n", name, unit); + return; + } ivar = malloc(sizeof(*ivar), M_DEVBUF, M_WAITOK | M_ZERO); if (ivar == NULL) { device_delete_child(dev, kid); + printf("Can't add alloc ivar\n"); return; } device_set_ivars(kid, ivar); ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_twi.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.1 2006/02/04 23:32:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.2 2006/04/06 04:31:19 imp Exp $"); #include #include @@ -40,7 +40,10 @@ #include #include -#include + +#include +#include +#include "iicbus_if.h" struct at91_twi_softc { @@ -50,13 +53,12 @@ struct resource *mem_res; /* Memory resource */ struct mtx sc_mtx; /* basically a perimeter lock */ int flags; -#define XFER_PENDING 1 /* true when transfer taking place */ -#define OPENED 2 /* Device opened */ #define RXRDY 4 -#define TXCOMP 8 #define TXRDY 0x10 - struct cdev *cdev; uint32_t cwgr; + int sc_started; + int twi_addr; + device_t iicbus; }; static inline uint32_t @@ -79,7 +81,6 @@ #define AT91_TWI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define AT91_TWI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define AT91_TWI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); -#define CDEV2SOFTC(dev) ((dev)->si_drv1) #define TWI_DEF_CLK 100000 static devclass_t at91_twi_devclass; @@ -95,19 +96,6 @@ static int at91_twi_activate(device_t dev); static void at91_twi_deactivate(device_t dev); -/* cdev routines */ -static d_open_t at91_twi_open; -static d_close_t at91_twi_close; -static d_ioctl_t at91_twi_ioctl; - -static struct cdevsw at91_twi_cdevsw = -{ - .d_version = D_VERSION, - .d_open = at91_twi_open, - .d_close = at91_twi_close, - .d_ioctl = at91_twi_ioctl -}; - static int at91_twi_probe(device_t dev) { @@ -137,20 +125,23 @@ AT91_TWI_LOCK_DESTROY(sc); goto out; } - sc->cdev = make_dev(&at91_twi_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "twi%d", device_get_unit(dev)); - if (sc->cdev == NULL) { - err = ENOMEM; - goto out; - } - sc->cdev->si_drv1 = sc; - sc->cwgr = TWI_CWGR_CKDIV(1) | + sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / 90000) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) | TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK)); WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); + + WR4(sc, TWI_IER, TWI_SR_RXRDY | TWI_SR_OVRE | TWI_SR_UNRE | + TWI_SR_NACK); + + if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) + device_printf(dev, "could not allocate iicbus instance\n"); + + /* probe and attach the iicbus */ + bus_generic_attach(dev); + out:; if (err) at91_twi_deactivate(dev); @@ -160,7 +151,15 @@ static int at91_twi_detach(device_t dev) { - return (EBUSY); /* XXX */ + struct at91_twi_softc *sc; + int rv; + + sc = device_get_softc(dev); + at91_twi_deactivate(dev); + if (sc->iicbus && (rv = device_delete_child(dev, sc->iicbus)) != 0) + return (rv); + + return (0); } static int @@ -215,13 +214,12 @@ /* Reading the status also clears the interrupt */ status = RD4(sc, TWI_SR); + printf("status %x\n", status); if (status == 0) return; AT91_TWI_LOCK(sc); if (status & TWI_SR_RXRDY) sc->flags |= RXRDY; - if (status & TWI_SR_TXCOMP) - sc->flags |= TXCOMP; if (status & TWI_SR_TXRDY) sc->flags |= TXRDY; AT91_TWI_UNLOCK(sc); @@ -229,191 +227,196 @@ return; } -static int -at91_twi_open(struct cdev *dev, int oflags, int devtype, struct thread *td) +static int +at91_twi_wait_stop_done(struct at91_twi_softc *sc) +{ + int err = 0; + + while (!(RD4(sc, TWI_SR) & TWI_SR_TXCOMP)) + continue; + return (err); +} + +/* + * Stop the transfer by entering a STOP state on the iic bus. For read + * operations, we've already entered the STOP state, since we need to do + * that to read the last character. For write operations, we need to + * wait for the TXCOMP bit to turn on before returning. + */ +static int +at91_twi_stop(device_t dev) { struct at91_twi_softc *sc; + int err = 0; - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - if (!(sc->flags & OPENED)) { - sc->flags |= OPENED; - WR4(sc, TWI_IER, TWI_SR_TXCOMP | TWI_SR_RXRDY | TWI_SR_TXRDY | - TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); + sc = device_get_softc(dev); + if (sc->sc_started) { + WR4(sc, TWI_CR, TWI_CR_STOP); + err = at91_twi_wait_stop_done(sc); } - AT91_TWI_UNLOCK(sc); - return (0); + return (err); } +/* + * enter a START condition without requiring the device to be in a STOP + * state. + */ static int -at91_twi_close(struct cdev *dev, int fflag, int devtype, struct thread *td) +at91_twi_repeated_start(device_t dev, u_char slave, int timeout) { struct at91_twi_softc *sc; - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - sc->flags &= ~OPENED; - WR4(sc, TWI_IDR, TWI_SR_TXCOMP | TWI_SR_RXRDY | TWI_SR_TXRDY | - TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); - AT91_TWI_UNLOCK(sc); + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_DADR(slave)); + WR4(sc, TWI_CR, TWI_CR_START); + sc->sc_started = 1; return (0); } - +/* + * enter a START condition from an idle state. + */ static int -at91_twi_read_master(struct at91_twi_softc *sc, struct at91_twi_io *xfr) +at91_twi_start(device_t dev, u_char slave, int timeout) { - uint8_t *walker; - uint8_t buffer[256]; - size_t len; - int err = 0; + struct at91_twi_softc *sc; - if (xfr->xfer_len > sizeof(buffer)) - return (EINVAL); - walker = buffer; - len = xfr->xfer_len; - RD4(sc, TWI_RHR); - // Master mode, with the right address and interal addr size - WR4(sc, TWI_MMR, TWI_MMR_IADRSZ(xfr->iadrsz) | TWI_MMR_MREAD | - TWI_MMR_DADR(xfr->dadr)); - WR4(sc, TWI_IADR, xfr->iadr); + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_DADR(slave)); WR4(sc, TWI_CR, TWI_CR_START); - while (len-- > 1) { - while (!(sc->flags & RXRDY)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird", - 0); - if (err) - return (err); - } - sc->flags &= ~RXRDY; - *walker++ = RD4(sc, TWI_RHR) & 0xff; - } - WR4(sc, TWI_CR, TWI_CR_STOP); - while (!(sc->flags & TXCOMP)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird2", 0); - if (err) - return (err); - } - sc->flags &= ~TXCOMP; - *walker = RD4(sc, TWI_RHR) & 0xff; - if (xfr->xfer_buf) { - AT91_TWI_UNLOCK(sc); - err = copyout(buffer, xfr->xfer_buf, xfr->xfer_len); - AT91_TWI_LOCK(sc); - } - return (err); + sc->sc_started = 1; + return (0); } static int -at91_twi_write_master(struct at91_twi_softc *sc, struct at91_twi_io *xfr) +at91_twi_write(device_t dev, char *buf, int len, int *sent, int timeout /* us */) { + struct at91_twi_softc *sc; uint8_t *walker; - uint8_t buffer[256]; - size_t len; - int err; + int err = 0; - if (xfr->xfer_len > sizeof(buffer)) - return (EINVAL); - walker = buffer; - len = xfr->xfer_len; - AT91_TWI_UNLOCK(sc); - err = copyin(xfr->xfer_buf, buffer, xfr->xfer_len); + walker = buf; + sc = device_get_softc(dev); + WR4(sc, TWI_MMR, TWI_MMR_MWRITE | RD4(sc, TWI_MMR)); AT91_TWI_LOCK(sc); - if (err) - return (err); - /* Setup the xfr for later readback */ - xfr->xfer_buf = 0; - xfr->xfer_len = 1; + WR4(sc, TWI_IER, TWI_SR_TXRDY); while (len--) { - WR4(sc, TWI_MMR, TWI_MMR_IADRSZ(xfr->iadrsz) | TWI_MMR_MWRITE | - TWI_MMR_DADR(xfr->dadr)); - WR4(sc, TWI_IADR, xfr->iadr++); WR4(sc, TWI_THR, *walker++); - WR4(sc, TWI_CR, TWI_CR_START); - /* - * If we get signal while waiting for TXRDY, make sure we - * try to stop this device - */ while (!(sc->flags & TXRDY)) { err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twiwr", 0); if (err) - break; + goto errout; } - WR4(sc, TWI_CR, TWI_CR_STOP); - if (err) - return (err); - while (!(sc->flags & TXCOMP)) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twiwr2", + } +errout:; + WR4(sc, TWI_IDR, TWI_SR_TXRDY); + AT91_TWI_UNLOCK(sc); + return (err); +} + +static int +at91_twi_read(device_t dev, char *buf, int len, int *read, int last, + int delay /* us */) +{ + struct at91_twi_softc *sc; + char *walker; + int err = 0; + + walker = buf; + sc = device_get_softc(dev); + AT91_TWI_LOCK(sc); + WR4(sc, TWI_MMR, ~TWI_MMR_MWRITE & RD4(sc, TWI_MMR)); + WR4(sc, TWI_IER, TWI_SR_RXRDY); + while (len-- > 0) { + err = 0; + while (!(sc->flags & RXRDY)) { + err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, "twird", 0); if (err) - return (err); + goto errout; } - /* Readback */ - at91_twi_read_master(sc, xfr); + sc->flags &= ~RXRDY; + *walker++ = RD4(sc, TWI_RHR) & 0xff; + if (len == 1 && last) + break; } + if (!last) + goto errout; + WR4(sc, TWI_CR, TWI_CR_STOP); + err = at91_twi_wait_stop_done(sc); + *walker = RD4(sc, TWI_RHR) & 0xff; + if (read) + *read = walker - buf; + sc->sc_started = 0; +errout:; + WR4(sc, TWI_IDR, TWI_SR_RXRDY); + AT91_TWI_UNLOCK(sc); return (err); } static int -at91_twi_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, - struct thread *td) +at91_twi_rst_card(device_t dev, u_char speed, u_char addr, u_char *oldaddr) { - int err = 0; struct at91_twi_softc *sc; + int ckdiv, rate; - sc = CDEV2SOFTC(dev); - AT91_TWI_LOCK(sc); - while (sc->flags & XFER_PENDING) { - err = msleep(sc, &sc->sc_mtx, PZERO | PCATCH, - "twiwait", 0); - if (err) { - AT91_TWI_UNLOCK(sc); - return (err); - } - } - sc->flags |= XFER_PENDING; + sc = device_get_softc(dev); + if (oldaddr) + *oldaddr = sc->twi_addr; + if (addr != 0) + sc->twi_addr = 0; + else + sc->twi_addr = addr; + + rate = 1; + + /* + * 8 * is because "rate == 1" -> 4 clocks down, 4 clocks up. The + * speeds are for 1.5kb/s, 45kb/s and 90kb/s. + */ + switch (speed) { + case IIC_SLOW: + ckdiv = 8 * AT91C_MASTER_CLOCK / 1500; + break; + + case IIC_FAST: + ckdiv = 8 * AT91C_MASTER_CLOCK / 45000; + break; - switch (cmd) - { - case TWIIOCXFER: - { - struct at91_twi_io *xfr = (struct at91_twi_io *)data; - switch (xfr->type) - { - case TWI_IO_READ_MASTER: - err = at91_twi_read_master(sc, xfr); - break; - case TWI_IO_WRITE_MASTER: - err = at91_twi_write_master(sc, xfr); - break; - default: - err = EINVAL; - break; - } + case IIC_UNKNOWN: + case IIC_FASTEST: + default: + ckdiv = 8 * AT91C_MASTER_CLOCK / 90000; break; } - case TWIIOCSETCLOCK: - { - struct at91_twi_clock *twick = (struct at91_twi_clock *)data; + sc->cwgr = TWI_CWGR_CKDIV(ckdiv) | TWI_CWGR_CHDIV(TWI_CWGR_DIV(rate)) | + TWI_CWGR_CLDIV(TWI_CWGR_DIV(rate)); + WR4(sc, TWI_CR, TWI_CR_SWRST); + WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); + WR4(sc, TWI_CWGR, sc->cwgr); + + return EIO; +} + +static int +at91_twi_callback(device_t dev, int index, caddr_t *data) +{ + int error = 0; + + switch (index) { + case IIC_REQUEST_BUS: + break; - sc->cwgr = TWI_CWGR_CKDIV(twick->ckdiv) | - TWI_CWGR_CHDIV(TWI_CWGR_DIV(twick->high_rate)) | - TWI_CWGR_CLDIV(TWI_CWGR_DIV(twick->low_rate)); - WR4(sc, TWI_CR, TWI_CR_SWRST); - WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); - WR4(sc, TWI_CWGR, sc->cwgr); + case IIC_RELEASE_BUS: break; - } + default: - err = ENOTTY; - break; + error = EINVAL; } - sc->flags &= ~XFER_PENDING; - AT91_TWI_UNLOCK(sc); - wakeup(sc); - return err; + + return (error); } static device_method_t at91_twi_methods[] = { @@ -422,6 +425,14 @@ DEVMETHOD(device_attach, at91_twi_attach), DEVMETHOD(device_detach, at91_twi_detach), + /* iicbus interface */ + DEVMETHOD(iicbus_callback, at91_twi_callback), + DEVMETHOD(iicbus_repeated_start, at91_twi_repeated_start), + DEVMETHOD(iicbus_start, at91_twi_start), + DEVMETHOD(iicbus_stop, at91_twi_stop), + DEVMETHOD(iicbus_write, at91_twi_write), + DEVMETHOD(iicbus_read, at91_twi_read), + DEVMETHOD(iicbus_reset, at91_twi_rst_card), { 0, 0 } }; ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/at91_usartreg.h#2 (text) ==== @@ -22,30 +22,30 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_usartreg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_usartreg.h,v 1.2 2006/04/06 04:29:24 imp Exp $ */ #ifndef AT91USARTREG_H_ #define AT91USARTREG_H_ #define USART_CR 0x00 /* Control register */ -#define USART_CR_RSTRX (1 << 2) /* Reset Receiver */ -#define USART_CR_RSTTX (1 << 3) /* Reset Transmitter */ -#define USART_CR_RXEN (1 << 4) /* Receiver Enable */ -#define USART_CR_RXDIS (1 << 5) /* Receiver Disable */ -#define USART_CR_TXEN (1 << 6) /* Transmitter Enable */ -#define USART_CR_TXDIS (1 << 7) /* Transmitter Disable */ -#define USART_CR_RSTSTA (1 << 8) /* Reset Status Bits */ -#define USART_CR_STTBRK (1 << 9) /* Start Break */ -#define USART_CR_STPBRK (1 << 10) /* Stop Break */ -#define USART_CR_STTTO (1 << 11) /* Start Time-out */ -#define USART_CR_SENDA (1 << 12) /* Send Address */ -#define USART_CR_RSTIT (1 << 13) /* Reset Iterations */ -#define USART_CR_RSTNACK (1 << 14) /* Reset Non Acknowledge */ -#define USART_CR_RETTO (1 << 15) /* Rearm Time-out */ -#define USART_CR_DTREN (1 << 16) /* Data Terminal ready Enable */ -#define USART_CR_DTRDIS (1 << 17) /* Data Terminal ready Disable */ -#define USART_CR_RTSEN (1 << 18) /* Request to Send enable */ -#define USART_CR_RTSDIS (1 << 19) /* Request to Send Disable */ +#define USART_CR_RSTRX (1UL << 2) /* Reset Receiver */ +#define USART_CR_RSTTX (1UL << 3) /* Reset Transmitter */ +#define USART_CR_RXEN (1UL << 4) /* Receiver Enable */ +#define USART_CR_RXDIS (1UL << 5) /* Receiver Disable */ +#define USART_CR_TXEN (1UL << 6) /* Transmitter Enable */ +#define USART_CR_TXDIS (1UL << 7) /* Transmitter Disable */ +#define USART_CR_RSTSTA (1UL << 8) /* Reset Status Bits */ +#define USART_CR_STTBRK (1UL << 9) /* Start Break */ +#define USART_CR_STPBRK (1UL << 10) /* Stop Break */ +#define USART_CR_STTTO (1UL << 11) /* Start Time-out */ +#define USART_CR_SENDA (1UL << 12) /* Send Address */ +#define USART_CR_RSTIT (1UL << 13) /* Reset Iterations */ +#define USART_CR_RSTNACK (1UL << 14) /* Reset Non Acknowledge */ +#define USART_CR_RETTO (1UL << 15) /* Rearm Time-out */ +#define USART_CR_DTREN (1UL << 16) /* Data Terminal ready Enable */ +#define USART_CR_DTRDIS (1UL << 17) /* Data Terminal ready Disable */ +#define USART_CR_RTSEN (1UL << 18) /* Request to Send enable */ +#define USART_CR_RTSDIS (1UL << 19) /* Request to Send Disable */ #define USART_MR 0x04 /* Mode register */ #define USART_MR_MODE_NORMAL 0 /* Normal/Async/3-wire rs-232 */ @@ -91,28 +91,28 @@ #define USART_IMR 0x10 /* Interrupt mask register */ #define USART_CSR 0x14 /* Channel status register */ -#define USART_CSR_RXRDY (1U << 0) /* Receiver ready */ -#define USART_CSR_TXRDY (1U << 1) /* Transmitter ready */ -#define USART_CSR_RXBRK (1U << 2) /* Break received */ -#define USART_CSR_ENDRX (1U << 3) /* End of Transfer RX from PDC */ -#define USART_CSR_ENDTX (1U << 4) /* End of Transfer TX from PDC */ -#define USART_CSR_OVRE (1U << 5) /* Overrun error */ -#define USART_CSR_FRAME (1U << 6) /* Framing error */ -#define USART_CSR_PARE (1U << 7) /* Parity Error */ -#define USART_CSR_TIMEOUT (1U << 8) /* Timeout since start-timeout */ -#define USART_CSR_TXEMPTY (1U << 9) /* Transmitter empty */ -#define USART_CSR_ITERATION (1U << 10) /* max repetitions since RSIT */ -#define USART_CSR_TXBUFE (1U << 11) /* Buffer empty from PDC */ -#define USART_CSR_RXBUFF (1U << 12) /* Buffer full from PDC */ -#define USART_CSR_NACK (1U << 13) /* NACK since last RSTNACK */ -#define USART_CSR_RIIC (1U << 16) /* RI delta since last csr read */ -#define USART_CSR_DSRIC (1U << 17) /* DSR delta */ -#define USART_CSR_DCDIC (1U << 18) /* DCD delta */ -#define USART_CSR_CTSIC (1U << 19) /* CTS delta */ -#define USART_CSR_RI (1U << 20) /* RI status */ -#define USART_CSR_DSR (1U << 21) /* DSR status */ -#define USART_CSR_DCD (1U << 22) /* DCD status */ -#define USART_CSR_CTS (1U << 23) /* CTS status */ +#define USART_CSR_RXRDY (1UL << 0) /* Receiver ready */ +#define USART_CSR_TXRDY (1UL << 1) /* Transmitter ready */ +#define USART_CSR_RXBRK (1UL << 2) /* Break received */ +#define USART_CSR_ENDRX (1UL << 3) /* End of Transfer RX from PDC */ +#define USART_CSR_ENDTX (1UL << 4) /* End of Transfer TX from PDC */ +#define USART_CSR_OVRE (1UL << 5) /* Overrun error */ +#define USART_CSR_FRAME (1UL << 6) /* Framing error */ +#define USART_CSR_PARE (1UL << 7) /* Parity Error */ +#define USART_CSR_TIMEOUT (1UL << 8) /* Timeout since start-timeout */ +#define USART_CSR_TXEMPTY (1UL << 9) /* Transmitter empty */ +#define USART_CSR_ITERATION (1UL << 10) /* max repetitions since RSIT */ +#define USART_CSR_TXBUFE (1UL << 11) /* Buffer empty from PDC */ +#define USART_CSR_RXBUFF (1UL << 12) /* Buffer full from PDC */ +#define USART_CSR_NACK (1UL << 13) /* NACK since last RSTNACK */ +#define USART_CSR_RIIC (1UL << 16) /* RI delta since last csr read */ +#define USART_CSR_DSRIC (1UL << 17) /* DSR delta */ +#define USART_CSR_DCDIC (1UL << 18) /* DCD delta */ +#define USART_CSR_CTSIC (1UL << 19) /* CTS delta */ +#define USART_CSR_RI (1UL << 20) /* RI status */ +#define USART_CSR_DSR (1UL << 21) /* DSR status */ +#define USART_CSR_DCD (1UL << 22) /* DCD status */ +#define USART_CSR_CTS (1UL << 23) /* CTS status */ #define USART_RHR 0x18 /* Receiver holding register */ #define USART_THR 0x1c /* Transmitter holding register */ @@ -125,24 +125,4 @@ /* 0x48 reserved */ #define USART_IFR 0x48 /* IrDA filter register */ - -#define UART_RXRDY (0x1 << 0) /* RXRDY Interrupt */ -#define UART_TXRDY (0x1 << 1) /* TXRDY Interrupt */ -#define UART_RXBRK (0x1 << 2) /* Break Received/End of Break */ -#define UART_ENDRX (0x1 << 3) /* End of Receive Transfer Interrupt */ -#define UART_ENDTX (0x1 << 4) /* End of Transmit Interrupt */ -#define UART_OVRE (0x1 << 5) /* Overrun Interrupt */ -#define UART_FRAME (0x1 << 6) /* Framing Error Interrupt */ -#define UART_PARE (0x1 << 7) /* Parity Error Interrupt */ -#define UART_TIMEOUT ( 0x1 << 8) /* (USART) Receiver Time-out */ -#define UART_TXEMPTY ( 0x1 << 9) /* (USART) TXEMPTY Interrupt */ -#define UART_ITERATION ( 0x1 << 10) /* (USART) Max number of Repetitions Reached */ -#define UART_TXBUFE ( 0x1 << 11) /* (USART) TXBUFE Interrupt */ -#define UART_RXBUFF ( 0x1 << 12) /* (USART) RXBUFF Interrupt */ -#define UART_NACK ( 0x1 << 13) /* (USART) Non Acknowledge */ -#define UART_RIIC ( 0x1 << 16) /* (USART) Ring INdicator Input Change Flag */ -#define AT91RM92_US_DSRIC ( 0x1 << 17) /* (USART) Data Set Ready Input Change Flag */ -#define AT91RM92_US_DCDIC ( 0x1 << 18) /* (USART) Data Carrier Flag */ -#define AT91RM92_US_CTSIC ( 0x1 << 19) /* (USART) Clear To Send Input Change Flag */ - #endif /* AT91RM92REG_H_ */ ==== //depot/projects/trustedbsd/acl_nfsv4/src/sys/arm/at91/if_ate.c#2 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.5 2006/03/18 01:43:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.6 2006/04/06 04:30:23 imp Exp $"); #include #include @@ -86,13 +86,14 @@ struct callout tick_ch; /* Tick callout */ bus_dma_tag_t mtag; /* bus dma tag for mbufs */ bus_dmamap_t tx_map[ATE_MAX_TX_BUFFERS]; + struct mbuf *sent_mbuf[ATE_MAX_TX_BUFFERS]; /* Sent mbufs */ bus_dma_tag_t rxtag; bus_dmamap_t rx_map[ATE_MAX_RX_BUFFERS]; + void *rx_buf[ATE_MAX_RX_BUFFERS]; /* RX buffer space */ + int rx_buf_ptr; bus_dma_tag_t rx_desc_tag; bus_dmamap_t rx_desc_map; int txcur; /* current tx map pointer */ - struct mbuf *sent_mbuf[ATE_MAX_TX_BUFFERS]; /* Sent mbufs */ - struct mbuf *rx_mbuf[ATE_MAX_RX_BUFFERS]; /* RX mbufs */ bus_addr_t rx_desc_phys; eth_rx_desc_t *rx_descs; struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ @@ -241,6 +242,30 @@ sc->rx_desc_phys = segs[0].ds_addr; } +static void +ate_load_rx_buf(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +{ + struct ate_softc *sc; + int i; + + if (error != 0) + return; + sc = (struct ate_softc *)arg; + i = sc->rx_buf_ptr; + + /* + * For the last buffer, set the wrap bit so the controller + * restarts from the first descriptor. + */ + if (i == ATE_MAX_RX_BUFFERS - 1) + sc->rx_descs[i].addr = segs[0].ds_addr | ETH_WRAP_BIT; + else + sc->rx_descs[i].addr = segs[0].ds_addr; + sc->rx_descs[i].status = 0; + /* Flush the memory in the mbuf */ + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); +} + /* * Compute the multicast filter for this device using the standard * algorithm. I wonder why this isn't in ether somewhere as a lot @@ -275,10 +300,8 @@ * advantage of that. Locks here are to avoid LOR with the * IF_ADDR_LOCK, but might not be strictly necessary. */ - ATE_LOCK(sc); WR4(sc, ETH_HSL, mcaf[0]); WR4(sc, ETH_HSH, mcaf[1]); - ATE_UNLOCK(sc); } static int @@ -342,33 +365,21 @@ if (bus_dmamem_alloc(sc->rx_desc_tag, (void **)&sc->rx_descs, BUS_DMA_NOWAIT | BUS_DMA_COHERENT, &sc->rx_desc_map) != 0) goto errout; - if (bus_dmamap_load(sc->rx_desc_tag, sc->rx_desc_map, + if (bus_dmamap_load(sc->rx_desc_tag, sc->rx_desc_map, sc->rx_descs, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), ate_getaddr, sc, 0) != 0) goto errout; /* XXX TODO(5) Put this in ateinit_locked? */ for (i = 0; i < ATE_MAX_RX_BUFFERS; i++) { - bus_dma_segment_t seg; - int nsegs; - - sc->rx_mbuf[i] = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR); - sc->rx_mbuf[i]->m_len = sc->rx_mbuf[i]->m_pkthdr.len = >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Apr 15 15:17:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9738016A45D for ; Sat, 15 Apr 2006 15:17:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C335243D49 for ; Sat, 15 Apr 2006 15:17:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 28F2A46C33 for ; Sat, 15 Apr 2006 11:17:57 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 688F5558B2; Sat, 15 Apr 2006 15:17:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6063316A403; Sat, 15 Apr 2006 15:17:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 389E416A401 for ; Sat, 15 Apr 2006 15:17:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAA1043D46 for ; Sat, 15 Apr 2006 15:17: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 k3FFHtKD067443 for ; Sat, 15 Apr 2006 15:17: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 k3FFHtKP067437 for perforce@freebsd.org; Sat, 15 Apr 2006 15:17:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 15 Apr 2006 15:17:55 GMT Message-Id: <200604151517.k3FFHtKP067437@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 95329 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 15:17:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=95329 Change 95329 by rwatson@rwatson_fledge on 2006/04/15 15:17:42 UKUUG LISA paper on Audit. Affected files ... .. //depot/projects/trustedbsd/www/20060303-ukuug2006lisa-audit.pdf#1 add .. //depot/projects/trustedbsd/www/docs.bib#4 edit Differences ... ==== //depot/projects/trustedbsd/www/docs.bib#4 (text+ko) ==== @@ -35,7 +35,7 @@ - $P4: //depot/projects/trustedbsd/www/docs.bib#3 $ + $P4: //depot/projects/trustedbsd/www/docs.bib#4 $ @@ -329,4 +329,41 @@ Biba integrity policy based on the framework. + + The FreeBSD Audit System + + + Robert N. M. Watson + University of Cambridge, TrustedBSD Project + + + + Wayne Salamon + TrustedBSD Project + + + + UKUUG LISA Conference + Durham UK + March, 2006 + + + + + + + This paper describes the Common Criteria security event + auditing implementation added to the FreeBSD operating system by the + TrustedBSD Project. Audit is a critical element in operating system + security evaluation and operation, but both the standards-based and + operational requirements are complex. This paper describes the + requirements, FreeBSD kernel implementation, extensible file format + adopted from OpenSolaris BSM, mechanisms used for processing and + maintaining the audit trail, and the OpenBSM audit library and tool + set. Of importance is not just the content of audit records, but + also the reliability guarantees associated with the queuing and + delivery mechanisms. + + + From owner-trustedbsd-cvs@FreeBSD.ORG Sat Apr 15 15:18:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92BCE16A46A for ; Sat, 15 Apr 2006 15:18:59 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E7B343D45 for ; Sat, 15 Apr 2006 15:18:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B261546C33 for ; Sat, 15 Apr 2006 11:18:58 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 184EA56A50; Sat, 15 Apr 2006 15:18:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 122BF16A405; Sat, 15 Apr 2006 15:18:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE7D516A400 for ; Sat, 15 Apr 2006 15:18:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9746F43D45 for ; Sat, 15 Apr 2006 15:18: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 k3FFIvAN068184 for ; Sat, 15 Apr 2006 15:18: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 k3FFIvGB068176 for perforce@freebsd.org; Sat, 15 Apr 2006 15:18:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 15 Apr 2006 15:18:57 GMT Message-Id: <200604151518.k3FFIvGB068176@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 95330 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 15:18:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=95330 Change 95330 by rwatson@rwatson_fledge on 2006/04/15 15:18:37 Install the audit paper. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#5 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#4 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#5 $ STYLESHEET= page.xsl @@ -62,6 +62,7 @@ DATA+= sebsd-july2003.pdf DATA+= 20000809-trustedbsd-announcement.txt DATA+= robots.txt +DATA+= 20060303-ukuug2006lisa-audit.pdf GLOBAL_XML= sidebar.xml From owner-trustedbsd-cvs@FreeBSD.ORG Tue Apr 18 04:44:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C63EC16A402 for ; Tue, 18 Apr 2006 04:44:27 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F16243D45 for ; Tue, 18 Apr 2006 04:44:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 98D9546CCD for ; Tue, 18 Apr 2006 00:44:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C42AC559CB; Tue, 18 Apr 2006 04:44:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BBBC916A404; Tue, 18 Apr 2006 04:44:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 97D9116A401 for ; Tue, 18 Apr 2006 04:44:24 +0000 (UTC) (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 5934843D45 for ; Tue, 18 Apr 2006 04:44:24 +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 k3I4iOtJ029687 for ; Tue, 18 Apr 2006 04:44:24 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3I4iNNS029684 for perforce@freebsd.org; Tue, 18 Apr 2006 04:44:23 GMT (envelope-from csjp@freebsd.org) Date: Tue, 18 Apr 2006 04:44:23 GMT Message-Id: <200604180444.k3I4iNNS029684@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 95476 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2006 04:44:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=95476 Change 95476 by csjp@csjp_xor on 2006/04/18 04:43:39 - Add to the openbsm programming API and introduce the audit_submit(3) in raw form. This is the first stab at things, so it's possible that things might change from here. - A sample implementation might be as follows: int audit_bad_su(char *from_login, char *to_login) { int error; error = audit_submit(AUE_su, getuid(), 1, EPERM, "bad su from %s to %s", from_login, to_login); return (error); } Will generate the followng audit record: header,94,1,su(1),0,Mon Apr 17 23:23:59 2006, + 271 msec subject,root,root,wheel,root,wheel,652,652,0,0.0.0.0 text,bad su from from csjp to root return,failure : Operation not permitted,1 trailer,94 This function will be very useful for the on-going userspace integration of the audit code, and hopefully this little helper function can be used to prevent a lot of code replication. Discussed with: rwatson, wsalamon Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#19 edit .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#21 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#19 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#19 $ */ #ifndef _LIBBSM_H_ @@ -695,6 +695,9 @@ typedef struct tokenstr tokenstr_t; +int audit_submit(short au_event, au_id_t au_ctx, + char status, int reterr, const char *fmt, ...); + /* * Functions relating to querying audit class information. */ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#20 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#21 $ */ #ifdef __APPLE__ @@ -46,6 +46,7 @@ #include #include +#include #include #include @@ -53,6 +54,110 @@ int audit_set_terminal_port(dev_t *p); int audit_set_terminal_host(uint32_t *m); +/* + * General purpose audit submission mechanism for userspace. + */ +int +audit_submit(short au_event, au_id_t au_ctx, char status, + int reterr, const char *fmt, ...) +{ + char text[MAX_AUDITSTRING_LEN]; + au_tid_t termid; + token_t *token; + long acond; + va_list ap; + pid_t pid; + int error, afd; + + if (auditon(A_GETCOND, &acond, sizeof(acond)) < 0) { + /* + * If auditon(2) returns ENOSYS, then audit has not been + * compiled into the kernel, so just return. + */ + if (errno == ENOSYS) + return (0); + error = errno; + syslog(LOG_AUTH | LOG_ERR, "audit: auditon failed: %s", + strerror(errno)); + errno = error; + return (-1); + } + if (acond == AUC_NOAUDIT) + return (0); + afd = au_open(); + if (afd < 0) { + error = errno; + syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", + strerror(errno)); + errno = error; + return (-1); + } + /* XXX what should we do for termid? */ + bzero(&termid, sizeof(termid)); + pid = getpid(); + token = au_to_subject32(au_ctx, geteuid(), getegid(), + getuid(), getgid(), pid, pid, &termid); + if (token == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "audit: unable to build subject token"); + (void) au_close(afd, AU_TO_NO_WRITE, au_event); + errno = EPERM; + return (-1); + } + if (au_write(afd, token) < 0) { + error = errno; + syslog(LOG_AUTH | LOG_ERR, + "audit: au_write failed: %s", strerror(errno)); + (void) au_close(afd, AU_TO_NO_WRITE, au_event); + errno = error; + return (-1); + } + if (fmt != NULL) { + va_start(ap, fmt); + (void) vsnprintf(text, MAX_AUDITSTRING_LEN, fmt, ap); + va_end(ap); + token = au_to_text(text); + if (token == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "audit: failed to generate text token"); + (void) au_close(afd, AU_TO_NO_WRITE, au_event); + errno = EPERM; + return (-1); + } + if (au_write(afd, token) < 0) { + error = errno; + syslog(LOG_AUTH | LOG_ERR, + "audit: au_write failed: %s", strerror(errno)); + (void) au_close(afd, AU_TO_NO_WRITE, au_event); + errno = error; + return (-1); + } + } + token = au_to_return32(status, reterr); + if (token == NULL) { + syslog(LOG_AUTH | LOG_ERR, + "audit: enable to build return token"); + (void) au_close(afd, AU_TO_NO_WRITE, au_event); + errno = EPERM; + return (-1); + } + if (au_write(afd, token) < 0) { + error = errno; + syslog(LOG_AUTH | LOG_ERR, + "audit: au_write failed: %s", strerror(errno)); + (void) au_close(afd, AU_TO_NO_WRITE, au_event); + errno = error; + return (-1); + } + if (au_close(afd, AU_TO_WRITE, au_event) < 0) { + error = errno; + syslog(LOG_AUTH | LOG_ERR, "audit: record not committed"); + errno = error; + return (-1); + } + return (0); +} + int audit_set_terminal_port(dev_t *p) { From owner-trustedbsd-cvs@FreeBSD.ORG Tue Apr 18 04:47:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7369E16A402 for ; Tue, 18 Apr 2006 04:47:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB58043D48 for ; Tue, 18 Apr 2006 04:47:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 74D4446C81 for ; Tue, 18 Apr 2006 00:47:35 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C085D55942; Tue, 18 Apr 2006 04:45:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B7E1016A404; Tue, 18 Apr 2006 04:45:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D97A16A400 for ; Tue, 18 Apr 2006 04:45:26 +0000 (UTC) (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 2F47843D46 for ; Tue, 18 Apr 2006 04:45:26 +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 k3I4jPcw029842 for ; Tue, 18 Apr 2006 04:45:25 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3I4jPjH029839 for perforce@freebsd.org; Tue, 18 Apr 2006 04:45:25 GMT (envelope-from csjp@freebsd.org) Date: Tue, 18 Apr 2006 04:45:25 GMT Message-Id: <200604180445.k3I4jPjH029839@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 95477 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2006 04:47:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=95477 Change 95477 by csjp@csjp_xor on 2006/04/18 04:45:14 Include the right header files so the example code actually compiles Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#2 (text+ko) ==== @@ -39,9 +39,11 @@ .Bd -literal -offset indent #include #include +#include #include #include +#include int audit_bad_su(char *from_login, char *to_login) From owner-trustedbsd-cvs@FreeBSD.ORG Tue Apr 18 18:46:47 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE72B16A405 for ; Tue, 18 Apr 2006 18:46:47 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1D4B43D48 for ; Tue, 18 Apr 2006 18:46:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 89E8C46CEC for ; Tue, 18 Apr 2006 14:46:37 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 926C25546C; Tue, 18 Apr 2006 18:46:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DBA116A405; Tue, 18 Apr 2006 18:46:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 526C016A401 for ; Tue, 18 Apr 2006 18:46:35 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00B6A43D49 for ; Tue, 18 Apr 2006 18:46:34 +0000 (GMT) (envelope-from brueffer@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 k3IIkYTq002846 for ; Tue, 18 Apr 2006 18:46:34 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3IIkYp9002843 for perforce@freebsd.org; Tue, 18 Apr 2006 18:46:34 GMT (envelope-from brueffer@freebsd.org) Date: Tue, 18 Apr 2006 18:46:34 GMT Message-Id: <200604181846.k3IIkYp9002843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 95512 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2006 18:46:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=95512 Change 95512 by brueffer@brueffer_serenity on 2006/04/18 18:46:31 Cleanup (formatting, sentence breaks, mdoc...) Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#3 (text+ko) ==== @@ -24,18 +24,19 @@ .Fa status and .Fa reterr -arguments. Optionally, a text token will be created as a part of this record. +arguments. +Optionally, a text token will be created as a part of this record. .Pp Text token output is under the control of a .Fa format string that specifies how subsequent arguments (or arguments accessed via the variable-length argument facilities of -.Xr stdarg 3 -are converted for output. If +.Xr stdarg 3 ) +are converted for output. +If .Fa format is NULL, then no text token is created in the audit record. .Sh EXAMPLES -.Pp .Bd -literal -offset indent #include #include @@ -56,7 +57,7 @@ } .Ed .Pp -Will generate the followng audit record: +Will generate the following audit record: .Bd -literal -offset indent header,94,1,su(1),0,Mon Apr 17 23:23:59 2006, + 271 msec subject,root,root,wheel,root,wheel,652,652,0,0.0.0.0 @@ -71,6 +72,10 @@ .Sh HISTORY The .Nm -function was written by Christian S.J. Peron and -first appeared in OpenBSM version 1.0. OpenBSM 1.0 was introduced in -FreeBSD 7.0. +first appeared in OpenBSM version 1.0. +OpenBSM 1.0 was introduced in FreeBSD 7.0. +.Sh AUTHORS +The +.Nm +function was written by +.An Christian S.J. Peron Aq csjp@FreeBSD.org . From owner-trustedbsd-cvs@FreeBSD.ORG Tue Apr 18 22:34:04 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AD4816A409 for ; Tue, 18 Apr 2006 22:34:04 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A62CC43D72 for ; Tue, 18 Apr 2006 22:33:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C1D3F46BDE for ; Tue, 18 Apr 2006 18:33:49 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9CF875B5A4; Tue, 18 Apr 2006 22:33:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4560E16A403; Tue, 18 Apr 2006 22:33:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2540616A415 for ; Tue, 18 Apr 2006 22:33:30 +0000 (UTC) (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 2567F43D6D for ; Tue, 18 Apr 2006 22:33:29 +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 k3IMXTg4038742 for ; Tue, 18 Apr 2006 22:33:29 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3IMXSTU038739 for perforce@freebsd.org; Tue, 18 Apr 2006 22:33:28 GMT (envelope-from csjp@freebsd.org) Date: Tue, 18 Apr 2006 22:33:28 GMT Message-Id: <200604182233.k3IMXSTU038739@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 95551 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2006 22:34:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=95551 Change 95551 by csjp@csjp_xor on 2006/04/18 22:33:26 Add license, not sure how I forgot about this :) Pointed out by: brueffer Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#4 (text+ko) ==== @@ -1,3 +1,35 @@ +.\" +.\" Copyright (c) 2006 Christian S.J. Peron +.\" All rights reserved. +.\" +.\" This code was developed in part by Robert N. M. Watson, Senior Principal +.\" Scientist, SPARTA, Inc. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of +.\" its contributors may be used to endorse or promote products derived +.\" from this software without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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. +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#4 $ .Dd April 11, 2006 .Dt audit_submit 3 .Os From owner-trustedbsd-cvs@FreeBSD.ORG Tue Apr 18 22:34:12 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E2D316A401 for ; Tue, 18 Apr 2006 22:34:12 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A11E43D76 for ; Tue, 18 Apr 2006 22:33:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 63B6146BE5 for ; Tue, 18 Apr 2006 18:33:50 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B7540559CA; Tue, 18 Apr 2006 22:33:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B163316A406; Tue, 18 Apr 2006 22:33:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 528DE16A403 for ; Tue, 18 Apr 2006 22:33:49 +0000 (UTC) (envelope-from csjp@FreeBSD.org) Received: from ems01.seccuris.com (ems01.seccuris.com [204.112.0.35]) by mx1.FreeBSD.org (Postfix) with SMTP id C332543D72 for ; Tue, 18 Apr 2006 22:33:41 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: (qmail 26791 invoked by uid 86); 18 Apr 2006 22:50:56 -0000 Received: from unknown (HELO ?192.168.11.101?) (192.168.11.101) by ems01.seccuris.com with SMTP; 18 Apr 2006 22:50:56 -0000 Message-ID: <44456949.7020806@FreeBSD.org> Date: Tue, 18 Apr 2006 17:33:45 -0500 From: "Christian S.J. Peron" User-Agent: Thunderbird 1.5 (Macintosh/20051201) MIME-Version: 1.0 To: Christian Brueffer References: <200604181846.k3IIkYp9002843@repoman.freebsd.org> In-Reply-To: <200604181846.k3IIkYp9002843@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 95512 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2006 22:34:12 -0000 Christian Brueffer wrote: > http://perforce.freebsd.org/chv.cgi?CH=95512 > > Change 95512 by brueffer@brueffer_serenity on 2006/04/18 18:46:31 > > Cleanup (formatting, sentence breaks, mdoc...) > > Affected files ... > > .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#3 edit > > Differences ... > > ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#3 (text+ko) ==== > > @@ -24,18 +24,19 @@ > .Fa status > and > .Fa reterr > -arguments. Optionally, a text token will be created as a part of this record. > +arguments. > +Optionally, a text token will be created as a part of this record. > .Pp > Text token output is under the control of a > .Fa format > string that specifies how subsequent arguments (or arguments accessed via the > variable-length argument facilities of > -.Xr stdarg 3 > -are converted for output. If > +.Xr stdarg 3 ) > +are converted for output. > +If > .Fa format > is NULL, then no text token is created in the audit record. > .Sh EXAMPLES > -.Pp > .Bd -literal -offset indent > #include > #include > @@ -56,7 +57,7 @@ > } > .Ed > .Pp > -Will generate the followng audit record: > +Will generate the following audit record: > .Bd -literal -offset indent > header,94,1,su(1),0,Mon Apr 17 23:23:59 2006, + 271 msec > subject,root,root,wheel,root,wheel,652,652,0,0.0.0.0 > @@ -71,6 +72,10 @@ > .Sh HISTORY > The > .Nm > -function was written by Christian S.J. Peron and > -first appeared in OpenBSM version 1.0. OpenBSM 1.0 was introduced in > -FreeBSD 7.0. > +first appeared in OpenBSM version 1.0. > +OpenBSM 1.0 was introduced in FreeBSD 7.0. > +.Sh AUTHORS > +The > +.Nm > +function was written by > +.An Christian S.J. Peron Aq csjp@FreeBSD.org . > > > Thanks for all this! -- Christian S.J. Peron csjp@FreeBSD.ORG FreeBSD Committer FreeBSD Security Team From owner-trustedbsd-cvs@FreeBSD.ORG Tue Apr 18 22:35:39 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C90EC16A40A for ; Tue, 18 Apr 2006 22:35:39 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11AE043D64 for ; Tue, 18 Apr 2006 22:35:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 83A2346BA9 for ; Tue, 18 Apr 2006 18:35:33 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CC8DA564F8; Tue, 18 Apr 2006 22:35:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C94D916A408; Tue, 18 Apr 2006 22:35:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8FE9C16A402 for ; Tue, 18 Apr 2006 22:35:32 +0000 (UTC) (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 1F65E43D53 for ; Tue, 18 Apr 2006 22:35:32 +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 k3IMZVxJ038879 for ; Tue, 18 Apr 2006 22:35:32 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3IMZVIZ038876 for perforce@freebsd.org; Tue, 18 Apr 2006 22:35:31 GMT (envelope-from csjp@freebsd.org) Date: Tue, 18 Apr 2006 22:35:31 GMT Message-Id: <200604182235.k3IMZVIZ038876@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 95552 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2006 22:35:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=95552 Change 95552 by csjp@csjp_xor on 2006/04/18 22:35:28 Remove cut-n-pasto from old license Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#5 (text+ko) ==== @@ -2,9 +2,6 @@ .\" Copyright (c) 2006 Christian S.J. Peron .\" All rights reserved. .\" -.\" This code was developed in part by Robert N. M. Watson, Senior Principal -.\" Scientist, SPARTA, Inc. -.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -29,7 +26,7 @@ .\" 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. -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#5 $ .Dd April 11, 2006 .Dt audit_submit 3 .Os From owner-trustedbsd-cvs@FreeBSD.ORG Wed Apr 19 21:08:23 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6968816A400 for ; Wed, 19 Apr 2006 21:08:23 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6263043D49 for ; Wed, 19 Apr 2006 21:08:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 56A1646D2A for ; Wed, 19 Apr 2006 17:08:17 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 06A4755DFA; Wed, 19 Apr 2006 21:07:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EE92216A40A; Wed, 19 Apr 2006 21:07:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3DFE16A408 for ; Wed, 19 Apr 2006 21:07:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 807E243D4C for ; Wed, 19 Apr 2006 21:07:48 +0000 (GMT) (envelope-from millert@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 k3JL7maS044013 for ; Wed, 19 Apr 2006 21:07:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3JL7mWk044010 for perforce@freebsd.org; Wed, 19 Apr 2006 21:07:48 GMT (envelope-from millert@freebsd.org) Date: Wed, 19 Apr 2006 21:07:48 GMT Message-Id: <200604192107.k3JL7mWk044010@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95625 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2006 21:08:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=95625 Change 95625 by millert@millert_g5tower on 2006/04/19 21:06:54 Fix some cut & pastos Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/security.defs#8 (text+ko) ==== @@ -17,8 +17,7 @@ @param task Target's task port @param label Returned label handle - This call retrieves a label handle label for the - specified task, with respect to the specified policies. + This call retrieves the label handle of the specified task. @return Standard MiG return values (0 for success) */ @@ -48,12 +47,9 @@ @param port Port to query label from @param label Returned label handle - This call retrieves a label handle label for the - specified task, with respect to the specified policies. - - This call retrieves a label handle for the specified port, with - respect to the specified policies. If the port represents a label - handle, KERN_INVALID_ARGUMENT is returned. + This call retrieves a new label handle for the specified port. + If the port represents a label handle, KERN_INVALID_ARGUMENT is + returned. @return Standard MiG return values (0 for success) */ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Apr 19 21:32:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88DC816A404 for ; Wed, 19 Apr 2006 21:32:28 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC8CF43D46 for ; Wed, 19 Apr 2006 21:32:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B1D6F46C43 for ; Wed, 19 Apr 2006 17:32:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 28A0D55915; Wed, 19 Apr 2006 21:32:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E65D16A405; Wed, 19 Apr 2006 21:32:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F14F316A404 for ; Wed, 19 Apr 2006 21:32:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CF1C43D48 for ; Wed, 19 Apr 2006 21:32:23 +0000 (GMT) (envelope-from millert@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 k3JLWNVb056925 for ; Wed, 19 Apr 2006 21:32:23 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3JLWNP3056919 for perforce@freebsd.org; Wed, 19 Apr 2006 21:32:23 GMT (envelope-from millert@freebsd.org) Date: Wed, 19 Apr 2006 21:32:23 GMT Message-Id: <200604192132.k3JLWNP3056919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95630 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2006 21:32:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=95630 Change 95630 by millert@millert_g5tower on 2006/04/19 21:32:10 Remove gratuitous diffs against SEBSD Some style fixes Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#37 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/context.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/ebitmap.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/init.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mls.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mls.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/policydb.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/security.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/sidtab.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#9 (text+ko) ==== @@ -35,6 +35,7 @@ #include #endif +int selinux_auditing = 1; int selinux_enforcing = 0; #define AVC_CACHE_SLOTS 512 @@ -98,7 +99,7 @@ } static inline void avc_cache_stats_add(int type, unsigned val) - +{ avc_cache_stats[type] += val; } #else @@ -110,6 +111,7 @@ #endif #if 0 +/* XXXMAC - moved to services.c */ /** * avc_dump_av - Display an access vector in human-readable form. * @tclass: target security class @@ -189,7 +191,7 @@ printk(" tcontext=%s", scontext); kfree(scontext); } - printk(" tclass=%s", security_class_to_string (tclass)); + printk(" tclass=%s", security_class_to_string(tclass)); } /** @@ -200,6 +202,8 @@ void avc_init(void) { struct avc_node *new; + size_t evsize; + char *ev; int i; for (i = 0; i < AVC_NSTATS; i++) @@ -237,11 +241,9 @@ mtx_init(&avc_log_lock, "SEBSD message lock", NULL, MTX_DEF); #endif - size_t evsize; - char *ev; if (preload_find_data ("sebsd_enforce", &evsize, &ev)) { - if (evsize > 0 && ev[0] == '1') - selinux_enforcing = 1; + if (evsize > 0 && ev[0] == '1') + selinux_enforcing = 1; } } @@ -535,6 +537,17 @@ static inline int check_avc_ratelimit(void) { + + /* + * If auditing is not enabled, suppress all messages. + */ + if (!selinux_auditing) + return 0; + + /* + * Otherwise, rate limit messages in enforcing mode, or display all + * messages in permissive mode. + */ if (selinux_enforcing) return avc_ratelimit(); else { ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.h#4 (text+ko) ==== @@ -20,11 +20,15 @@ #include #endif +#include + #include #include #include #include +extern int selinux_auditing; + #define CONFIG_SECURITY_SELINUX_DEVELOP #ifdef CONFIG_SECURITY_SELINUX_DEVELOP @@ -66,8 +70,20 @@ } fs; struct { char *netif; + struct sock *sk; + u16 family; u16 port; - u32 daddr; + u16 sport; + union { + struct { + u32 daddr; + u32 saddr; + } v4; + struct { + struct in6_addr daddr; + struct in6_addr saddr; + } v6; + } fam; } net; #ifdef CAPABILITIES cap_value_t cap; @@ -111,7 +127,6 @@ * AVC operations */ -/* Initialize the AVC */ void avc_init(void); int avc_lookup( @@ -163,5 +178,5 @@ u32 events, security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms); -#endif /* _LINUX_AVC_H_ */ +#endif /* _SELINUX_AVC_H_ */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#37 (text+ko) ==== @@ -8,6 +8,9 @@ * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -126,7 +129,7 @@ extern int ss_initialized; static __inline int ss_precondition(void) { - return ss_initialized; + return (ss_initialized); } static void @@ -135,7 +138,6 @@ printf("sebsd:: init\n"); avc_init(); - //sebsd_register_sysctls(); if (security_init()) { panic("SEBSD: couldn't read policy file"); } @@ -153,7 +155,7 @@ sebsd_destroy(struct mac_policy_conf *mpc) { - printf("sebsd:: destroy\n"); + panic("sebsd_destroy"); } #ifdef CAPABILITIES @@ -171,8 +173,8 @@ AVC_AUDIT_DATA_INIT(&ad, CAP); ad.u.cap = cap; - return avc_has_perm_audit(task->sid, task->sid, - SECCLASS_CAPABILITY, cap, &ad); + return (avc_has_perm_audit(task->sid, task->sid, + SECCLASS_CAPABILITY, cap, &ad)); } #endif @@ -257,48 +259,50 @@ static __inline security_class_t vnode_type_to_security_class(enum vtype vt) { + switch (vt) { case VREG: - return SECCLASS_FILE; + return (SECCLASS_FILE); case VDIR: - return SECCLASS_DIR; + return (SECCLASS_DIR); case VBLK: - return SECCLASS_BLK_FILE; + return (SECCLASS_BLK_FILE); case VCHR: - return SECCLASS_CHR_FILE; + return (SECCLASS_CHR_FILE); case VLNK: - return SECCLASS_LNK_FILE; + return (SECCLASS_LNK_FILE); case VSOCK: - return SECCLASS_SOCK_FILE; + return (SECCLASS_SOCK_FILE); case VFIFO: - return SECCLASS_FIFO_FILE; + return (SECCLASS_FIFO_FILE); case VNON: case VBAD: #ifdef __APPLE__ case VSTR: case VCPLX: #endif - return SECCLASS_FILE; + return (SECCLASS_FILE); } - return SECCLASS_FILE; + return (SECCLASS_FILE); } static __inline security_class_t devfs_type_to_security_class(int type) { + switch (type) { case DEV_DIR: - return SECCLASS_DIR; + return (SECCLASS_DIR); case DEV_BDEV: - return SECCLASS_BLK_FILE; + return (SECCLASS_BLK_FILE); case DEV_CDEV: - return SECCLASS_CHR_FILE; + return (SECCLASS_CHR_FILE); case DEV_SLNK: - return SECCLASS_LNK_FILE; + return (SECCLASS_LNK_FILE); } - return SECCLASS_FILE; + return (SECCLASS_FILE); } static __inline access_vector_t @@ -329,7 +333,7 @@ av |= DIR__READ; } - return av; + return (av); } static int @@ -346,24 +350,30 @@ AVC_AUDIT_DATA_INIT(&ad, FS); ad.u.fs.vp = vp; +#if 0 if (file->sclass == 0) { struct vattr va; struct proc *p = current_proc(); - VOP_GETATTR (vp, &va, p->p_ucred, p); + VOP_GETATTR(vp, &va, p->p_ucred, p); printf("vnode_has_perm:: ERROR, sid=%d, sclass=0, v_type=%d," " inode=%ld, fsid=%d, fstype=%s, mnt=%s\n", - file->sid, vp->v_type, va.va_fileid, va.va_fsid, vp->v_mount->mnt_vfc->vfc_name, vp->v_mount->mnt_stat.f_mntonname); + file->sid, vp->v_type, va.va_fileid, va.va_fsid, + vp->v_mount->mnt_vfc->vfc_name, + vp->v_mount->mnt_stat.f_mntonname); file->sclass = vnode_type_to_security_class(vp->v_type); if (file->sclass == 0) { printf("vnode_has_perm:: Giving up\n"); - return 1; /* TBD: debugging */ + return (1); /* TBD: debugging */ } } - file->sclass = vnode_type_to_security_class (vp->v_type); +#else + /* XXX - why must we reset sclass this every time? */ + file->sclass = vnode_type_to_security_class(vp->v_type); +#endif - return avc_has_perm_ref_audit(task->sid, file->sid, file->sclass, - perm, aeref ? aeref : &file->avcr, &ad); + return (avc_has_perm_ref_audit(task->sid, file->sid, file->sclass, + perm, aeref ? aeref : &file->avcr, &ad)); } #ifdef HAS_PIPES @@ -380,7 +390,7 @@ * TBD: No audit information yet */ - return(avc_has_perm_ref(task->sid, file->sid, file->sclass, + return (avc_has_perm_ref(task->sid, file->sid, file->sclass, perm, &file->avcr)); } #endif @@ -396,21 +406,11 @@ } static void -sebsd_init_port_label(struct label *label) -{ - struct task_security_struct *new_tsec; - - new_tsec = sebsd_malloc(sizeof(*new_tsec), M_ZERO | M_WAITOK); - new_tsec->osid = new_tsec->sid = SECINITSID_UNLABELED; - SLOT(label) = new_tsec; -} - -static void sebsd_init_file_label(struct label *label) { struct file_security_struct *new_fsec; - new_fsec = sebsd_malloc (sizeof(*new_fsec), M_ZERO | M_WAITOK); + new_fsec = sebsd_malloc(sizeof(*new_fsec), M_ZERO | M_WAITOK); new_fsec->sid = new_fsec->sid = SECINITSID_UNLABELED; SLOT(label) = new_fsec; } @@ -495,37 +495,8 @@ } static void -sebsd_destroy_cred_label(struct label *label) -{ - sebsd_free (SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_destroy_vnode_label(struct label *label) -{ - sebsd_free (SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_destroy_mount_label(struct label *label) -{ - sebsd_free (SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_destroy_mount_fs_label(struct label *label) -{ - sebsd_free (SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_destroy_sysv_label(struct label *label) +sebsd_destroy_label(struct label *label) { - sebsd_free(SLOT(label)); SLOT(label) = NULL; } @@ -533,13 +504,13 @@ static void sebsd_relabel_cred(struct ucred *cred, struct label *newlabel) { - /* - * XXX/TBD: normally, SEBSD doesn't permit process labels to change - * other than at exec time... - */ - struct task_security_struct *task = SLOT(cred->cr_label); - struct task_security_struct *nsec = SLOT(newlabel); - task->sid = nsec->sid; + /* + * XXX/TBD: normally, SEBSD doesn't permit process labels to change + * other than at exec time... + */ + struct task_security_struct *task = SLOT(cred->cr_label); + struct task_security_struct *nsec = SLOT(newlabel); + task->sid = nsec->sid; } static void @@ -589,20 +560,18 @@ vsec = SLOT(vlabel); context_len = sizeof(context); /* TBD: bad fixed length */ - error = vn_extattr_get(vp, IO_NODELOCKED, - SEBSD_MAC_EXTATTR_NAMESPACE, - SEBSD_MAC_EXTATTR_NAME, - &context_len, context, p); + error = vn_extattr_get(vp, IO_NODELOCKED, SEBSD_MAC_EXTATTR_NAMESPACE, + SEBSD_MAC_EXTATTR_NAME, &context_len, context, p); if (error == ENOATTR || error == EOPNOTSUPP) { vsec->sid = SECINITSID_UNLABELED; /* Use the default label */ - /* +#if 0 struct vattr va; (void)VOP_GETATTR(vp, &va, p->p_ucred, p); printf("sebsd_update_vnode_from_extattr: no label for " "inode=%ld, fsid=%d\n", va.va_fileid, va.va_fsid); - */ +#endif goto dosclass; } if (error) { @@ -630,11 +599,11 @@ if (error) goto dosclass; - error = security_context_to_sid(context, strlen(context), &vsec->sid); + error = security_context_to_sid(context, context_len, &vsec->sid); if (error) { printf("sebsd_update_vnode_from_extattr: ERROR mapping " "context to sid: %.*s\n", context_len, context); - return (0); /* TBD bad, bad, bad */ + return (0); /* TBD bad, bad, bad */ } dosclass: @@ -751,7 +720,7 @@ } static void -sebsd_create_port (struct label *it, struct label *st, struct label *port) +sebsd_create_port(struct label *it, struct label *st, struct label *port) { struct task_security_struct *its, *sts, *psec; int error; @@ -839,11 +808,13 @@ if (cr != NULL) { struct task_security_struct *task = SLOT(cr->cr_label); - /* XXX: uses the type specified by genfs instead of the parent - directory like it should! */ - rc = security_transition_sid(task->sid, dirent->sid, + /* + * XXX: uses the type specified by genfs instead of the + * parent directory like it should! + */ + int error = security_transition_sid(task->sid, dirent->sid, dirent->sclass, &newsid); - if (rc == 0) + if (error == 0) dirent->sid = newsid; } @@ -901,7 +872,6 @@ struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel, const char *fullpath) { - char *path; int rc; security_id_t newsid; @@ -967,7 +937,7 @@ task = SLOT(cred->cr_label); task->osid = task->sid = SECINITSID_KERNEL; printf("sebsd_create_proc0:: using SECINITSID_KERNEL = %d\n", - SECINITSID_KERNEL); + SECINITSID_KERNEL); } static void @@ -998,21 +968,24 @@ * which the filesystem will use if not a "multilabel" type. */ rc = security_fs_use(mp->mnt_vfc->vfc_name, &behavior, &sbsec->sid); - if (rc != 0) { + if (rc) { printf("sebsd_create_mount: security_fs_use(%s) returned %d\n", mp->mnt_vfc->vfc_name, rc); behavior = SECURITY_FS_USE_NONE; } else { sbfssec->sid = sbsec->sid; /* TBD: debugging only */ - printf("sebsd_create_mount: security_fs_use(%s) behavior %d, sid %d\n", - mp->mnt_vfc->vfc_name, behavior, sbsec->sid); + printf("sebsd_create_mount: security_fs_use(%s) behavior " + "%d, sid %d\n", mp->mnt_vfc->vfc_name, behavior, + sbsec->sid); } switch (behavior) { case SECURITY_FS_USE_XATTR: - /* PSIDs only work for persistent file systems with - unique and persistent inode numbers. */ + /* + * PSIDs only work for persistent file systems with unique + * and persistent inode numbers. + */ sbsec->uses_psids = 1; /* @@ -1022,27 +995,35 @@ break; case SECURITY_FS_USE_TRANS: - /* Transition SIDs are used for pseudo filesystems like - devpts and tmpfs where you want the SID to be derived - from the SID of the creating process and the SID of - the filesystem. */ + /* + * Transition SIDs are used for pseudo filesystems like + * devpts and tmpfs where you want the SID to be derived + * from the SID of the creating process and the SID of the + * filesystem. + */ sbsec->uses_trans = 1; break; case SECURITY_FS_USE_TASK: - /* Task SIDs are used for pseudo filesystems like pipefs - and sockfs where you want the objects to be labeled - with the SID of the creating process. */ + /* + * Task SIDs are used for pseudo filesystems like pipefs and + * sockfs where you want the objects to be labeled with the + * SID of the creating process. + */ sbsec->uses_task = 1; break; case SECURITY_FS_USE_GENFS: - /* genfs_contexts handles everything else, like devfs, - usbdevfs, driverfs, and portions of proc. */ + /* + * genfs_contexts handles everything else, like devfs, + * usbdevfs, driverfs, and portions of proc. + */ sbsec->uses_genfs = 1; break; case SECURITY_FS_USE_NONE: - /* No labeling support configured for this filesystem type. - Don't appear to require labeling for binfmt_misc, bdev, - or rootfs. */ + /* + * No labeling support configured for this filesystem type. + * Don't appear to require labeling for binfmt_misc, bdev, + * or rootfs. + */ break; default: printf("%s: security_fs_use(%s) returned unrecognized " @@ -1079,10 +1060,9 @@ task = SLOT(cred->cr_label); dir = SLOT(parentlabel); vsec = SLOT(childlabel); - tclass = vnode_type_to_security_class (child->v_type); + tclass = vnode_type_to_security_class(child->v_type); - error = security_transition_sid(task->sid, dir->sid, tclass, - &newsid); + error = security_transition_sid(task->sid, dir->sid, tclass, &newsid); if (error) return (error); @@ -1109,14 +1089,10 @@ sebsd_check_cap(struct ucred *cred, cap_value_t capv) { - return cred_has_capability(cred, capv); + return (cred_has_capability(cred, capv)); } #endif -/* - * SEBSD does not support the relabeling of processes without - * transitioning. - */ static int sebsd_check_cred_relabel(struct ucred *cred, struct label *newlabel) { @@ -1127,23 +1103,19 @@ tsec = SLOT(cred->cr_label); if (nsec == NULL) - return 0; + return (0); rc = avc_has_perm_ref_audit(tsec->sid, tsec->sid, SECCLASS_PROCESS, - FILE__RELABELFROM, NULL, NULL); + FILE__RELABELFROM, NULL, NULL); if (rc) return (rc); rc = avc_has_perm_audit(tsec->sid, nsec->sid, SECCLASS_PROCESS, - FILE__RELABELTO, NULL); + FILE__RELABELTO, NULL); if (rc) return (rc); - /* - if (nsec != NULL && nsec->sid != tsec->sid) - return EPERM; - */ - return 0; + return (0); } static int @@ -1167,7 +1139,7 @@ if (rc) return (rc); - return 0; + return (0); } #define CHECK_SIMPLE_PERM(func,class,perm) \ @@ -1176,8 +1148,8 @@ struct task_security_struct *tsec, *psec; \ psec = SLOT(port); \ tsec = SLOT(task); \ - return avc_has_perm_ref_audit (tsec->sid, psec->sid, \ - SECCLASS_ ## class, class ## __ ## perm, NULL, NULL); \ + return (avc_has_perm_ref_audit (tsec->sid, psec->sid, \ + SECCLASS_ ## class, class ## __ ## perm, NULL, NULL)); \ } CHECK_SIMPLE_PERM(msg_send, MACH_PORT, SEND); @@ -1199,33 +1171,33 @@ const char *s, const char * pn) { struct task_security_struct *tsec, *psec; - struct class_datum *cld; - struct perm_datum *p; + struct class_datum *cld; + struct perm_datum *p; psec = SLOT(obj); tsec = SLOT(subj); cld = hashtab_search(policydb.p_classes.table, (void *)s); if (cld == NULL) - return EINVAL; + return (EINVAL); p = hashtab_search(cld->permissions.table, (void *)pn); if (p == NULL && cld->comdatum) p = hashtab_search(cld->comdatum->permissions.table, (void *)pn); if (p == NULL) - return EINVAL; + return (EINVAL); - return avc_has_perm_ref_audit(tsec->sid, psec->sid, cld->value, - 1 << (p->value-1), NULL, NULL); + return (avc_has_perm_ref_audit(tsec->sid, psec->sid, cld->value, + 1 << (p->value-1), NULL, NULL)); } static int -sebsd_request_label (struct label *subj, struct label *obj, const char *s, +sebsd_request_label(struct label *subj, struct label *obj, const char *s, struct label *out) { struct task_security_struct *tsec, *psec, *osec; - struct class_datum *cld; - struct perm_datum *p; + struct class_datum *cld; + struct perm_datum *p; psec = SLOT(obj); tsec = SLOT(subj); @@ -1233,10 +1205,10 @@ cld = hashtab_search(policydb.p_classes.table, (void *)s); if (cld == NULL) - return EINVAL; + return (EINVAL); - return security_change_sid(tsec->sid, psec->sid, cld->value, - &osec->sid); + return (security_change_sid(tsec->sid, psec->sid, cld->value, + &osec->sid)); } static int @@ -1248,11 +1220,11 @@ psec = SLOT(obj); tsec = SLOT(subj); - return sebsd_check_ipc_method1(tsec->sid,psec->sid, msgid); + return (sebsd_check_ipc_method1(tsec->sid,psec->sid, msgid)); } static int -sebsd_check_mount (struct ucred *cred, struct vnode *vp, struct label *vl, +sebsd_check_mount(struct ucred *cred, struct vnode *vp, struct label *vl, const char *vfc_name, struct label *mntlabel) { int rc; @@ -1265,29 +1237,28 @@ vsec = SLOT(vl); task = SLOT(cred->cr_label); - rc = vnode_has_perm (cred, vp, FILE__MOUNTON, NULL); + rc = vnode_has_perm(cred, vp, FILE__MOUNTON, NULL); if (rc) - return rc; + return (rc); if (mntlabel) { sbsec = SLOT(mntlabel); sid = sbsec->sid; - rc = avc_has_perm_ref_audit (task->sid, sid, SECCLASS_FILE, + rc = avc_has_perm_ref_audit(task->sid, sid, SECCLASS_FILE, COMMON_FILE__RELABELTO, NULL, NULL); if (rc) - return rc; - } - else { - rc = security_fs_use (vfc_name, &behavior, &sid); + return (rc); + } else { + rc = security_fs_use(vfc_name, &behavior, &sid); if (rc) - return rc; + return (rc); } - rc = avc_has_perm_ref_audit (task->sid, sid, SECCLASS_FILESYSTEM, + rc = avc_has_perm_ref_audit(task->sid, sid, SECCLASS_FILESYSTEM, FILESYSTEM__MOUNT, NULL, NULL); - return rc; + return (rc); } static int @@ -1303,12 +1274,12 @@ struct label *mntlabel, struct label *mount_arg_label) { - /* cannot change labels on filesystems */ + /* Cannot change labels on filesystems. */ if (mount_arg_label) { struct mount_security_struct *mla = SLOT(mntlabel); struct mount_security_struct *mlb = SLOT(mount_arg_label); if (mla->sid != mlb->sid) - return EINVAL; + return (EINVAL); } return (mount_has_perm(cred, mp, FILESYSTEM__REMOUNT, NULL)); } @@ -1360,22 +1331,21 @@ rc = avc_has_perm_ref(task->sid, file->sid, file->sclass, FIFO_FILE__RELABELFROM, &file->avcr); - if (rc) return (rc); rc = avc_has_perm(task->sid, newfile->sid, file->sclass, FIFO_FILE__RELABELTO, NULL, NULL); - /* - * TBD: SELinux also checks filesystem associate permission: - return avc_has_perm_audit(newsid, +#if 0 + /* TBD: SELinux also checks filesystem associate permission: */ + return (avc_has_perm_audit(newsid, sbsec->sid, SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, - &ad); - */ - return(rc); + &ad)); +#endif + return (rc); } static int @@ -1512,13 +1482,12 @@ * So just make the transition. */ ntask->osid = otask->sid; - if (execlabel == NULL) { + if (execlabel == NULL) (void)security_transition_sid(otask->sid, file->sid, - SECCLASS_PROCESS, &ntask->sid); - } else { + SECCLASS_PROCESS, &ntask->sid); + else ntask->sid = ((struct task_security_struct *) SLOT(execlabel))->sid; - } if (otask->sid != ntask->sid) { /* @@ -1527,8 +1496,6 @@ * permission check if the parent was waiting. */ } - - return; } static int @@ -1550,24 +1517,12 @@ * Should have already checked all the permissions, so just see if * the SIDS are going to match. */ - if (execlabel == NULL) { + if (execlabel == NULL) (void)security_transition_sid(task->sid, file->sid, - SECCLASS_PROCESS, &newsid); -#if 0 - int len; - char *ts, *ns, *fs; - security_sid_to_context (task->sid, &ts, &len); - security_sid_to_context (file->sid, &fs, &len); - security_sid_to_context (newsid, &ns, &len); - printf ("transition: %s %s -> %s\n", ts, fs, ns); - security_free_context (ts); - security_free_context (fs); - security_free_context (ns); -#endif - } else { + SECCLASS_PROCESS, &newsid); + else newsid = ((struct task_security_struct *) SLOT(execlabel))->sid; - } return (newsid != task->sid); } @@ -1639,6 +1594,7 @@ source = SLOT(newlabel); dest = SLOT(pipelabel); + /* XXXRW: Should be KASSERT's? */ if (!source) { printf("sebsd_relabel_pipe:: source is NULL!\n"); return; @@ -1661,6 +1617,7 @@ source = SLOT(label); dest = SLOT(vnodelabel); + /* XXXRW: Should be KASSERT's? */ if (!source) { printf("sebsd_relabel_vnode:: source is NULL!\n"); return; @@ -1684,15 +1641,12 @@ newlabel = SLOT(intlabel); - error = security_sid_to_context(newlabel->sid, &context, - &context_len); + error = security_sid_to_context(newlabel->sid, &context, &context_len); if (error) return (error); - error = vn_extattr_set(vp, IO_NODELOCKED, - SEBSD_MAC_EXTATTR_NAMESPACE, - SEBSD_MAC_EXTATTR_NAME, - context_len, context, current_proc()); + error = vn_extattr_set(vp, IO_NODELOCKED, SEBSD_MAC_EXTATTR_NAMESPACE, + SEBSD_MAC_EXTATTR_NAME, context_len, context, current_proc()); security_free_context(context); return (error); } @@ -1704,10 +1658,10 @@ /* existence check (F_OK) */ if (acc_mode == 0) - return 0; + return (0); - return (vnode_has_perm(cred, vp, file_mask_to_av(vp->v_type, acc_mode), - NULL)); + return (vnode_has_perm(cred, vp, + file_mask_to_av(vp->v_type, acc_mode), NULL)); } static int @@ -1716,7 +1670,7 @@ { /* MAY_EXEC ~= DIR__SEARCH */ - return vnode_has_perm(cred, dvp, DIR__SEARCH, NULL); + return (vnode_has_perm(cred, dvp, DIR__SEARCH, NULL)); } static int @@ -1726,7 +1680,7 @@ /* TBD: Incomplete, SELinux also check capability(CAP_SYS_CHROOT)) */ /* MAY_EXEC ~= DIR__SEARCH */ - return vnode_has_perm(cred, dvp, DIR__SEARCH, NULL); + return (vnode_has_perm(cred, dvp, DIR__SEARCH, NULL)); } static int @@ -1750,34 +1704,36 @@ ad.u.fs.vp = dvp; rc = avc_has_perm_ref_audit(task->sid, dir->sid, SECCLASS_DIR, - DIR__ADD_NAME | DIR__SEARCH, - &dir->avcr, &ad); + DIR__ADD_NAME | DIR__SEARCH, &dir->avcr, &ad); if (rc) - return rc; + return (rc); rc = security_transition_sid(task->sid, dir->sid, tclass, &newsid); if (rc) - return rc; + return (rc); rc = avc_has_perm_audit(task->sid, newsid, tclass, FILE__CREATE, &ad); if (rc) - return rc; + return (rc); if (dvp->v_mount) { - /* XXX: mpo_check_vnode_create should probably pass the mntlabel */ + /* + * XXX: mpo_check_vnode_create should probably pass the + * mntlabel + */ sbsec = SLOT(dvp->v_mount->mnt_mntlabel); if (sbsec == NULL) { printf ("create_vnode: no mount label for mnt=%s\n", dvp->v_mount->mnt_stat.f_mntonname); - return 0; + return (0); } - rc = avc_has_perm_audit(newsid, sbsec->sid, SECCLASS_FILESYSTEM, - FILESYSTEM__ASSOCIATE, &ad); + rc = avc_has_perm_audit(newsid, sbsec->sid, + SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, &ad); if (rc) - return rc; + return (rc); } - return 0; + return (0); } static int @@ -1800,7 +1756,6 @@ rc = avc_has_perm_ref_audit(task->sid, dir->sid, SECCLASS_DIR, DIR__SEARCH | DIR__REMOVE_NAME, &dir->avcr, &ad); - if (rc) return (rc); @@ -1853,11 +1808,10 @@ rc = security_transition_sid(task->sid, file->sid, SECCLASS_PROCESS, &newsid); if (rc) - return EACCES; - } else { + return (EACCES); + } else newsid = ((struct task_security_struct *) SLOT(execlabel))->sid; - } AVC_AUDIT_DATA_INIT(&ad, FS); ad.u.fs.vp = vp; @@ -1865,23 +1819,20 @@ if (newsid == task->sid) { rc = avc_has_perm_audit(task->sid, file->sid, SECCLASS_FILE, FILE__EXECUTE_NO_TRANS, &ad); - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Apr 19 22:05:01 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C23916A436 for ; Wed, 19 Apr 2006 22:05:01 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1143543D5E for ; Wed, 19 Apr 2006 22:04:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CFE0146CED for ; Wed, 19 Apr 2006 18:04:31 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 020116423C; Wed, 19 Apr 2006 22:04:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EC37416A43A; Wed, 19 Apr 2006 22:04:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 99E4A16A435 for ; Wed, 19 Apr 2006 22:04:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F8A043D82 for ; Wed, 19 Apr 2006 22:04:02 +0000 (GMT) (envelope-from millert@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 k3JM42Za077251 for ; Wed, 19 Apr 2006 22:04:02 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3JM42PS077248 for perforce@freebsd.org; Wed, 19 Apr 2006 22:04:02 GMT (envelope-from millert@freebsd.org) Date: Wed, 19 Apr 2006 22:04:02 GMT Message-Id: <200604192204.k3JM42PS077248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95632 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2006 22:05:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=95632 Change 95632 by millert@millert_g5tower on 2006/04/19 22:03:34 Make sedarwin vs. selinux diffs smaller. Get rid of flask_types.h and make sure the userland sebsd.h gets used where appropriate. Remove KERNEL/_KERNEL #ifdefs now that userland and kernel code is separate. Remove most APPLE and FreeBSD #ifdefs--they are not really useful. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_inherit.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc-selinux.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#10 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc_ss.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask.h#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/mkaccess_vector.sh#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/mkflask.sh#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#38 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_labels.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/conditional.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/constraint.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/ebitmap.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/ebitmap.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/global.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/hashtab.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/init.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#10 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mls.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mls_types.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/policydb.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/policydb.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/queue.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/security.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/sidtab.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/sidtab.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/symtab.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_inherit.h#3 (text+ko) ==== @@ -3,9 +3,9 @@ typedef struct { - security_class_t tclass; + u16 tclass; char **common_pts; - access_vector_t common_base; + u32 common_base; } av_inherit_t; static av_inherit_t av_inherit[] = { ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#8 (text+ko) ==== @@ -3,8 +3,8 @@ typedef struct { - security_class_t tclass; - access_vector_t value; + u16 tclass; + u32 value; char *name; } av_perm_to_string_t; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc-selinux.c#2 (text+ko) ==== @@ -1,56 +1,219 @@ - -/* -*- linux-c -*- */ - /* - * Author: Stephen Smalley, NAI Labs, + * Implementation of the kernel access vector cache (AVC). + * + * Authors: Stephen Smalley, + * James Morris + * + * Copyright (C) 2003 Red Hat, Inc., James Morris * - * The access vector cache was originally written while I was employed by NSA, - * and has undergone some revisions since I joined NAI Labs, but is largely - * unchanged. - */ - -/* - * Implementation of the kernel access vector cache (AVC). + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. */ - #include -#include -#include -#include -#include -#include -#include #include #include #include #include #include +#include #include #include #include #include #include -#include -#include -#include "selinux_plug.h" +#include +#include +#include +#include "avc.h" +#include "avc_ss.h" +#ifdef CONFIG_AUDIT +#include "class_to_string.h" +#endif +#include "common_perm_to_string.h" +#include "av_inherit.h" +#include "av_perm_to_string.h" +#include "objsec.h" + +#define AVC_CACHE_SLOTS 512 +#define AVC_CACHE_MAXNODES 410 + +struct avc_entry { + u32 ssid; + u32 tsid; + u16 tclass; + struct av_decision avd; + int used; /* used recently */ +}; + +struct avc_node { + struct avc_entry ae; + struct avc_node *next; +}; + +struct avc_cache { + struct avc_node *slots[AVC_CACHE_SLOTS]; + u32 lru_hint; /* LRU hint for reclaim scan */ + u32 active_nodes; + u32 latest_notif; /* latest revocation notification */ +}; + +struct avc_callback_node { + int (*callback) (u32 event, u32 ssid, u32 tsid, + u16 tclass, u32 perms, + u32 *out_retained); + u32 events; + u32 ssid; + u32 tsid; + u16 tclass; + u32 perms; + struct avc_callback_node *next; +}; + +static spinlock_t avc_lock = SPIN_LOCK_UNLOCKED; +static struct avc_node *avc_node_freelist; +static struct avc_cache avc_cache; +static unsigned avc_cache_stats[AVC_NSTATS]; +static struct avc_callback_node *avc_callbacks; + +static inline int avc_hash(u32 ssid, u32 tsid, u16 tclass) +{ + return (ssid ^ (tsid<<2) ^ (tclass<<4)) & (AVC_CACHE_SLOTS - 1); +} + +#ifdef AVC_CACHE_STATS +static inline void avc_cache_stats_incr(int type) +{ + avc_cache_stats[type]++; +} + +static inline void avc_cache_stats_add(int type, unsigned val) +{ + avc_cache_stats[type] += val; +} +#else +static inline void avc_cache_stats_incr(int type) +{ } -#ifdef CONFIG_SECURITY_SELINUX_DEVELOP -int avc_debug_always_allow = 1; +static inline void avc_cache_stats_add(int type, unsigned val) +{ } #endif -spinlock_t avc_lock = SPIN_LOCK_UNLOCKED; +/** + * avc_dump_av - Display an access vector in human-readable form. + * @tclass: target security class + * @av: access vector + */ +void avc_dump_av(struct audit_buffer *ab, u16 tclass, u32 av) +{ + char **common_pts = NULL; + u32 common_base = 0; + int i, i2, perm; + + if (av == 0) { + audit_log_format(ab, " null"); + return; + } + + for (i = 0; i < ARRAY_SIZE(av_inherit); i++) { + if (av_inherit[i].tclass == tclass) { + common_pts = av_inherit[i].common_pts; + common_base = av_inherit[i].common_base; + break; + } + } + + audit_log_format(ab, " {"); + i = 0; + perm = 1; + while (perm < common_base) { + if (perm & av) + audit_log_format(ab, " %s", common_pts[i]); + i++; + perm <<= 1; + } + + while (i < sizeof(av) * 8) { + if (perm & av) { + for (i2 = 0; i2 < ARRAY_SIZE(av_perm_to_string); i2++) { + if ((av_perm_to_string[i2].tclass == tclass) && + (av_perm_to_string[i2].value == perm)) + break; + } + if (i2 < ARRAY_SIZE(av_perm_to_string)) + audit_log_format(ab, " %s", + av_perm_to_string[i2].name); + } + i++; + perm <<= 1; + } + + audit_log_format(ab, " }"); +} + +/** + * avc_dump_query - Display a SID pair and a class in human-readable form. + * @ssid: source security identifier + * @tsid: target security identifier + * @tclass: target security class + */ +void avc_dump_query(struct audit_buffer *ab, u32 ssid, u32 tsid, u16 tclass) +{ + int rc; + char *scontext; + u32 scontext_len; + + rc = security_sid_to_context(ssid, &scontext, &scontext_len); + if (rc) + audit_log_format(ab, "ssid=%d", ssid); + else { + audit_log_format(ab, "scontext=%s", scontext); + kfree(scontext); + } + + rc = security_sid_to_context(tsid, &scontext, &scontext_len); + if (rc) + audit_log_format(ab, " tsid=%d", tsid); + else { + audit_log_format(ab, " tcontext=%s", scontext); + kfree(scontext); + } + audit_log_format(ab, " tclass=%s", class_to_string[tclass]); +} -unsigned avc_cache_stats[AVC_NSTATS]; +/** + * avc_init - Initialize the AVC. + * + * Initialize the access vector cache. + */ +void __init avc_init(void) +{ + struct avc_node *new; + int i; + for (i = 0; i < AVC_CACHE_MAXNODES; i++) { + new = kmalloc(sizeof(*new), GFP_ATOMIC); + if (!new) { + printk(KERN_WARNING "avc: only able to allocate " + "%d entries\n", i); + break; + } + memset(new, 0, sizeof(*new)); + new->next = avc_node_freelist; + avc_node_freelist = new; + } + audit_log(current->audit_context, "AVC INITIALIZED\n"); +} #if 0 static void avc_hash_eval(char *tag) { - int i, chain_len, max_chain_len, slots_used; - avc_node_t *node; + int i, chain_len, max_chain_len, slots_used; + struct avc_node *node; + unsigned long flags; - spin_lock(&avc_lock); + spin_lock_irqsave(&avc_lock,flags); slots_used = 0; max_chain_len = 0; @@ -68,346 +231,838 @@ } } - spin_unlock(&avc_lock); + spin_unlock_irqrestore(&avc_lock,flags); - printk("\n%s avc: %d entries and %d/%d buckets used, longest chain length %d\n", - tag, avc_cache.activeNodes, slots_used, AVC_CACHE_SLOTS, max_chain_len); + printk(KERN_INFO "\n"); + printk(KERN_INFO "%s avc: %d entries and %d/%d buckets used, longest " + "chain length %d\n", tag, avc_cache.active_nodes, slots_used, + AVC_CACHE_SLOTS, max_chain_len); } #else -#define avc_hash_eval(t) +static inline void avc_hash_eval(char *tag) +{ } #endif +static inline struct avc_node *avc_reclaim_node(void) +{ + struct avc_node *prev, *cur; + int hvalue, try; + hvalue = avc_cache.lru_hint; + for (try = 0; try < 2; try++) { + do { + prev = NULL; + cur = avc_cache.slots[hvalue]; + while (cur) { + if (!cur->ae.used) + goto found; + cur->ae.used = 0; -#define print_ipv4_addr(_addr,_port,_name1,_name2) { \ - if ((_addr)) \ - printk(" %s=%d.%d.%d.%d", (_name1), \ - NIPQUAD((_addr))); \ - if ((_port)) \ - printk(" %s=%d", (_name2), ntohs((_port))); \ + prev = cur; + cur = cur->next; + } + hvalue = (hvalue + 1) & (AVC_CACHE_SLOTS - 1); + } while (hvalue != avc_cache.lru_hint); } + panic("avc_reclaim_node"); + +found: + avc_cache.lru_hint = hvalue; + + if (prev == NULL) + avc_cache.slots[hvalue] = cur->next; + else + prev->next = cur->next; + + return cur; +} -/* - * Copied from fs/dcache.c:d_path and hacked up to - * avoid need for vfsmnt, root, and rootmnt parameters. - */ -char * avc_d_path(struct dentry *dentry, - char *buffer, int buflen) +static inline struct avc_node *avc_claim_node(u32 ssid, + u32 tsid, u16 tclass) { - char * end = buffer+buflen; - char * retval; - int namelen; + struct avc_node *new; + int hvalue; - *--end = '\0'; - buflen--; - if (!IS_ROOT(dentry) && list_empty(&dentry->d_hash)) { - buflen -= 10; - end -= 10; - memcpy(end, " (deleted)", 10); + hvalue = avc_hash(ssid, tsid, tclass); + if (avc_node_freelist) { + new = avc_node_freelist; + avc_node_freelist = avc_node_freelist->next; + avc_cache.active_nodes++; + } else { + new = avc_reclaim_node(); + if (!new) + goto out; } - /* Get '/' right */ - retval = end-1; - *retval = '/'; + new->ae.used = 1; + new->ae.ssid = ssid; + new->ae.tsid = tsid; + new->ae.tclass = tclass; + new->next = avc_cache.slots[hvalue]; + avc_cache.slots[hvalue] = new; + +out: + return new; +} - for (;;) { - struct dentry * parent; +static inline struct avc_node *avc_search_node(u32 ssid, u32 tsid, + u16 tclass, int *probes) +{ + struct avc_node *cur; + int hvalue; + int tprobes = 1; - if (IS_ROOT(dentry)) { - goto global_root; - } - parent = dentry->d_parent; - namelen = dentry->d_name.len; - if (!namelen) - goto skip; - buflen -= namelen + 1; - if (buflen < 0) - break; - end -= namelen; - memcpy(end, dentry->d_name.name, namelen); - *--end = '/'; - retval = end; -skip: - dentry = parent; - if (!dentry) - break; + hvalue = avc_hash(ssid, tsid, tclass); + cur = avc_cache.slots[hvalue]; + while (cur != NULL && + (ssid != cur->ae.ssid || + tclass != cur->ae.tclass || + tsid != cur->ae.tsid)) { + tprobes++; + cur = cur->next; } - return retval; -global_root: - namelen = dentry->d_name.len; - buflen -= namelen; - if (buflen >= 0) { - retval -= namelen-1; /* hit the slash */ - memcpy(retval, dentry->d_name.name, namelen); + + if (cur == NULL) { + /* cache miss */ + goto out; } - return retval; + + /* cache hit */ + if (probes) + *probes = tprobes; + + cur->ae.used = 1; + +out: + return cur; } -/* - * Copied from net/core/utils.c:net_ratelimit and modified for - * use by the AVC audit facility. +/** + * avc_lookup - Look up an AVC entry. + * @ssid: source security identifier + * @tsid: target security identifier + * @tclass: target security class + * @requested: requested permissions, interpreted based on @tclass + * @aeref: AVC entry reference + * + * Look up an AVC entry that is valid for the + * @requested permissions between the SID pair + * (@ssid, @tsid), interpreting the permissions + * based on @tclass. If a valid AVC entry exists, + * then this function updates @aeref to refer to the + * entry and returns %0. Otherwise, this function + * returns -%ENOENT. */ +int avc_lookup(u32 ssid, u32 tsid, u16 tclass, + u32 requested, struct avc_entry_ref *aeref) +{ + struct avc_node *node; + int probes, rc = 0; -int avc_msg_cost = 5*HZ; -int avc_msg_burst = 10*5*HZ; + avc_cache_stats_incr(AVC_CAV_LOOKUPS); + node = avc_search_node(ssid, tsid, tclass,&probes); + + if (node && ((node->ae.avd.decided & requested) == requested)) { + avc_cache_stats_incr(AVC_CAV_HITS); + avc_cache_stats_add(AVC_CAV_PROBES,probes); + aeref->ae = &node->ae; + goto out; + } + + avc_cache_stats_incr(AVC_CAV_MISSES); + rc = -ENOENT; +out: + return rc; +} -/* - * This enforces a rate limit: not more than one kernel message - * every 5secs to make a denial-of-service attack impossible. - */ -int avc_ratelimit(void) +/** + * avc_insert - Insert an AVC entry. + * @ssid: source security identifier + * @tsid: target security identifier + * @tclass: target security class + * @ae: AVC entry + * @aeref: AVC entry reference + * + * Insert an AVC entry for the SID pair + * (@ssid, @tsid) and class @tclass. + * The access vectors and the sequence number are + * normally provided by the security server in + * response to a security_compute_av() call. If the + * sequence number @ae->avd.seqno is not less than the latest + * revocation notification, then the function copies + * the access vectors into a cache entry, updates + * @aeref to refer to the entry, and returns %0. + * Otherwise, this function returns -%EAGAIN. + */ +int avc_insert(u32 ssid, u32 tsid, u16 tclass, + struct avc_entry *ae, struct avc_entry_ref *aeref) { - static spinlock_t ratelimit_lock = SPIN_LOCK_UNLOCKED; - static unsigned long toks = 10*5*HZ; - static unsigned long last_msg; - static int missed; - unsigned long flags; - unsigned long now = jiffies; + struct avc_node *node; + int rc = 0; - spin_lock_irqsave(&ratelimit_lock, flags); - toks += now - last_msg; - last_msg = now; - if (toks > avc_msg_burst) - toks = avc_msg_burst; - if (toks >= avc_msg_cost) { - int lost = missed; - missed = 0; - toks -= avc_msg_cost; - spin_unlock_irqrestore(&ratelimit_lock, flags); - if (lost) - printk(KERN_WARNING "AVC: %d messages suppressed.\n", lost); - return 1; + if (ae->avd.seqno < avc_cache.latest_notif) { + printk(KERN_WARNING "avc: seqno %d < latest_notif %d\n", + ae->avd.seqno, avc_cache.latest_notif); + rc = -EAGAIN; + goto out; } - missed++; - spin_unlock_irqrestore(&ratelimit_lock, flags); - return 0; -} + node = avc_claim_node(ssid, tsid, tclass); + if (!node) { + rc = -ENOMEM; + goto out; + } -#ifdef CONFIG_SECURITY_SELINUX_DEVELOP + node->ae.avd.allowed = ae->avd.allowed; + node->ae.avd.decided = ae->avd.decided; + node->ae.avd.auditallow = ae->avd.auditallow; + node->ae.avd.auditdeny = ae->avd.auditdeny; + node->ae.avd.seqno = ae->avd.seqno; + aeref->ae = &node->ae; +out: + return rc; +} -static inline int check_avc_ratelimit(void) +static inline void avc_print_ipv6_addr(struct audit_buffer *ab, + struct in6_addr *addr, u16 port, + char *name1, char *name2) { - if (avc_debug_always_allow) - /* If permissive, then never suppress messages. */ - return 1; - else - return avc_ratelimit(); + if (!ipv6_addr_any(addr)) + audit_log_format(ab, " %s=%04x:%04x:%04x:%04x:%04x:" + "%04x:%04x:%04x", name1, NIP6(*addr)); + if (port) + audit_log_format(ab, " %s=%d", name2, ntohs(port)); } -#else - -static inline int check_avc_ratelimit(void) +static inline void avc_print_ipv4_addr(struct audit_buffer *ab, u32 addr, + u16 port, char *name1, char *name2) { - return avc_ratelimit(); + if (addr) + audit_log_format(ab, " %s=%d.%d.%d.%d", name1, NIPQUAD(addr)); + if (port) + audit_log_format(ab, " %s=%d", name2, ntohs(port)); } -#endif - - - -/* - * Audit the granting or denial of permissions. +/** + * avc_audit - Audit the granting or denial of permissions. + * @ssid: source security identifier + * @tsid: target security identifier + * @tclass: target security class + * @requested: requested permissions + * @avd: access vector decisions + * @result: result from avc_has_perm_noaudit + * @a: auxiliary audit data + * + * Audit the granting or denial of permissions in accordance + * with the policy. This function is typically called by + * avc_has_perm() after a permission check, but can also be + * called directly by callers who use avc_has_perm_noaudit() + * in order to separate the permission check from the auditing. + * For example, this separation is useful when the permission check must + * be performed under a lock, to allow the lock to be released + * before calling the auditing code. */ -void avc_audit( - security_id_t ssid, /* IN */ - security_id_t tsid, /* IN */ - security_class_t tclass, /* IN */ - access_vector_t audited, /* IN */ - struct avc_entry *ae, /* IN */ - __u32 denied, /* IN */ - avc_audit_data_t *a) /* IN */ +void avc_audit(u32 ssid, u32 tsid, + u16 tclass, u32 requested, + struct av_decision *avd, int result, struct avc_audit_data *a) { - char *p; + struct task_struct *tsk = current; + struct inode *inode = NULL; + u32 denied, audited; + struct audit_buffer *ab; - if (!check_avc_ratelimit()) - return; + denied = requested & ~avd->allowed; + if (denied) { + audited = denied; + if (!(audited & avd->auditdeny)) + return; + } else if (result) { + audited = denied = requested; + } else { + audited = requested; + if (!(audited & avd->auditallow)) + return; + } - printk("\navc: %s ", denied ? "denied" : "granted"); - avc_dump_av(tclass,audited); - printk(" for "); - if (current && current->pid) { - printk(" pid=%d", current->pid); - if (current->mm) { - struct vm_area_struct *vma = current->mm->mmap; - - while (vma) { - if ((vma->vm_flags & VM_EXECUTABLE) && - vma->vm_file) { - p = d_path(vma->vm_file->f_dentry, - vma->vm_file->f_vfsmnt, - avc_audit_buffer, - PAGE_SIZE); - printk(" exe=%s", p); - break; + ab = audit_log_start(current->audit_context); + if (!ab) + return; /* audit_panic has been called */ + audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted"); + avc_dump_av(ab, tclass,audited); + audit_log_format(ab, " for "); + if (a && a->tsk) + tsk = a->tsk; + if (tsk && tsk->pid) { + struct mm_struct *mm; + struct vm_area_struct *vma; + audit_log_format(ab, " pid=%d", tsk->pid); + if (tsk == current) + mm = current->mm; + else + mm = get_task_mm(tsk); + if (mm) { + if (down_read_trylock(&mm->mmap_sem)) { + vma = mm->mmap; + while (vma) { + if ((vma->vm_flags & VM_EXECUTABLE) && + vma->vm_file) { + audit_log_d_path(ab, "exe=", + vma->vm_file->f_dentry, + vma->vm_file->f_vfsmnt); + break; + } + vma = vma->vm_next; } - vma = vma->vm_next; + up_read(&mm->mmap_sem); } + if (tsk != current) + mmput(mm); + } else { + audit_log_format(ab, " comm=%s", tsk->comm); } } if (a) { switch (a->type) { case AVC_AUDIT_DATA_IPC: - printk(" IPCID=%d", a->u.ipc_id); + audit_log_format(ab, " key=%d", a->u.ipc_id); break; case AVC_AUDIT_DATA_CAP: - printk(" capability=%d", a->u.cap); + audit_log_format(ab, " capability=%d", a->u.cap); break; case AVC_AUDIT_DATA_FS: if (a->u.fs.dentry) { - struct inode *inode = a->u.fs.dentry->d_inode; - - p = avc_d_path(a->u.fs.dentry, - avc_audit_buffer, - PAGE_SIZE); - if (p) - printk(" path=%s", p); - - if (inode) { - printk(" dev=%s ino=%ld", - kdevname(inode->i_dev), - inode->i_ino); + struct dentry *dentry = a->u.fs.dentry; + if (a->u.fs.mnt) { + audit_log_d_path(ab, "path=", dentry, + a->u.fs.mnt); + } else { + audit_log_format(ab, " name=%s", + dentry->d_name.name); } - } - - if (a->u.fs.inode) { - struct inode *inode = a->u.fs.inode; - struct dentry *dentry = d_find_alias(inode); - + inode = dentry->d_inode; + } else if (a->u.fs.inode) { + struct dentry *dentry; + inode = a->u.fs.inode; + dentry = d_find_alias(inode); if (dentry) { - p = avc_d_path(dentry, - avc_audit_buffer, - PAGE_SIZE); - if (p) - printk(" path=%s", p); + audit_log_format(ab, " name=%s", + dentry->d_name.name); dput(dentry); } - - printk(" dev=%s ino=%ld", - kdevname(inode->i_dev),inode->i_ino); } + if (inode) + audit_log_format(ab, " dev=%s ino=%ld", + inode->i_sb->s_id, + inode->i_ino); break; case AVC_AUDIT_DATA_NET: if (a->u.net.sk) { struct sock *sk = a->u.net.sk; + struct unix_sock *u; + int len = 0; + char *p = NULL; + + switch (sk->sk_family) { + case AF_INET: { + struct inet_opt *inet = inet_sk(sk); + + avc_print_ipv4_addr(ab, inet->rcv_saddr, + inet->sport, + "laddr", "lport"); + avc_print_ipv4_addr(ab, inet->daddr, + inet->dport, + "faddr", "fport"); + break; + } + case AF_INET6: { + struct inet_opt *inet = inet_sk(sk); + struct ipv6_pinfo *inet6 = inet6_sk(sk); - switch (sk->family) { - case AF_INET: - print_ipv4_addr(sk->rcv_saddr, - sk->sport, - "laddr", "lport"); - print_ipv4_addr(sk->daddr, - sk->dport, - "faddr", "fport"); + avc_print_ipv6_addr(ab, &inet6->rcv_saddr, + inet->sport, + "laddr", "lport"); + avc_print_ipv6_addr(ab, &inet6->daddr, + inet->dport, + "faddr", "fport"); break; - case AF_UNIX: - if (sk->protinfo.af_unix.dentry) { - p = d_path(sk->protinfo.af_unix.dentry, - sk->protinfo.af_unix.mnt, - avc_audit_buffer, - PAGE_SIZE); - printk(" path=%s", p); - } else if (sk->protinfo.af_unix.addr) { - p = avc_audit_buffer; - memcpy(p, - sk->protinfo.af_unix.addr->name->sun_path, - sk->protinfo.af_unix.addr->len-sizeof(short)); - if (*p == 0) { - *p = '@'; - p += sk->protinfo.af_unix.addr->len-sizeof(short); - *p = 0; - } - printk(" path=%s", - avc_audit_buffer); + } + case AF_UNIX: + u = unix_sk(sk); + if (u->dentry) { + audit_log_d_path(ab, "path=", + u->dentry, u->mnt); + break; } + if (!u->addr) + break; + len = u->addr->len-sizeof(short); + p = &u->addr->name->sun_path[0]; + if (*p) + audit_log_format(ab, + "path=%*.*s", len, + len, p); + else + audit_log_format(ab, + "path=@%*.*s", len-1, + len-1, p+1); break; } } - if (a->u.net.daddr) { - printk(" daddr=%d.%d.%d.%d", - NIPQUAD(a->u.net.daddr)); - if (a->u.net.port) - printk(" dest=%d", ntohs(a->u.net.port)); - } else if (a->u.net.port) - printk(" port=%d", ntohs(a->u.net.port)); - if (a->u.net.skb) { - struct sk_buff *skb = a->u.net.skb; + + switch (a->u.net.family) { + case AF_INET: + avc_print_ipv4_addr(ab, a->u.net.v4info.saddr, + a->u.net.sport, + "saddr", "src"); + avc_print_ipv4_addr(ab, a->u.net.v4info.daddr, + a->u.net.dport, + "daddr", "dest"); + break; + case AF_INET6: + avc_print_ipv6_addr(ab, &a->u.net.v6info.saddr, + a->u.net.sport, + "saddr", "src"); + avc_print_ipv6_addr(ab, &a->u.net.v6info.daddr, + a->u.net.dport, + "daddr", "dest"); + break; + } + if (a->u.net.netif) + audit_log_format(ab, " netif=%s", + a->u.net.netif); + break; + } + } + audit_log_format(ab, " "); + avc_dump_query(ab, ssid, tsid, tclass); + audit_log_end(ab); +} + +/** + * avc_add_callback - Register a callback for security events. + * @callback: callback function + * @events: security events + * @ssid: source security identifier or %SECSID_WILD + * @tsid: target security identifier or %SECSID_WILD + * @tclass: target security class + * @perms: permissions + * + * Register a callback function for events in the set @events + * related to the SID pair (@ssid, @tsid) and + * and the permissions @perms, interpreting + * @perms based on @tclass. Returns %0 on success or + * -%ENOMEM if insufficient memory exists to add the callback. + */ +int avc_add_callback(int (*callback)(u32 event, u32 ssid, u32 tsid, + u16 tclass, u32 perms, + u32 *out_retained), + u32 events, u32 ssid, u32 tsid, + u16 tclass, u32 perms) +{ + struct avc_callback_node *c; + int rc = 0; + + c = kmalloc(sizeof(*c), GFP_ATOMIC); + if (!c) { + rc = -ENOMEM; + goto out; + } + + c->callback = callback; + c->events = events; + c->ssid = ssid; + c->tsid = tsid; + c->perms = perms; + c->next = avc_callbacks; + avc_callbacks = c; +out: + return rc; +} - if (skb->nh.iph) { - __u16 source = 0, dest = 0; - __u8 protocol = skb->nh.iph->protocol; +static inline int avc_sidcmp(u32 x, u32 y) +{ + return (x == y || x == SECSID_WILD || y == SECSID_WILD); +} +static inline void avc_update_node(u32 event, struct avc_node *node, u32 perms) +{ + switch (event) { + case AVC_CALLBACK_GRANT: + node->ae.avd.allowed |= perms; + break; + case AVC_CALLBACK_TRY_REVOKE: + case AVC_CALLBACK_REVOKE: + node->ae.avd.allowed &= ~perms; + break; + case AVC_CALLBACK_AUDITALLOW_ENABLE: + node->ae.avd.auditallow |= perms; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Apr 19 22:07:15 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09CE316A449 for ; Wed, 19 Apr 2006 22:07:15 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3955343D67 for ; Wed, 19 Apr 2006 22:07:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B610246C83 for ; Wed, 19 Apr 2006 18:07:09 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2C48F64516; Wed, 19 Apr 2006 22:07:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 22F2716A435; Wed, 19 Apr 2006 22:07:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCB7316A430 for ; Wed, 19 Apr 2006 22:07:08 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D516943D67 for ; Wed, 19 Apr 2006 22:07:06 +0000 (GMT) (envelope-from millert@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 k3JM76FD077581 for ; Wed, 19 Apr 2006 22:07:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3JM76X5077578 for perforce@freebsd.org; Wed, 19 Apr 2006 22:07:06 GMT (envelope-from millert@freebsd.org) Date: Wed, 19 Apr 2006 22:07:06 GMT Message-Id: <200604192207.k3JM76X5077578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95633 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2006 22:07:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=95633 Change 95633 by millert@millert_g5tower on 2006/04/19 22:06:11 Fix editor goof in previous checkin. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#11 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#11 (text+ko) ==== @@ -185,7 +185,7 @@ printk(" tcontext=%s", scontext); kfree(scontext); } - printk(" tclass=%s", class_to_string(tclass)); + printk(" tclass=%s", security_class_to_string(tclass)); } /** From owner-trustedbsd-cvs@FreeBSD.ORG Wed Apr 19 22:08:12 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4559216A400 for ; Wed, 19 Apr 2006 22:08:12 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AE4743D48 for ; Wed, 19 Apr 2006 22:08:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CD13646C15 for ; Wed, 19 Apr 2006 18:08:09 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 465125C6E4; Wed, 19 Apr 2006 22:08:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D03816A427; Wed, 19 Apr 2006 22:08:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18F5616A425 for ; Wed, 19 Apr 2006 22:08:09 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A41C843D60 for ; Wed, 19 Apr 2006 22:08:08 +0000 (GMT) (envelope-from millert@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 k3JM88B7077607 for ; Wed, 19 Apr 2006 22:08:08 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3JM880R077604 for perforce@freebsd.org; Wed, 19 Apr 2006 22:08:08 GMT (envelope-from millert@freebsd.org) Date: Wed, 19 Apr 2006 22:08:08 GMT Message-Id: <200604192208.k3JM880R077604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95634 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2006 22:08:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=95634 Change 95634 by millert@millert_g5tower on 2006/04/19 22:07:58 Fix botched proc_has_security() conversion Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#10 (text+ko) ==== @@ -63,7 +63,7 @@ void *kdata; int rc; - rc = proc_has_security(td->p_ucred, SECURITY__LOAD_POLICY); + rc = proc_has_security(td, SECURITY__LOAD_POLICY); if (rc) return (rc); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 14:20:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C1B016A401 for ; Thu, 20 Apr 2006 14:20:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFC6A43D45 for ; Thu, 20 Apr 2006 14:20:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4125E46C73 for ; Thu, 20 Apr 2006 10:20:15 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5E87955532; Thu, 20 Apr 2006 14:20:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 565F716A406; Thu, 20 Apr 2006 14:20:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9EC7416A401 for ; Thu, 20 Apr 2006 14:20:13 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BB2543D4C for ; Thu, 20 Apr 2006 14:20:08 +0000 (GMT) (envelope-from millert@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 k3KEK8Hk048506 for ; Thu, 20 Apr 2006 14:20:08 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KEK7fB048490 for perforce@freebsd.org; Thu, 20 Apr 2006 14:20:07 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 14:20:07 GMT Message-Id: <200604201420.k3KEK7fB048490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95673 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 14:20:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=95673 Change 95673 by millert@millert_g5tower on 2006/04/20 14:19:32 Remove now-unused flask_types.h Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask_types.h#4 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 14:26:10 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7107E16A40D for ; Thu, 20 Apr 2006 14:26:10 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68DBA43D48 for ; Thu, 20 Apr 2006 14:26:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 25E9646CF8 for ; Thu, 20 Apr 2006 10:26:04 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 24AAA5741A; Thu, 20 Apr 2006 14:25:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E68116A403; Thu, 20 Apr 2006 14:25:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD15F16A401 for ; Thu, 20 Apr 2006 14:25:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CE9543D46 for ; Thu, 20 Apr 2006 14:25:52 +0000 (GMT) (envelope-from millert@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 k3KEPqrh051626 for ; Thu, 20 Apr 2006 14:25:52 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KEPqvF051623 for perforce@freebsd.org; Thu, 20 Apr 2006 14:25:52 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 14:25:52 GMT Message-Id: <200604201425.k3KEPqvF051623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95674 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 14:26:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=95674 Change 95674 by millert@millert_g5tower on 2006/04/20 14:24:53 Move sebsd_{malloc,free} into sebsd_alloc.c and convert all calls from malloc/free to sebsd_{malloc,free}. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#12 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#39 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_alloc.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#11 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#11 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/queue.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/security.h#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#6 (text+ko) ==== @@ -4,7 +4,7 @@ POLICY_DESC= "SEDarwin (SELinux compatible TE)" POLICY_NOMAN= yes -POLICY_SRCS= sebsd.c sebsd_syscall.c sebsd_sysctl.c +POLICY_SRCS= sebsd.c sebsd_alloc.c sebsd_syscall.c sebsd_sysctl.c POLICY_SRCS+= ss/avtab.c ss/ebitmap.c ss/hashtab.c ss/init.c ss/policydb.c \ ss/queue.c ss/services.c ss/sidtab.c ss/symtab.c ss/mach_av.c \ ss/conditional.c ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#12 (text+ko) ==== @@ -90,19 +90,19 @@ #define __init -extern void *sebsd_malloc(size_t size, int flags); -extern void sebsd_free(void *); +extern void *sebsd_malloc(size_t size, int type, int flags); +extern void sebsd_free(void *, int); /* BSD-style malloc/free emulation */ +#ifndef M_SEBSD #include -#define malloc(size, type, flags) sebsd_malloc(size, flags) -#define free(addr, type) sebsd_free(addr) #define M_SEBSD M_MACTEMP +#endif /* Linux-style kmalloc/kfree (note kfree namespace collision) */ -#define kmalloc(size, flags) sebsd_malloc(size, flags) -#define kfree(addr) sebsd_free(addr) -#define __get_free_page(flags) sebsd_malloc(PAGE_SIZE, flags) +#define kmalloc(size, flags) sebsd_malloc(size, M_SEBSD, flags) +#define kfree(addr) sebsd_free(addr, M_SEBSD) +#define __get_free_page(flags) sebsd_malloc(PAGE_SIZE, M_SEBSD, flags) #define GFP_ATOMIC M_WAITOK /* XXX - want M_NOWAIT but too early */ #define GFP_KERNEL M_WAITOK ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#39 (text+ko) ==== @@ -59,8 +59,16 @@ #include #include #include +#include +#include + +#include -#ifdef __APPLE__ +#include +#include +#include +#include + /* * The code is conditional upon the following list of defines. * At the moment, Darwin does not provide support for all of them: @@ -73,51 +81,8 @@ * HAS_STRINGS * HAS_ACLS */ - #define HAS_STRINGS -#include -#include -#include - -/* XXX - move sebsd_malloc/free */ -void * -sebsd_malloc(size_t size, int flags) -{ - size_t *vs, nsize; - - nsize = size + sizeof(size_t); - vs = (flags & M_NOWAIT) ? - (size_t *)kalloc_noblock(nsize) : (size_t *)kalloc(nsize); - if (vs != NULL) { - *vs++ = nsize; - if (flags & M_ZERO) - bzero(vs, size); - } - return (vs); -} - -void -sebsd_free(void *v) -{ - size_t *vs = v; - - if (vs != NULL) { - vs--; - kfree((vm_offset_t)vs, *vs); - } -} - -#include -#endif - -#include - -#include -#include -#include -#include - int sebsd_verbose = 0; static int slot = 1; /* TBD, dynamic */ @@ -395,7 +360,7 @@ { struct task_security_struct *new_tsec; - new_tsec = sebsd_malloc(sizeof(*new_tsec), M_ZERO | M_WAITOK); + new_tsec = sebsd_malloc(sizeof(*new_tsec), M_SEBSD, M_ZERO | M_WAITOK); new_tsec->osid = new_tsec->sid = SECINITSID_UNLABELED; SLOT(label) = new_tsec; } @@ -405,7 +370,7 @@ { struct file_security_struct *new_fsec; - new_fsec = sebsd_malloc(sizeof(*new_fsec), M_ZERO | M_WAITOK); + new_fsec = sebsd_malloc(sizeof(*new_fsec), M_SEBSD, M_ZERO | M_WAITOK); new_fsec->sid = new_fsec->sid = SECINITSID_UNLABELED; SLOT(label) = new_fsec; } @@ -415,7 +380,7 @@ { struct mount_security_struct *sbsec; - sbsec = sebsd_malloc(sizeof(*sbsec), M_ZERO | M_WAITOK); + sbsec = sebsd_malloc(sizeof(*sbsec), M_SEBSD, M_ZERO | M_WAITOK); sbsec->sid = SECINITSID_UNLABELED; SLOT(label) = sbsec; } @@ -425,7 +390,7 @@ { struct mount_fs_security_struct *sbsec; - sbsec = sebsd_malloc(sizeof(*sbsec), M_ZERO | M_WAITOK); + sbsec = sebsd_malloc(sizeof(*sbsec), M_SEBSD, M_ZERO | M_WAITOK); sbsec->sid = SECINITSID_UNLABELED; SLOT(label) = sbsec; } @@ -435,7 +400,7 @@ { struct network_security_struct *new; - new = sebsd_malloc(sizeof(*new), M_ZERO | M_WAITOK); + new = sebsd_malloc(sizeof(*new), M_SEBSD, M_ZERO | M_WAITOK); new->sid = new->task_sid = SECINITSID_UNLABELED; SLOT(label) = new; } @@ -445,7 +410,7 @@ { struct network_security_struct *new; - new = sebsd_malloc(sizeof(*new), M_ZERO | flag); + new = sebsd_malloc(sizeof(*new), M_SEBSD, M_ZERO | flag); if (new == NULL) { SLOT(label) = NULL; return (ENOMEM); @@ -462,7 +427,7 @@ { struct vnode_security_struct *vsec; - vsec = sebsd_malloc(sizeof(*vsec), M_ZERO | M_WAITOK); + vsec = sebsd_malloc(sizeof(*vsec), M_SEBSD, M_ZERO | M_WAITOK); vsec->sid = SECINITSID_UNLABELED; vsec->task_sid = SECINITSID_UNLABELED; SLOT(label) = vsec; @@ -473,7 +438,7 @@ { struct ipc_security_struct *new; - new = sebsd_malloc(sizeof(*new), M_ZERO | M_WAITOK); + new = sebsd_malloc(sizeof(*new), M_SEBSD, M_ZERO | M_WAITOK); new->sid = SECINITSID_UNLABELED; SLOT(label) = new; } @@ -483,7 +448,7 @@ { struct vnode_security_struct *vsec; - vsec = sebsd_malloc(sizeof(*vsec), M_ZERO | M_WAITOK); + vsec = sebsd_malloc(sizeof(*vsec), M_SEBSD, M_ZERO | M_WAITOK); vsec->sid = SECINITSID_UNLABELED; vsec->task_sid = SECINITSID_UNLABELED; SLOT(label) = vsec; @@ -493,7 +458,7 @@ sebsd_destroy_label(struct label *label) { - sebsd_free(SLOT(label)); + sebsd_free(SLOT(label), M_SEBSD); SLOT(label) = NULL; } @@ -793,7 +758,7 @@ dirent->sclass = devfs_type_to_security_class(devfs_dirent->dn_type); /* Obtain a SID based on the fstype, path, and class. */ - path = sebsd_malloc(strlen(fullpath) + 2, M_ZERO | M_WAITOK); + path = sebsd_malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); path[0] = '/'; strcpy(&path[1], fullpath); rc = security_genfs_sid("devfs", path, dirent->sclass, &newsid); @@ -822,7 +787,7 @@ "dirent=%d\n", path, rc, dirent->sclass, newsid, dirent->sid); } - sebsd_free(path); + sebsd_free(path, M_SEBSD); } #if 0 @@ -846,7 +811,7 @@ dirent->sclass = SECCLASS_DIR; /* Obtain a SID based on the fstype, path, and class. */ - path = sebsd_malloc(strlen(fullpath) + 2, M_ZERO | M_WAITOK); + path = sebsd_malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); path[0] = '/'; strcpy(&path[1], fullpath); rc = security_genfs_sid(mp->mnt_vfc->vfc_name, path, dirent->sclass, @@ -861,7 +826,7 @@ __func__, path, sbsec->sid, mp->mnt_stat.f_mntonname, rc, dirent->sclass, newsid, dirent->sid); } - sebsd_free(path); + sebsd_free(path, M_SEBSD); } static void @@ -888,7 +853,7 @@ lnksec->sclass = SECCLASS_LNK_FILE; /* Obtain a SID based on the fstype, path, and class. */ - path = sebsd_malloc(strlen(fullpath) + 2, M_ZERO | M_WAITOK); + path = sebsd_malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); path[0] = '/'; strcpy(&path[1], fullpath); rc = security_genfs_sid(mp->mnt_vfc->vfc_name, path, lnksec->sclass, @@ -902,7 +867,7 @@ sbsec->sid, mp->mnt_stat.f_mntonname, rc, lnksec->sclass, newsid, lnksec->sid); } - sebsd_free(path); + sebsd_free(path, M_SEBSD); } #endif /* HAS_DEVFS_DIRENT */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#8 (text+ko) ==== @@ -54,5 +54,11 @@ extern int sebsd_syscall(struct proc *p, int call, void *args, int *retv); extern int proc_has_system(struct proc *p, u32 perm); extern int proc_has_security(struct proc *p, u32 perm); +extern void *sebsd_malloc(size_t size, int type, int flags); +extern void sebsd_free(void *, int); + +#ifndef M_SEBSD +#define M_SEBSD M_MACTEMP +#endif #endif /* _SYS_SECURITY_SEBSD_H */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#11 (text+ko) ==== @@ -67,13 +67,13 @@ if (rc) return (rc); - kdata = malloc(len, M_SEBSD, M_WAITOK); + kdata = sebsd_malloc(len, M_SEBSD, M_WAITOK); rc = copyin(data, kdata, len); if (rc) return (rc); rc = security_load_policy(kdata, len); - free(kdata, M_SEBSD); + sebsd_free(kdata, M_SEBSD); return (rc); } @@ -88,13 +88,13 @@ if (rc) return (rc); - kdata = malloc(len, M_SEBSD, M_WAITOK); + kdata = sebsd_malloc(len, M_SEBSD, M_WAITOK); rc = copyin(data, kdata, len); if (rc) return (rc); rc = sebsd_load_migscs(kdata, len); - free(kdata, M_SEBSD); + sebsd_free(kdata, M_SEBSD); return (rc); } @@ -159,7 +159,7 @@ } error = copyout(&olen, outlen, sizeof(int)); out2: - sebsd_free(sids); + sebsd_free(sids, M_SEBSD); out: return (error); } @@ -236,12 +236,12 @@ int error; if (gb->out) - out = malloc(gb->len, M_SEBSD, M_WAITOK); + out = sebsd_malloc(gb->len, M_SEBSD, M_WAITOK); error = security_get_bool_string(&gb->len, out); if (out && error == 0) error = copyout(out, gb->out, gb->len); if (out) - free(out, M_SEBSD); + sebsd_free(out, M_SEBSD); return (error); } @@ -274,24 +274,24 @@ error = copyin(args, &uap, sizeof(struct getsid_args)); if (error) return (error); - ctx = sebsd_malloc(MAX_UC, M_WAITOK); + ctx = sebsd_malloc(MAX_UC, M_SEBSD, M_WAITOK); error = copyinstr(uap.ctx, ctx, MAX_UC, &dummy); if (error) { - sebsd_free(ctx); + sebsd_free(ctx, M_SEBSD); return (error); } - usr = sebsd_malloc(MAX_UC, M_WAITOK); + usr = sebsd_malloc(MAX_UC, M_SEBSD, M_WAITOK); error = copyinstr(uap.usr, usr, MAX_UC, &dummy); if (error) { - sebsd_free(ctx); - sebsd_free(usr); + sebsd_free(ctx, M_SEBSD); + sebsd_free(usr, M_SEBSD); return (error); } ctx[MAX_UC-1] = 0; usr[MAX_UC-1] = 0; error = sys_get_sids(call, ctx, usr, uap.out, uap.outlen); - sebsd_free(ctx); - sebsd_free(usr); + sebsd_free(ctx, M_SEBSD); + sebsd_free(usr, M_SEBSD); break; } @@ -304,31 +304,31 @@ error = copyin(args, &uap, sizeof(struct changesid_args)); if (error) return (error); - doms = sebsd_malloc(MAX_UC, M_WAITOK); + doms = sebsd_malloc(MAX_UC, M_SEBSD, M_WAITOK); error = copyinstr(uap.domain, doms, MAX_UC, &dummy); if (error) { - sebsd_free(doms); + sebsd_free(doms, M_SEBSD); return (error); } - srcs = sebsd_malloc(MAX_UC, M_WAITOK); + srcs = sebsd_malloc(MAX_UC, M_SEBSD, M_WAITOK); error = copyinstr(uap.source, srcs, MAX_UC, &dummy); if (error) { - sebsd_free(doms); - sebsd_free(srcs); + sebsd_free(doms, M_SEBSD); + sebsd_free(srcs, M_SEBSD); return (error); } - scs = sebsd_malloc(MAX_UC, M_WAITOK); + scs = sebsd_malloc(MAX_UC, M_SEBSD, M_WAITOK); error = copyinstr(uap.sclass, scs, MAX_UC, &dummy); if (error) { - sebsd_free(doms); - sebsd_free(srcs); - sebsd_free(scs); + sebsd_free(doms, M_SEBSD); + sebsd_free(srcs, M_SEBSD); + sebsd_free(scs, M_SEBSD); return (error); } error = sys_change_sid(doms, srcs, scs, uap.out, uap.outlen); - sebsd_free(doms); - sebsd_free(srcs); - sebsd_free(scs); + sebsd_free(doms, M_SEBSD); + sebsd_free(srcs, M_SEBSD); + sebsd_free(scs, M_SEBSD); return (error); } @@ -368,17 +368,17 @@ if (copyin(args, &p, sizeof(struct lp_args))) return (EFAULT); - str = malloc(p.len, M_SEBSD, M_WAITOK); + str = sebsd_malloc(p.len, M_SEBSD, M_WAITOK); if (!str) return (ENOMEM); if (copyin(p.data, str, p.len)) { - free(str, M_SEBSD); + sebsd_free(str, M_SEBSD); return (EFAULT); } str[p.len-1] = 0; error = security_set_bool(str+1, str[0]-'0'); - free(str, M_SEBSD); + sebsd_free(str, M_SEBSD); break; } ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#11 (text+ko) ==== @@ -82,13 +82,14 @@ int i; struct msgid_classinfo *c; - c = sebsd_malloc(sizeof(int) * nclasses + sizeof(*c), M_WAITOK); + c = sebsd_malloc(sizeof(int) * nclasses + sizeof(*c), M_SEBSD, + M_WAITOK); c->baseid = msgid; c->nclasses = nclasses; for (i = 0; i < nclasses; i++) c->classes[i] = *p++; for (i = msgid; i < msgid + size; i++) { - int *ip = sebsd_malloc(sizeof(int), M_WAITOK); + int *ip = sebsd_malloc(sizeof(int), M_SEBSD, M_WAITOK); *ip = i; error = hashtab_insert(ht, ip, c); if (error) { ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/queue.c#6 (text+ko) ==== @@ -20,7 +20,8 @@ { queue_t q; - q = (queue_t) sebsd_malloc(sizeof(struct queue_info), M_WAITOK); + q = (queue_t) sebsd_malloc(sizeof(struct queue_info), M_SEBSD, + M_WAITOK); if (q == NULL) return NULL; @@ -38,7 +39,7 @@ return -1; newnode = (queue_node_ptr_t) sebsd_malloc(sizeof(struct queue_node), - M_WAITOK); + M_SEBSD, M_WAITOK); if (newnode == NULL) return -1; @@ -64,7 +65,7 @@ return -1; newnode = (queue_node_ptr_t) sebsd_malloc(sizeof(struct queue_node), - M_WAITOK); + M_SEBSD, M_WAITOK); if (newnode == NULL) return -1; @@ -100,7 +101,7 @@ q->tail = NULL; e = node->element; - sebsd_free(node); + sebsd_free(node, M_SEBSD); return e; } @@ -129,10 +130,10 @@ while (p != NULL) { temp = p; p = p->next; - sebsd_free(temp); + sebsd_free(temp, M_SEBSD); } - sebsd_free(q); + sebsd_free(q, M_SEBSD); } int queue_map(queue_t q, int (*f) (queue_element_t, void *), void *vp) @@ -185,7 +186,7 @@ temp = p; p = p->next; g(temp->element, vp); - sebsd_free(temp); + sebsd_free(temp, M_SEBSD); } else { last = p; p = p->next; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/security.h#6 (text+ko) ==== @@ -90,7 +90,7 @@ int security_genfs_sid(const char *fstype, char *name, u16 sclass, u32 *sid); -#define security_free_context(ctx) ({ if (ctx) free(ctx, M_SEBSD); }) +#define security_free_context(ctx) ({ if (ctx) sebsd_free(ctx, M_SEBSD); }) int security_get_bool_string(int *len, char *out); int security_commit_pending_bools(void); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 14:30:00 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 308AB16A400 for ; Thu, 20 Apr 2006 14:30:00 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A989B43D45 for ; Thu, 20 Apr 2006 14:29:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 365CF46C7E for ; Thu, 20 Apr 2006 10:29:59 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A5DDF56669; Thu, 20 Apr 2006 14:29:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A01ED16A404; Thu, 20 Apr 2006 14:29:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7445716A400 for ; Thu, 20 Apr 2006 14:29:58 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40FD243D46 for ; Thu, 20 Apr 2006 14:29:58 +0000 (GMT) (envelope-from millert@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 k3KETwZY051736 for ; Thu, 20 Apr 2006 14:29:58 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KETwOg051733 for perforce@freebsd.org; Thu, 20 Apr 2006 14:29:58 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 14:29:58 GMT Message-Id: <200604201429.k3KETwOg051733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95675 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 14:30:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=95675 Change 95675 by millert@millert_g5tower on 2006/04/20 14:29:05 Add security.mac.sebsd.policyvers sysctl Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#7 (text+ko) ==== @@ -54,6 +54,8 @@ #include #include +extern unsigned int policydb_loaded_version; + #if 0 /* * Sysctl handler for security.mac.sebsd.sids @@ -358,6 +360,8 @@ SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, enforcing, CTLTYPE_INT | CTLFLAG_RW, NULL, 0, sysctl_sebsd_enforcing, "I", "SEBSD avc enforcement"); +SYSCTL_UINT(_security_mac_sebsd, OID_AUTO, policyvers, CTLFLAG_RD, + &policydb_loaded_version, 0, " SEBSD loaded policy version"); void sebsd_register_sysctls() @@ -366,4 +370,5 @@ sysctl_register_oid(&sysctl__security_mac_sebsd_verbose); sysctl_register_oid(&sysctl__security_mac_sebsd_auditing); sysctl_register_oid(&sysctl__security_mac_sebsd_enforcing); + sysctl_register_oid(&sysctl__security_mac_sebsd_policyvers); } From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 14:34:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A64216A404 for ; Thu, 20 Apr 2006 14:34:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A474043D5C for ; Thu, 20 Apr 2006 14:34:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 71E6546CFB for ; Thu, 20 Apr 2006 10:34:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2DF20642B4; Thu, 20 Apr 2006 14:34:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2750616A409; Thu, 20 Apr 2006 14:34:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8EAF16A407 for ; Thu, 20 Apr 2006 14:34:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE80943D98 for ; Thu, 20 Apr 2006 14:34:19 +0000 (GMT) (envelope-from millert@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 k3KEYJvi055076 for ; Thu, 20 Apr 2006 14:34:19 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KEYJTF055070 for perforce@freebsd.org; Thu, 20 Apr 2006 14:34:19 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 14:34:19 GMT Message-Id: <200604201434.k3KEYJTF055070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95676 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 14:34:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=95676 Change 95676 by millert@millert_g5tower on 2006/04/20 14:33:20 Emulate Linux audit api instead of using printk. We now hold the mutex for a much short period. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#12 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc_audit.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#13 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#7 (text+ko) ==== @@ -8,7 +8,7 @@ POLICY_SRCS+= ss/avtab.c ss/ebitmap.c ss/hashtab.c ss/init.c ss/policydb.c \ ss/queue.c ss/services.c ss/sidtab.c ss/symtab.c ss/mach_av.c \ ss/conditional.c -POLICY_SRCS+= avc/avc.c +POLICY_SRCS+= avc/avc.c avc/avc_audit.c CFLAGS+= -DSEFOS_DEBUG -I.. ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#12 (text+ko) ==== @@ -73,7 +73,7 @@ }; static mutex_t *avc_lock; -static mutex_t *avc_log_lock; +extern mutex_t *avc_log_lock; uint64_t avc_msg_cost, avc_msg_burst; static struct avc_node *avc_node_freelist; static struct avc_cache avc_cache; @@ -111,14 +111,14 @@ * @tclass: target security class * @av: access vector */ -void avc_dump_av(u16 tclass, u32 av) +void avc_dump_av(struct audit_buffer *ab, u16 tclass, u32 av) { char **common_pts = NULLL; u32 common_base = NULL; int i, i2, perm; if (av == 0) { - printk(" null"); + audit_log_end(ab); return; } @@ -130,12 +130,12 @@ } } - printk(" {"); + audit_log_format(ab, " {"); i = 0; perm = 1; while (perm < common_base) { if (perm & av) - printk(" %s", common_pts[i]); + audit_log_format(ab, " %s", common_pts[i]); i++; perm <<= 1; } @@ -148,13 +148,13 @@ break; } if (i2 < ARRAY_SIZE(av_perm_to_string)) - printk(" %s", av_perm_to_string[i2].name); + audit_log_format(ab, " %s", av_perm_to_string[i2].name); } i++; perm <<= 1; } - printk(" }"); + audit_log_format(ab, " }"); } #endif @@ -164,7 +164,7 @@ * @tsid: target security identifier * @tclass: target security class */ -void avc_dump_query(u32 ssid, u32 tsid, u16 tclass) +void avc_dump_query(struct audit_buffer *ab, u32 ssid, u32 tsid, u16 tclass) { int rc; char *scontext; @@ -172,20 +172,20 @@ rc = security_sid_to_context(ssid, &scontext, &scontext_len); if (rc) - printk("ssid=%d", ssid); + audit_log_format(ab, "ssid=%d", ssid); else { - printk("scontext=%s", scontext); + audit_log_format(ab, "scontext=%s", scontext); kfree(scontext); } rc = security_sid_to_context(tsid, &scontext, &scontext_len); if (rc) - printk(" tsid=%d", tsid); + audit_log_format(ab, " tsid=%d", tsid); else { - printk(" tcontext=%s", scontext); + audit_log_format(ab, " tcontext=%s", scontext); kfree(scontext); } - printk(" tclass=%s", security_class_to_string(tclass)); + audit_log_format(ab, " tclass=%s", security_class_to_string(tclass)); } /** @@ -457,23 +457,24 @@ } #if 0 -static inline void avc_print_ipv6_addr(struct in6_addr *addr, u16 port, +static inline void avc_print_ipv6_addr(struct audit_buffer *ab, + struct in6_addr *addr, u16 port, char *name1, char *name2) { if (!ipv6_addr_any(addr)) - printk(" %s=%04x:%04x:%04x:%04x:%04x:" + audit_log_format(ab, " %s=%04x:%04x:%04x:%04x:%04x:" "%04x:%04x:%04x", name1, NIP6(*addr)); if (port) - printk(" %s=%d", name2, ntohs(port)); + audit_log_format(ab, " %s=%d", name2, ntohs(port)); } -static inline void avc_print_ipv4_addr(u32 addr, u16 port, - char *name1, char *name2) +static inline void avc_print_ipv4_addr(struct audit_buffer *ab, u32 addr, + u16 port, char *name1, char *name2) { if (addr) - printk(" %s=%d.%d.%d.%d", name1, NIPQUAD(addr)); + audit_log_format(ab, " %s=%d.%d.%d.%d", name1, NIPQUAD(addr)); if (port) - printk(" %s=%d", name2, ntohs(port)); + audit_log_format(ab, " %s=%d", name2, ntohs(port)); } #endif @@ -566,6 +567,7 @@ { struct proc *tsk = current_proc(); u32 denied, audited; + struct audit_buffer *ab; denied = requested & ~avd->allowed; if (denied) { @@ -583,30 +585,32 @@ if (!check_avc_ratelimit()) return; - /* prevent overlapping printks */ - spin_lock_irqsave(&avc_log_lock,flags); - - printk("\navc: %s ", denied ? "denied" : "granted"); - avc_dump_av(tclass,audited); - printk(" for "); + ab = audit_log_start(); + if (!ab) + return; /* audit_panic has been called */ + audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted"); + avc_dump_av(ab, tclass,audited); + audit_log_format(ab, " for "); /* if (a && a->tsk) tsk = a->tsk;*/ if (tsk && tsk->p_pid) { - printk(" pid=%d comm=%s", tsk->p_pid, tsk->p_comm); + audit_log_format(ab, " pid=%d comm=%s", tsk->p_pid, tsk->p_comm); } if (a) { switch (a->type) { case AVC_AUDIT_DATA_IPC: - printk(" key=%d", a->u.ipc_id); + audit_log_format(ab, " key=%d", a->u.ipc_id); break; #ifdef CAPABILITIES case AVC_AUDIT_DATA_CAP: { const char *capt = capv_to_text (a->u.cap); if (capt[7] == '!') - printk (" capability=<%lld>", a->u.cap); + audit_log_format(ab, + " capability=<%lld>", a->u.cap); else - printk(" capability=%s", capv_to_text (a->u.cap)); + audit_log_format(ab, " capability=%s", + capv_to_text(a->u.cap)); } break; #endif @@ -618,11 +622,13 @@ !VOP_GETATTR(vp, &va, tsk->p_ucred, tsk)) { - printk(" inode=%ld, mountpoint=%s, ", + audit_log_format(ab, + " inode=%ld, mountpoint=%s, ", va.va_fileid, vp->v_mount->mnt_stat.f_mntonname); } else { - printk(" fs/inode info not available"); + audit_log_format(ab, + " fs/inode info not available"); } } break; @@ -631,11 +637,9 @@ break; } } - printk(" "); - avc_dump_query(ssid, tsid, tclass); - printk("\n"); - - spin_unlock_irqrestore(&avc_log_lock,flags); + audit_log_format(ab, " "); + avc_dump_query(ab, ssid, tsid, tclass); + audit_log_end(ab); } /** ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.h#6 (text+ko) ==== @@ -106,10 +106,12 @@ * AVC display support */ void avc_dump_av( + struct audit_buffer *ab, u16 tclass, /* IN */ u32 av); /* IN */ void avc_dump_query( + struct audit_buffer *ab, u32 ssid, /* IN */ u32 tsid, /* IN */ u16 tclass); /* IN */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#9 (text+ko) ==== @@ -248,6 +248,7 @@ siginh setrlimit rlimitinh + dyntransition } ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#13 (text+ko) ==== @@ -114,6 +114,14 @@ #define spin_lock_irqsave(m,flags) mutex_lock(*(m)) #define spin_unlock_irqrestore(m,flags) mutex_unlock(*(m)) +/* emulate linux audit support */ +struct audit_buffer; +struct audit_buffer *audit_log_start(void); +void audit_log(const char *, ...); +void audit_log_end(struct audit_buffer *); +void audit_log_format(struct audit_buffer *, const char *, ...); +void audit_log_untrustedstring(struct audit_buffer *, const char *); + #endif /* _KERNEL */ #define BUG() printf("BUG: %s:%d", __FILE__, __LINE__) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.c#7 (text+ko) ==== @@ -1847,7 +1847,7 @@ * @tclass: target security class * @av: access vector */ -void avc_dump_av(u16 tclass, u32 av) +void avc_dump_av(struct audit_buffer *ab, u16 tclass, u32 av) { char **common_pts = 0; struct class_datum *cls; @@ -1856,14 +1856,14 @@ int i, i2; if (av == 0) { - printk(" null "); + audit_log_format(ab, " null "); return; } cls = policydb.class_val_to_struct[tclass-1]; clb = cls->comdatum; - printk(" {"); + audit_log_format(ab, " {"); for (i = 0, perm = 1; i < sizeof(av) * 8; i++, perm <<= 1) { if (perm & av) { const char *pstr; @@ -1872,14 +1872,14 @@ if (!pstr && clb) pstr = findperm(clb->permissions.table, i); if (!pstr) - printk(" %s:%d", + audit_log_format(ab, " %s:%d", policydb.p_class_val_to_name[tclass-1], i); else - printk(" %s", pstr); + audit_log_format(ab, " %s", pstr); } } - printk(" }"); + audit_log_format(ab, " }"); } const char *security_class_to_string(int tclass) From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 14:35:31 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D9F216A410 for ; Thu, 20 Apr 2006 14:35:31 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBFBE43D5E for ; Thu, 20 Apr 2006 14:35:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3B86E46CFB for ; Thu, 20 Apr 2006 10:35:25 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A529772915; Thu, 20 Apr 2006 14:35:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DD9C16A40E; Thu, 20 Apr 2006 14:35:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AA7F16A404 for ; Thu, 20 Apr 2006 14:35:24 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C023A43D7E for ; Thu, 20 Apr 2006 14:35:21 +0000 (GMT) (envelope-from millert@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 k3KEZLa5056135 for ; Thu, 20 Apr 2006 14:35:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KEZL9G056130 for perforce@freebsd.org; Thu, 20 Apr 2006 14:35:21 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 14:35:21 GMT Message-Id: <200604201435.k3KEZL9G056130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95677 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 14:35:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=95677 Change 95677 by millert@millert_g5tower on 2006/04/20 14:34:51 Enable policy and policy load locks Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/init.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.c#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/init.c#6 (text+ko) ==== @@ -15,6 +15,8 @@ #include #include +#include + #include #include #include @@ -34,6 +36,12 @@ if (!preload_find_data("sebsd_policy", &policy_len, &policy_data)) goto loaderr; +#ifdef __APPLE__ + /* Initialize security server locks. */ + policy_rwlock = lock_alloc(TRUE, ETAP_NO_TRACE, ETAP_NO_TRACE); + load_sem = mutex_alloc(ETAP_NO_TRACE); +#endif + printf("security: reading policy configuration\n"); rc = security_load_policy(policy_data, policy_len); @@ -41,7 +49,7 @@ printf("security: error while reading policy, cannot initialize.\n"); return EINVAL; } - + return 0; loaderr: ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.c#8 (text+ko) ==== @@ -35,35 +35,17 @@ #include #include #include +#include -#ifdef __FreeBSD__ +lock_t *policy_rwlock; +#define POLICY_RDLOCK lock_read(policy_rwlock) +#define POLICY_WRLOCK lock_write(policy_rwlock) +#define POLICY_RDUNLOCK lock_read_done(policy_rwlock) +#define POLICY_WRUNLOCK lock_write_done(policy_rwlock) -#include -#include - -static struct rwlock policy_rwlock; -#define POLICY_RDLOCK rw_rlock(&policy_rwlock) -#define POLICY_WRLOCK rw_wlock(&policy_rwlock) -#define POLICY_RDUNLOCK rw_runlock(&policy_rwlock) -#define POLICY_WRUNLOCK rw_wunlock(&policy_rwlock) - -RW_SYSINIT(policy_rwlock, &policy_rwlock, "SEBSD policy lock"); - -static struct mtx load_sem; -#define LOAD_LOCK mtx_lock(&load_sem) -#define LOAD_UNLOCK mtx_unlock(&load_sem) - -MTX_SYSINIT(load_sem, &load_sem, "SEBSD policy load lock", MTX_DEF); - -#else -/* XXX - define locking for Darwin */ -#define POLICY_RDLOCK -#define POLICY_WRLOCK -#define POLICY_RDUNLOCK -#define POLICY_WRUNLOCK -#define LOAD_LOCK -#define LOAD_UNLOCK -#endif +mutex_t *load_sem; +#define LOAD_LOCK mutex_lock(load_sem) +#define LOAD_UNLOCK mutex_unlock(load_sem) struct sidtab sidtab; struct policydb policydb; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.h#4 (text+ko) ==== @@ -17,5 +17,11 @@ extern struct sidtab sidtab; extern struct policydb policydb; +/* + * Security server locks, as allocated by security_init(). + */ +extern lock_t *policy_rwlock; +extern mutex_t *load_sem; + #endif /* _SS_SERVICES_H_ */ From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 14:37:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C30B516A409 for ; Thu, 20 Apr 2006 14:37:28 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B52343D46 for ; Thu, 20 Apr 2006 14:37:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E3FF646C89 for ; Thu, 20 Apr 2006 10:37:25 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4985255BC9; Thu, 20 Apr 2006 14:37:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 42A1516A404; Thu, 20 Apr 2006 14:37:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18D5F16A400 for ; Thu, 20 Apr 2006 14:37:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBD9B43D45 for ; Thu, 20 Apr 2006 14:37:24 +0000 (GMT) (envelope-from millert@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 k3KEbO2R057660 for ; Thu, 20 Apr 2006 14:37:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KEbOTA057654 for perforce@freebsd.org; Thu, 20 Apr 2006 14:37:24 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 14:37:24 GMT Message-Id: <200604201437.k3KEbOTA057654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95678 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 14:37:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=95678 Change 95678 by millert@millert_g5tower on 2006/04/20 14:37:16 Update flask components based on the version of selinux in the linux 2.6.16 kernel. This does not include the av cache changes which will be merged separately. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#10 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#14 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/conditional.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/constraint.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/context.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/ebitmap.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/ebitmap.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/hashtab.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/hashtab.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mls.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mls.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mls_types.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/policydb.c#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/policydb.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/security.h#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.c#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/sidtab.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/sidtab.h#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#8 (text+ko) ==== @@ -5,9 +5,9 @@ POLICY_NOMAN= yes POLICY_SRCS= sebsd.c sebsd_alloc.c sebsd_syscall.c sebsd_sysctl.c -POLICY_SRCS+= ss/avtab.c ss/ebitmap.c ss/hashtab.c ss/init.c ss/policydb.c \ - ss/queue.c ss/services.c ss/sidtab.c ss/symtab.c ss/mach_av.c \ - ss/conditional.c +POLICY_SRCS+= ss/avtab.c ss/conditional.c ss/ebitmap.c ss/hashtab.c \ + ss/init.c ss/mach_av.c ss/mls.c ss/policydb.c ss/queue.c \ + ss/services.c ss/sidtab.c ss/symtab.c POLICY_SRCS+= avc/avc.c avc/avc_audit.c CFLAGS+= -DSEFOS_DEBUG -I.. ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#9 (text+ko) ==== @@ -75,6 +75,7 @@ { SECCLASS_PROCESS, PROCESS__SIGINH, "siginh" }, { SECCLASS_PROCESS, PROCESS__SETRLIMIT, "setrlimit" }, { SECCLASS_PROCESS, PROCESS__RLIMITINH, "rlimitinh" }, + { SECCLASS_PROCESS, PROCESS__DYNTRANSITION, "dyntransition" }, { SECCLASS_MSGQ, MSGQ__ENQUEUE, "enqueue" }, { SECCLASS_MSG, MSG__SEND, "send" }, { SECCLASS_MSG, MSG__RECEIVE, "receive" }, ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#8 (text+ko) ==== @@ -505,6 +505,7 @@ #define PROCESS__SIGINH 0x0000000000100000UL #define PROCESS__SETRLIMIT 0x0000000000200000UL #define PROCESS__RLIMITINH 0x0000000000400000UL +#define PROCESS__DYNTRANSITION 0x0000000000800000UL #define IPC__WRITE 0x0000000000000020UL #define IPC__UNIX_WRITE 0x0000000000000100UL ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#10 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#14 (text+ko) ==== @@ -56,13 +56,17 @@ #if !defined(BYTE_ORDER) #error BYTE_ORDER not defined #elif BYTE_ORDER == LITTLE_ENDIAN +#define cpu_to_le16(x) ((__uint16_t)(x)) #define cpu_to_le32(x) ((__uint32_t)(x)) #define cpu_to_le64(x) ((__uint64_t)(x)) +#define le16_to_cpu(x) ((__uint16_t)(x)) #define le32_to_cpu(x) ((__uint32_t)(x)) #define le64_to_cpu(x) ((__uint64_t)(x)) #elif BYTE_ORDER == BIG_ENDIAN +#define cpu_to_le16(x) NXSwapHostShortToLittle(x) #define cpu_to_le32(x) NXSwapHostLongToLittle(x) #define cpu_to_le64(x) NXSwapHostLongLongToLittle(x) +#define le16_to_cpu(x) NXSwapLittleShortToHost(x) #define le32_to_cpu(x) NXSwapLittleLongToHost(x) #define le64_to_cpu(x) NXSwapLittleLongLongToHost(x) #else ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.c#5 (text+ko) ==== @@ -27,7 +27,8 @@ AVTAB_HASH_MASK) static struct avtab_node* -avtab_insert_node(struct avtab *h, int hvalue, struct avtab_node * prev, struct avtab_node * cur, +avtab_insert_node(struct avtab *h, int hvalue, + struct avtab_node * prev, struct avtab_node * cur, struct avtab_key *key, struct avtab_datum *datum) { struct avtab_node * newnode; @@ -49,10 +50,11 @@ return newnode; } -int avtab_insert(struct avtab *h, struct avtab_key *key, struct avtab_datum *datum) +static int avtab_insert(struct avtab *h, struct avtab_key *key, struct avtab_datum *datum) { int hvalue; struct avtab_node *prev, *cur, *newnode; + u16 specified = key->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); if (!h) return EINVAL; @@ -64,7 +66,7 @@ if (key->source_type == cur->key.source_type && key->target_type == cur->key.target_type && key->target_class == cur->key.target_class && - (datum->specified & cur->datum.specified)) + (specified & cur->key.specified)) return EEXIST; if (key->source_type < cur->key.source_type) break; @@ -93,6 +95,7 @@ { int hvalue; struct avtab_node *prev, *cur, *newnode; + u16 specified = key->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); if (!h) return NULL; @@ -103,7 +106,7 @@ if (key->source_type == cur->key.source_type && key->target_type == cur->key.target_type && key->target_class == cur->key.target_class && - (datum->specified & cur->datum.specified)) + (specified & cur->key.specified)) break; if (key->source_type < cur->key.source_type) break; @@ -120,10 +123,11 @@ return newnode; } -struct avtab_datum *avtab_search(struct avtab *h, struct avtab_key *key, int specified) +struct avtab_datum *avtab_search(struct avtab *h, struct avtab_key *key) { int hvalue; struct avtab_node *cur; + u16 specified = key->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); if (!h) return NULL; @@ -133,7 +137,7 @@ if (key->source_type == cur->key.source_type && key->target_type == cur->key.target_type && key->target_class == cur->key.target_class && - (specified & cur->datum.specified)) + (specified & cur->key.specified)) return &cur->datum; if (key->source_type < cur->key.source_type) @@ -154,10 +158,11 @@ * conjunction with avtab_search_next_node() */ struct avtab_node* -avtab_search_node(struct avtab *h, struct avtab_key *key, int specified) +avtab_search_node(struct avtab *h, struct avtab_key *key) { int hvalue; struct avtab_node *cur; + u16 specified = key->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); if (!h) return NULL; @@ -167,7 +172,7 @@ if (key->source_type == cur->key.source_type && key->target_type == cur->key.target_type && key->target_class == cur->key.target_class && - (specified & cur->datum.specified)) + (specified & cur->key.specified)) return cur; if (key->source_type < cur->key.source_type) @@ -191,11 +196,12 @@ if (!node) return NULL; + specified &= ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); for (cur = node->next; cur; cur = cur->next) { if (node->key.source_type == cur->key.source_type && node->key.target_type == cur->key.target_type && node->key.target_class == cur->key.target_class && - (specified & cur->datum.specified)) + (specified & cur->key.specified)) return cur; if (node->key.source_type < cur->key.source_type) @@ -232,31 +238,6 @@ h->htable = NULL; } - -int avtab_map(struct avtab *h, - int (*apply) (struct avtab_key *k, - struct avtab_datum *d, - void *args), - void *args) -{ - int i, ret; - struct avtab_node *cur; - - if (!h) - return 0; - - for (i = 0; i < AVTAB_SIZE; i++) { - cur = h->htable[i]; - while (cur != NULL) { - ret = apply(&cur->key, &cur->datum, args); - if (ret) - return ret; - cur = cur->next; - } - } - return 0; -} - int avtab_init(struct avtab *h) { int i; @@ -297,93 +278,152 @@ max_chain_len); } -int avtab_read_item(void *fp, struct avtab_datum *avdatum, struct avtab_key *avkey) +static uint16_t spec_order[] = { + AVTAB_ALLOWED, + AVTAB_AUDITDENY, + AVTAB_AUDITALLOW, + AVTAB_TRANSITION, + AVTAB_CHANGE, + AVTAB_MEMBER +}; + +int avtab_read_item(void *fp, u32 vers, struct avtab *a, + int (*insertf)(struct avtab *a, struct avtab_key *k, + struct avtab_datum *d, void *p), + void *p) { - u32 *buf; - u32 items, items2; + __le16 buf16[4]; + u16 enabled; + __le32 buf32[7]; + u32 items, items2, val; + struct avtab_key key; + struct avtab_datum datum; + int i, rc; + + memset(&key, 0, sizeof(struct avtab_key)); + memset(&datum, 0, sizeof(struct avtab_datum)); + + if (vers < POLICYDB_VERSION_AVTAB) { + rc = next_entry(buf32, fp, sizeof(u32)); + if (rc < 0) { + printk(KERN_ERR "security: avtab: truncated entry\n"); + return -1; + } + items2 = le32_to_cpu(buf32[0]); + if (items2 > ARRAY_SIZE(buf32)) { + printk(KERN_ERR "security: avtab: entry overflow\n"); + return -1; + + } + rc = next_entry(buf32, fp, sizeof(u32)*items2); + if (rc < 0) { + printk(KERN_ERR "security: avtab: truncated entry\n"); + return -1; + } + items = 0; + + val = le32_to_cpu(buf32[items++]); + key.source_type = (u16)val; + if (key.source_type != val) { + printk("security: avtab: truncated source type\n"); + return -1; + } + val = le32_to_cpu(buf32[items++]); + key.target_type = (u16)val; + if (key.target_type != val) { + printk("security: avtab: truncated target type\n"); + return -1; + } + val = le32_to_cpu(buf32[items++]); + key.target_class = (u16)val; + if (key.target_class != val) { + printk("security: avtab: truncated target class\n"); + return -1; + } + + val = le32_to_cpu(buf32[items++]); + enabled = (val & AVTAB_ENABLED_OLD) ? AVTAB_ENABLED : 0; + + if (!(val & (AVTAB_AV | AVTAB_TYPE))) { + printk("security: avtab: null entry\n"); + return -1; + } + if ((val & AVTAB_AV) && + (val & AVTAB_TYPE)) { + printk("security: avtab: entry has both access vectors and types\n"); + return -1; + } - memset(avkey, 0, sizeof(struct avtab_key)); - memset(avdatum, 0, sizeof(struct avtab_datum)); + for (i = 0; i < ARRAY_SIZE(spec_order); i++) { + if (val & spec_order[i]) { + key.specified = spec_order[i] | enabled; + datum.data = le32_to_cpu(buf32[items++]); + rc = insertf(a, &key, &datum, p); + if (rc) return rc; + } + } - buf = next_entry(fp, sizeof(u32)); - if (!buf) { - printk(KERN_ERR "security: avtab: truncated entry\n"); - goto bad; + if (items != items2) { + printk("security: avtab: entry only had %d items, expected %d\n", items2, items); + return -1; + } + return 0; } - items2 = le32_to_cpu(buf[0]); - buf = next_entry(fp, sizeof(u32)*items2); - if (!buf) { - printk(KERN_ERR "security: avtab: truncated entry\n"); - goto bad; + + rc = next_entry(buf16, fp, sizeof(u16)*4); + if (rc < 0) { + printk("security: avtab: truncated entry\n"); + return -1; } + items = 0; - avkey->source_type = le32_to_cpu(buf[items++]); - avkey->target_type = le32_to_cpu(buf[items++]); - avkey->target_class = le32_to_cpu(buf[items++]); - avdatum->specified = le32_to_cpu(buf[items++]); - if (!(avdatum->specified & (AVTAB_AV | AVTAB_TYPE))) { - printk(KERN_ERR "security: avtab: null entry\n"); - goto bad; + key.source_type = le16_to_cpu(buf16[items++]); + key.target_type = le16_to_cpu(buf16[items++]); + key.target_class = le16_to_cpu(buf16[items++]); + key.specified = le16_to_cpu(buf16[items++]); + + rc = next_entry(buf32, fp, sizeof(u32)); + if (rc < 0) { + printk("security: avtab: truncated entry\n"); + return -1; } - if ((avdatum->specified & AVTAB_AV) && - (avdatum->specified & AVTAB_TYPE)) { - printk(KERN_ERR "security: avtab: entry has both access vectors and types\n"); - goto bad; - } - if (avdatum->specified & AVTAB_AV) { - if (avdatum->specified & AVTAB_ALLOWED) - avtab_allowed(avdatum) = le32_to_cpu(buf[items++]); - if (avdatum->specified & AVTAB_AUDITDENY) - avtab_auditdeny(avdatum) = le32_to_cpu(buf[items++]); - if (avdatum->specified & AVTAB_AUDITALLOW) - avtab_auditallow(avdatum) = le32_to_cpu(buf[items++]); - } else { - if (avdatum->specified & AVTAB_TRANSITION) - avtab_transition(avdatum) = le32_to_cpu(buf[items++]); - if (avdatum->specified & AVTAB_CHANGE) - avtab_change(avdatum) = le32_to_cpu(buf[items++]); - if (avdatum->specified & AVTAB_MEMBER) - avtab_member(avdatum) = le32_to_cpu(buf[items++]); - } - if (items != items2) { - printk(KERN_ERR "security: avtab: entry only had %d items, expected %d\n", - items2, items); - goto bad; - } + datum.data = le32_to_cpu(*buf32); + return insertf(a, &key, &datum, p); +} - return 0; -bad: - return -1; +static int avtab_insertf(struct avtab *a, struct avtab_key *k, + struct avtab_datum *d, void *p) +{ + return avtab_insert(a, k, d); } -int avtab_read(struct avtab *a, void *fp, u32 config) +int avtab_read(struct avtab *a, void *fp, u32 vers) { - int i, rc = EINVAL; - struct avtab_key avkey; - struct avtab_datum avdatum; - u32 *buf; - u32 nel; + int rc; + __le32 buf[1]; + u32 nel, i; - buf = next_entry(fp, sizeof(u32)); - if (!buf) { + rc = next_entry(buf, fp, sizeof(u32)); + if (rc < 0) { printk(KERN_ERR "security: avtab: truncated table\n"); goto bad; } nel = le32_to_cpu(buf[0]); if (!nel) { printk(KERN_ERR "security: avtab: table is empty\n"); + rc = EINVAL; goto bad; } for (i = 0; i < nel; i++) { - if (avtab_read_item(fp, &avdatum, &avkey)) - goto bad; - rc = avtab_insert(a, &avkey, &avdatum); + rc = avtab_read_item(fp,vers, a, avtab_insertf, NULL); if (rc) { if (rc == ENOMEM) printk(KERN_ERR "security: avtab: out of memory\n"); - if (rc == EEXIST) + else if (rc == EEXIST) printk(KERN_ERR "security: avtab: duplicate entry\n"); + else + rc = EINVAL; goto bad; } } @@ -396,3 +436,20 @@ avtab_destroy(a); goto out; } + +void avtab_cache_init(void) +{ +/* XXX - use zone allocator */ +#ifdef SEBSDnotyet + avtab_node_cachep = kmem_cache_create("avtab_node", + sizeof(struct avtab_node), + 0, SLAB_PANIC, NULL, NULL); +#endif +} + +void avtab_cache_destroy(void) +{ +#ifdef SEBSDnotyet + kmem_cache_destroy (avtab_node_cachep); +#endif +} ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.h#5 (text+ko) ==== @@ -21,12 +21,9 @@ #define _SS_AVTAB_H_ struct avtab_key { - u32 source_type; /* source type */ - u32 target_type; /* target type */ - u32 target_class; /* target object class */ -}; - -struct avtab_datum { + u16 source_type; /* source type */ + u16 target_type; /* target type */ + u16 target_class; /* target object class */ #define AVTAB_ALLOWED 1 #define AVTAB_AUDITALLOW 2 #define AVTAB_AUDITDENY 4 @@ -35,15 +32,13 @@ #define AVTAB_MEMBER 32 #define AVTAB_CHANGE 64 #define AVTAB_TYPE (AVTAB_TRANSITION | AVTAB_MEMBER | AVTAB_CHANGE) -#define AVTAB_ENABLED 0x80000000 /* reserved for used in cond_avtab */ - u32 specified; /* what fields are specified */ - u32 data[3]; /* access vectors or types */ -#define avtab_allowed(x) (x)->data[0] -#define avtab_auditdeny(x) (x)->data[1] -#define avtab_auditallow(x) (x)->data[2] -#define avtab_transition(x) (x)->data[0] -#define avtab_change(x) (x)->data[1] -#define avtab_member(x) (x)->data[2] +#define AVTAB_ENABLED_OLD 0x80000000 /* reserved for used in cond_avtab */ +#define AVTAB_ENABLED 0x8000 /* reserved for used in cond_avtab */ + u16 specified; /* what fields are specified */ +}; + +struct avtab_datum { + u32 data; /* access vector or type value */ }; struct avtab_node { @@ -58,27 +53,26 @@ }; int avtab_init(struct avtab *); -int avtab_insert(struct avtab *h, struct avtab_key *k, struct avtab_datum *d); -struct avtab_datum *avtab_search(struct avtab *h, struct avtab_key *k, int specified); +struct avtab_datum *avtab_search(struct avtab *h, struct avtab_key *k); void avtab_destroy(struct avtab *h); -int avtab_map(struct avtab *h, - int (*apply) (struct avtab_key *k, - struct avtab_datum *d, - void *args), - void *args); void avtab_hash_eval(struct avtab *h, char *tag); -int avtab_read_item(void *fp, struct avtab_datum *avdatum, struct avtab_key *avkey); -int avtab_read(struct avtab *a, void *fp, u32 config); +int avtab_read_item(void *fp, u32 vers, struct avtab *a, + int (*insert)(struct avtab *a, struct avtab_key *k, + struct avtab_datum *d, void *p), + void *p); + +int avtab_read(struct avtab *a, void *fp, u32 vers); struct avtab_node *avtab_insert_nonunique(struct avtab *h, struct avtab_key *key, struct avtab_datum *datum); -struct avtab_node *avtab_search_node(struct avtab *h, struct avtab_key *key, int specified); +struct avtab_node *avtab_search_node(struct avtab *h, struct avtab_key *key); struct avtab_node *avtab_search_node_next(struct avtab_node *node, int specified); void avtab_cache_init(void); +void avtab_cache_destroy(void); #define AVTAB_HASH_BITS 15 #define AVTAB_HASH_BUCKETS (1 << AVTAB_HASH_BITS) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/conditional.c#4 (text+ko) ==== @@ -94,18 +94,18 @@ /* turn the rules on or off */ for (cur = node->true_list; cur != NULL; cur = cur->next) { if (new_state <= 0) { - cur->node->datum.specified &= ~AVTAB_ENABLED; + cur->node->key.specified &= ~AVTAB_ENABLED; } else { - cur->node->datum.specified |= AVTAB_ENABLED; + cur->node->key.specified |= AVTAB_ENABLED; } } for (cur = node->false_list; cur != NULL; cur = cur->next) { /* -1 or 1 */ if (new_state) { - cur->node->datum.specified &= ~AVTAB_ENABLED; + cur->node->key.specified &= ~AVTAB_ENABLED; } else { - cur->node->datum.specified |= AVTAB_ENABLED; + cur->node->key.specified |= AVTAB_ENABLED; } } } @@ -160,16 +160,14 @@ void cond_policydb_destroy(struct policydb *p) { - if (p->bool_val_to_struct != NULL) - kfree(p->bool_val_to_struct); + kfree(p->bool_val_to_struct); avtab_destroy(&p->te_cond_avtab); cond_list_destroy(p->cond_list); } int cond_init_bool_indexes(struct policydb *p) { - if (p->bool_val_to_struct) - kfree(p->bool_val_to_struct); + kfree(p->bool_val_to_struct); p->bool_val_to_struct = (struct cond_bool_datum**) kmalloc(p->p_bools.nprim * sizeof(struct cond_bool_datum*), GFP_KERNEL); if (!p->bool_val_to_struct) @@ -179,8 +177,7 @@ int cond_destroy_bool(void *key, void *datum, void *p) { - if (key) - kfree(key); + kfree(key); kfree(datum); return 0; } @@ -194,7 +191,7 @@ p = datap; if (!booldatum->value || booldatum->value > p->p_bools.nprim) - return -EINVAL; + return EINVAL; p->p_bool_val_to_name[booldatum->value - 1] = key; p->bool_val_to_struct[booldatum->value -1] = booldatum; @@ -213,15 +210,16 @@ { char *key = NULL; struct cond_bool_datum *booldatum; - u32 *buf, len; + __le32 buf[3]; + u32 len; + int rc; - booldatum = kmalloc(sizeof(struct cond_bool_datum), GFP_KERNEL); + booldatum = kzalloc(sizeof(struct cond_bool_datum), GFP_KERNEL); if (!booldatum) return -1; - memset(booldatum, 0, sizeof(struct cond_bool_datum)); - buf = next_entry(fp, sizeof(u32) * 3); - if (!buf) + rc = next_entry(buf, fp, sizeof buf); + if (rc < 0) goto err; booldatum->value = le32_to_cpu(buf[0]); @@ -233,13 +231,12 @@ len = le32_to_cpu(buf[2]); - buf = next_entry(fp, len); - if (!buf) - goto err; key = kmalloc(len + 1, GFP_KERNEL); if (!key) goto err; - memcpy(key, buf, len); + rc = next_entry(key, fp, len); + if (rc < 0) + goto err; key[len] = 0; if (hashtab_insert(h, key, booldatum)) goto err; @@ -250,102 +247,124 @@ return -1; } -static int cond_read_av_list(struct policydb *p, void *fp, struct cond_av_list **ret_list, - struct cond_av_list *other) +struct cond_insertf_data +{ + struct policydb *p; + struct cond_av_list *other; + struct cond_av_list *head; + struct cond_av_list *tail; +}; + +static int cond_insertf(struct avtab *a, struct avtab_key *k, struct avtab_datum *d, void *ptr) { - struct cond_av_list *list, *last = NULL, *cur; - struct avtab_key key; - struct avtab_datum datum; + struct cond_insertf_data *data = ptr; + struct policydb *p = data->p; + struct cond_av_list *other = data->other, *list, *cur; struct avtab_node *node_ptr; - int len, i; - u32 *buf; u8 found; - *ret_list = NULL; - len = 0; - buf = next_entry(fp, sizeof(u32)); - if (!buf) - return -1; - - len = le32_to_cpu(buf[0]); - if (len == 0) { - return 0; - } - - for (i = 0; i < len; i++) { - if (avtab_read_item(fp, &datum, &key)) + /* + * For type rules we have to make certain there aren't any + * conflicting rules by searching the te_avtab and the + * cond_te_avtab. + */ + if (k->specified & AVTAB_TYPE) { + if (avtab_search(&p->te_avtab, k)) { + printk("security: type rule already exists outside of a conditional."); goto err; - + } /* - * For type rules we have to make certain there aren't any - * conflicting rules by searching the te_avtab and the - * cond_te_avtab. + * If we are reading the false list other will be a pointer to + * the true list. We can have duplicate entries if there is only + * 1 other entry and it is in our true list. + * + * If we are reading the true list (other == NULL) there shouldn't + * be any other entries. */ - if (datum.specified & AVTAB_TYPE) { - if (avtab_search(&p->te_avtab, &key, AVTAB_TYPE)) { - printk("security: type rule already exists outside of a conditional."); - goto err; - } - /* - * If we are reading the false list other will be a pointer to - * the true list. We can have duplicate entries if there is only - * 1 other entry and it is in our true list. - * - * If we are reading the true list (other == NULL) there shouldn't - * be any other entries. - */ - if (other) { - node_ptr = avtab_search_node(&p->te_cond_avtab, &key, AVTAB_TYPE); - if (node_ptr) { - if (avtab_search_node_next(node_ptr, AVTAB_TYPE)) { - printk("security: too many conflicting type rules."); - goto err; + if (other) { + node_ptr = avtab_search_node(&p->te_cond_avtab, k); + if (node_ptr) { + if (avtab_search_node_next(node_ptr, k->specified)) { + printk("security: too many conflicting type rules."); + goto err; + } + found = 0; + for (cur = other; cur != NULL; cur = cur->next) { + if (cur->node == node_ptr) { + found = 1; + break; } - found = 0; - for (cur = other; cur != NULL; cur = cur->next) { - if (cur->node == node_ptr) { - found = 1; - break; - } - } - if (!found) { - printk("security: conflicting type rules."); - goto err; - } } - } else { - if (avtab_search(&p->te_cond_avtab, &key, AVTAB_TYPE)) { - printk("security: conflicting type rules when adding type rule for true."); + if (!found) { + printk("security: conflicting type rules.\n"); goto err; } } + } else { + if (avtab_search(&p->te_cond_avtab, k)) { + printk("security: conflicting type rules when adding type rule for true.\n"); + goto err; + } } - node_ptr = avtab_insert_nonunique(&p->te_cond_avtab, &key, &datum); - if (!node_ptr) { - printk("security: could not insert rule."); - goto err; - } + } + + node_ptr = avtab_insert_nonunique(&p->te_cond_avtab, k, d); + if (!node_ptr) { + printk("security: could not insert rule."); + goto err; + } + + list = kzalloc(sizeof(struct cond_av_list), GFP_KERNEL); + if (!list) + goto err; + + list->node = node_ptr; + if (!data->head) + data->head = list; + else + data->tail->next = list; + data->tail = list; + return 0; + +err: + cond_av_list_destroy(data->head); + data->head = NULL; + return -1; +} + +static int cond_read_av_list(struct policydb *p, void *fp, struct cond_av_list **ret_list, struct cond_av_list *other) +{ + int i, rc; + __le32 buf[1]; + u32 len; + struct cond_insertf_data data; + + *ret_list = NULL; + + len = 0; + rc = next_entry(buf, fp, sizeof(u32)); + if (rc < 0) + return -1; - list = kmalloc(sizeof(struct cond_av_list), GFP_KERNEL); - if (!list) - goto err; - memset(list, 0, sizeof(struct cond_av_list)); + len = le32_to_cpu(buf[0]); + if (len == 0) { + return 0; + } - list->node = node_ptr; - if (i == 0) - *ret_list = list; - else - last->next = list; - last = list; + data.p = p; + data.other = other; + data.head = NULL; + data.tail = NULL; + for (i = 0; i < len; i++) { + rc = avtab_read_item(fp, p->policyvers, &p->te_cond_avtab, cond_insertf, &data); + if (rc) + return rc; } + *ret_list = data.head; return 0; -err: - cond_av_list_destroy(*ret_list); - *ret_list = NULL; - return -1; } static int expr_isvalid(struct policydb *p, struct cond_expr *expr) @@ -364,40 +383,42 @@ static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp) { - u32 *buf; - int len, i; + __le32 buf[2]; + u32 len, i; + int rc; struct cond_expr *expr = NULL, *last = NULL; - buf = next_entry(fp, sizeof(u32)); - if (!buf) + rc = next_entry(buf, fp, sizeof(u32)); + if (rc < 0) return -1; node->cur_state = le32_to_cpu(buf[0]); len = 0; - buf = next_entry(fp, sizeof(u32)); - if (!buf) + rc = next_entry(buf, fp, sizeof(u32)); + if (rc < 0) return -1; /* expr */ len = le32_to_cpu(buf[0]); for (i = 0; i < len; i++ ) { - buf = next_entry(fp, sizeof(u32) * 2); - if (!buf) + rc = next_entry(buf, fp, sizeof(u32) * 2); + if (rc < 0) goto err; - expr = kmalloc(sizeof(struct cond_expr), GFP_KERNEL); + expr = kzalloc(sizeof(struct cond_expr), GFP_KERNEL); if (!expr) { goto err; } - memset(expr, 0, sizeof(struct cond_expr)); expr->expr_type = le32_to_cpu(buf[0]); expr->bool = le32_to_cpu(buf[1]); - if (!expr_isvalid(p, expr)) + if (!expr_isvalid(p, expr)) { + kfree(expr); goto err; + } if (i == 0) { node->expr = expr; @@ -420,20 +441,20 @@ int cond_read_list(struct policydb *p, void *fp) { struct cond_node *node, *last = NULL; - u32 *buf; - int i, len; + __le32 buf[1]; + u32 i, len; + int rc; - buf = next_entry(fp, sizeof(u32)); - if (!buf) + rc = next_entry(buf, fp, sizeof buf); + if (rc < 0) return -1; len = le32_to_cpu(buf[0]); for (i = 0; i < len; i++) { - node = kmalloc(sizeof(struct cond_node), GFP_KERNEL); + node = kzalloc(sizeof(struct cond_node), GFP_KERNEL); if (!node) goto err; - memset(node, 0, sizeof(struct cond_node)); if (cond_read_node(p, node, fp) != 0) goto err; @@ -448,6 +469,7 @@ return 0; err: cond_list_destroy(p->cond_list); + p->cond_list = NULL; return -1; } @@ -461,22 +483,22 @@ if(!ctab || !key || !avd) return; - for(node = avtab_search_node(ctab, key, AVTAB_AV); node != NULL; - node = avtab_search_node_next(node, AVTAB_AV)) { - if ( (u32) (AVTAB_ALLOWED|AVTAB_ENABLED) == - (node->datum.specified & (AVTAB_ALLOWED|AVTAB_ENABLED))) - avd->allowed |= avtab_allowed(&node->datum); - if ( (u32) (AVTAB_AUDITDENY|AVTAB_ENABLED) == - (node->datum.specified & (AVTAB_AUDITDENY|AVTAB_ENABLED))) + for(node = avtab_search_node(ctab, key); node != NULL; + node = avtab_search_node_next(node, key->specified)) { + if ( (u16) (AVTAB_ALLOWED|AVTAB_ENABLED) == + (node->key.specified & (AVTAB_ALLOWED|AVTAB_ENABLED))) + avd->allowed |= node->datum.data; + if ( (u16) (AVTAB_AUDITDENY|AVTAB_ENABLED) == + (node->key.specified & (AVTAB_AUDITDENY|AVTAB_ENABLED))) /* Since a '0' in an auditdeny mask represents a * permission we do NOT want to audit (dontaudit), we use * the '&' operand to ensure that all '0's in the mask * are retained (much unlike the allow and auditallow cases). */ - avd->auditdeny &= avtab_auditdeny(&node->datum); - if ( (u32) (AVTAB_AUDITALLOW|AVTAB_ENABLED) == - (node->datum.specified & (AVTAB_AUDITALLOW|AVTAB_ENABLED))) - avd->auditallow |= avtab_auditallow(&node->datum); + avd->auditdeny &= node->datum.data; + if ( (u16) (AVTAB_AUDITALLOW|AVTAB_ENABLED) == + (node->key.specified & (AVTAB_AUDITALLOW|AVTAB_ENABLED))) + avd->auditallow |= node->datum.data; } return; } ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/constraint.h#5 (text+ko) ==== @@ -31,6 +31,13 @@ #define CEXPR_ROLE 2 /* role */ #define CEXPR_TYPE 4 /* type */ #define CEXPR_TARGET 8 /* target if set, source otherwise */ +#define CEXPR_XTARGET 16 /* special 3rd target for validatetrans rule */ +#define CEXPR_L1L2 32 /* low level 1 vs. low level 2 */ +#define CEXPR_L1H2 64 /* low level 1 vs. high level 2 */ +#define CEXPR_H1L2 128 /* high level 1 vs. low level 2 */ +#define CEXPR_H1H2 256 /* high level 1 vs. high level 2 */ +#define CEXPR_L1H1 512 /* low level 1 vs. high level 1 */ +#define CEXPR_L2H2 1024 /* low level 2 vs. high level 2 */ u32 attr; /* attribute */ #define CEXPR_EQ 1 /* == or eq */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/context.h#5 (text+ko) ==== @@ -17,6 +17,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 14:39:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05C1416A48B for ; Thu, 20 Apr 2006 14:39:30 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B18843D46 for ; Thu, 20 Apr 2006 14:39:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 17C2946CFB for ; Thu, 20 Apr 2006 10:39:29 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5E7615720A; Thu, 20 Apr 2006 14:39:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4376A16A407; Thu, 20 Apr 2006 14:39:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 159A216A400 for ; Thu, 20 Apr 2006 14:39:28 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D483443D45 for ; Thu, 20 Apr 2006 14:39:27 +0000 (GMT) (envelope-from millert@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 k3KEdRqK059040 for ; Thu, 20 Apr 2006 14:39:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KEdR9M059027 for perforce@freebsd.org; Thu, 20 Apr 2006 14:39:27 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 14:39:27 GMT Message-Id: <200604201439.k3KEdR9M059027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95679 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 14:39:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=95679 Change 95679 by millert@millert_g5tower on 2006/04/20 14:38:54 Add back avtab_map() since security_get_file_sids() needs it. Expand an instance of avtab_allowed() I missed. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.c#6 (text+ko) ==== @@ -238,6 +238,31 @@ h->htable = NULL; } + +int avtab_map(struct avtab *h, + int (*apply) (struct avtab_key *k, + struct avtab_datum *d, + void *args), + void *args) +{ + int i, ret; + struct avtab_node *cur; + + if (!h) + return 0; + + for (i = 0; i < AVTAB_SIZE; i++) { + cur = h->htable[i]; + while (cur != NULL) { + ret = apply(&cur->key, &cur->datum, args); + if (ret) + return ret; + cur = cur->next; + } + } + return 0; +} + int avtab_init(struct avtab *h) { int i; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.h#6 (text+ko) ==== @@ -55,6 +55,11 @@ int avtab_init(struct avtab *); struct avtab_datum *avtab_search(struct avtab *h, struct avtab_key *k); void avtab_destroy(struct avtab *h); +int avtab_map(struct avtab *h, + int (*apply) (struct avtab_key *k, + struct avtab_datum *d, + void *args), + void *args); void avtab_hash_eval(struct avtab *h, char *tag); int avtab_read_item(void *fp, u32 vers, struct avtab *a, ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.c#10 (text+ko) ==== @@ -1624,7 +1624,7 @@ if (avk->source_type != p->scon->type || avk->target_class != p->sclass || (specified & AVTAB_AV) == 0 || - (avtab_allowed(avd) & COMMON_FILE__RELABELTO) == 0) + (avd->data & COMMON_FILE__RELABELTO) == 0) return 0; fc.type = avk->target_type; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 14:40:35 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB60C16A406 for ; Thu, 20 Apr 2006 14:40:35 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B766243D46 for ; Thu, 20 Apr 2006 14:40:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0FF4646CFD for ; Thu, 20 Apr 2006 10:40:34 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6120672547; Thu, 20 Apr 2006 14:40:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EB17116A402; Thu, 20 Apr 2006 14:40:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CA9C316A400 for ; Thu, 20 Apr 2006 14:40:29 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9422E43D45 for ; Thu, 20 Apr 2006 14:40:29 +0000 (GMT) (envelope-from millert@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 k3KEeTsJ059827 for ; Thu, 20 Apr 2006 14:40:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KEeTa6059821 for perforce@freebsd.org; Thu, 20 Apr 2006 14:40:29 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 14:40:29 GMT Message-Id: <200604201440.k3KEeTa6059821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95680 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 14:40:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=95680 Change 95680 by millert@millert_g5tower on 2006/04/20 14:40:00 Use a zone allocator for the avtab cache. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.c#7 (text+ko) ==== @@ -20,19 +20,24 @@ #include #include +#include + #define AVTAB_HASH(keyp) \ ((keyp->target_class + \ (keyp->target_type << 2) + \ (keyp->source_type << 9)) & \ AVTAB_HASH_MASK) +zone_t avtab_node_cachep; + static struct avtab_node* avtab_insert_node(struct avtab *h, int hvalue, struct avtab_node * prev, struct avtab_node * cur, struct avtab_key *key, struct avtab_datum *datum) { struct avtab_node * newnode; - newnode = kmalloc(sizeof(*newnode), GFP_KERNEL); + /* XXX - should use non-blocking zalloc */ + newnode = (struct avtab_node *)zalloc(avtab_node_cachep); if (newnode == NULL) return NULL; memset(newnode, 0, sizeof(struct avtab_node)); @@ -464,17 +469,13 @@ void avtab_cache_init(void) { -/* XXX - use zone allocator */ -#ifdef SEBSDnotyet - avtab_node_cachep = kmem_cache_create("avtab_node", - sizeof(struct avtab_node), - 0, SLAB_PANIC, NULL, NULL); -#endif + // XXX - we can probably do a better job of packing items into the zone + avtab_node_cachep = zinit(sizeof(struct avtab_node), + 4096 * sizeof(struct avtab_node), 16 * sizeof(struct avtab_node), + "avtab node"); } void avtab_cache_destroy(void) { -#ifdef SEBSDnotyet - kmem_cache_destroy (avtab_node_cachep); -#endif + /* Darwin does not provide a way to destroy a zone. */ } From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 14:43:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F93216A409 for ; Thu, 20 Apr 2006 14:43:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E059343D45 for ; Thu, 20 Apr 2006 14:43:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7A4CC46D02 for ; Thu, 20 Apr 2006 10:43:52 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 51C97583AA; Thu, 20 Apr 2006 14:43:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 49D3D16A408; Thu, 20 Apr 2006 14:43:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 184E216A401 for ; Thu, 20 Apr 2006 14:43:42 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4EF943D5D for ; Thu, 20 Apr 2006 14:43:40 +0000 (GMT) (envelope-from millert@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 k3KEheUR062329 for ; Thu, 20 Apr 2006 14:43:40 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KEheIA062313 for perforce@freebsd.org; Thu, 20 Apr 2006 14:43:40 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 14:43:40 GMT Message-Id: <200604201443.k3KEheIA062313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95681 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 14:43:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=95681 Change 95681 by millert@millert_g5tower on 2006/04/20 14:42:40 Use proc_has_security() not cred_has_security(). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#12 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#12 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002 Networks Associates Technology, Inc. - * Copyright (c) 2005, 2006 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by NAI Labs, the @@ -84,7 +84,7 @@ void *kdata; int rc; - rc = cred_has_security(td->p_ucred, SECURITY__LOAD_POLICY); + rc = proc_has_security(td, SECURITY__LOAD_POLICY); if (rc) return (rc); @@ -362,7 +362,7 @@ { char *str; - error = cred_has_security(td->p_ucred, SECURITY__SETBOOL); + error = proc_has_security(td, SECURITY__SETBOOL); if (error) return (error); @@ -383,7 +383,7 @@ } case SEBSDCALL_COMMIT_BOOLS: - error = cred_has_security(td->p_ucred, SECURITY__SETBOOL); + error = proc_has_security(td, SECURITY__SETBOOL); if (error) return (error); return (security_commit_pending_bools()); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 15:11:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49F0A16A400 for ; Thu, 20 Apr 2006 15:11:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9645B43D45 for ; Thu, 20 Apr 2006 15:11:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0D7FB46D1C for ; Thu, 20 Apr 2006 11:11:17 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E4E9155BC9; Thu, 20 Apr 2006 15:11:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DF63A16A409; Thu, 20 Apr 2006 15:11:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B552016A405 for ; Thu, 20 Apr 2006 15:11:14 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F2D343D45 for ; Thu, 20 Apr 2006 15:11:14 +0000 (GMT) (envelope-from millert@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 k3KFBE8U076145 for ; Thu, 20 Apr 2006 15:11:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KFBE0U076136 for perforce@freebsd.org; Thu, 20 Apr 2006 15:11:14 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 15:11:14 GMT Message-Id: <200604201511.k3KFBE0U076136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95682 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 15:11:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=95682 Change 95682 by millert@millert_g5tower on 2006/04/20 15:10:53 Include string.h to get strchr() proto Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mls.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mls.c#5 (text+ko) ==== @@ -11,6 +11,8 @@ * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. */ +#include + #include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 15:32:49 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BE5616A400 for ; Thu, 20 Apr 2006 15:32:49 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 117B843D48 for ; Thu, 20 Apr 2006 15:32:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 59F3546C4B for ; Thu, 20 Apr 2006 11:32:45 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 326455585A; Thu, 20 Apr 2006 15:32:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 55A8E16A404; Thu, 20 Apr 2006 15:32:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 12B8F16A402 for ; Thu, 20 Apr 2006 15:32:43 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2B4C43D48 for ; Thu, 20 Apr 2006 15:32:42 +0000 (GMT) (envelope-from millert@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 k3KFWgSr088135 for ; Thu, 20 Apr 2006 15:32:42 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KFWgMn088129 for perforce@freebsd.org; Thu, 20 Apr 2006 15:32:42 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 15:32:42 GMT Message-Id: <200604201532.k3KFWgMn088129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95684 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 15:32:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=95684 Change 95684 by millert@millert_g5tower on 2006/04/20 15:32:03 Merge in the new av cache code. Since Darwin doesn't have rcu style locking, use rwlocks instead. In the future, it may be possible to reduce the amount of time we hold a write lock by doing atomic list operations (which is what Linux does). The new avc code expects different versions of the generated flask .h files so mkaccess_vector.sh and mkflask.sh have been updated based on policy-1.28. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_inherit.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#10 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.c#13 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc.h#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/avc_ss.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/class_to_string.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/common_perm_to_string.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask.h#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/mkaccess_vector.sh#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/mkflask.sh#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#15 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#40 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_labels.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#13 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#8 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#12 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_inherit.h#4 (text+ko) ==== @@ -1,37 +1,21 @@ /* This file is automatically generated. Do not edit. */ -/* FLASK */ - -typedef struct -{ - u16 tclass; - char **common_pts; - u32 common_base; -} av_inherit_t; - -static av_inherit_t av_inherit[] = { - { SECCLASS_DIR, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_LNK_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_CHR_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_BLK_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_SOCK_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_FIFO_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_TCP_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_UDP_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_RAWIP_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_NETLINK_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_PACKET_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_KEY_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_UNIX_STREAM_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_UNIX_DGRAM_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_IPC, common_ipc_perm_to_string, 0x0000000000000200UL }, - { SECCLASS_SEM, common_ipc_perm_to_string, 0x0000000000000200UL }, - { SECCLASS_MSGQ, common_ipc_perm_to_string, 0x0000000000000200UL }, - { SECCLASS_SHM, common_ipc_perm_to_string, 0x0000000000000200UL }, -}; - -#define AV_INHERIT_SIZE (sizeof(av_inherit)/sizeof(av_inherit_t)) - - -/* FLASK */ + S_(SECCLASS_DIR, file, 0x00100000UL) + S_(SECCLASS_FILE, file, 0x00100000UL) + S_(SECCLASS_LNK_FILE, file, 0x00100000UL) + S_(SECCLASS_CHR_FILE, file, 0x00100000UL) + S_(SECCLASS_BLK_FILE, file, 0x00100000UL) + S_(SECCLASS_SOCK_FILE, file, 0x00100000UL) + S_(SECCLASS_FIFO_FILE, file, 0x00100000UL) + S_(SECCLASS_SOCKET, socket, 0x01000000UL) + S_(SECCLASS_TCP_SOCKET, socket, 0x01000000UL) + S_(SECCLASS_UDP_SOCKET, socket, 0x01000000UL) + S_(SECCLASS_RAWIP_SOCKET, socket, 0x01000000UL) + S_(SECCLASS_NETLINK_SOCKET, socket, 0x01000000UL) + S_(SECCLASS_PACKET_SOCKET, socket, 0x01000000UL) + S_(SECCLASS_KEY_SOCKET, socket, 0x01000000UL) + S_(SECCLASS_UNIX_STREAM_SOCKET, socket, 0x01000000UL) + S_(SECCLASS_UNIX_DGRAM_SOCKET, socket, 0x01000000UL) + S_(SECCLASS_IPC, ipc, 0x00000200UL) + S_(SECCLASS_SEM, ipc, 0x00000200UL) + S_(SECCLASS_MSGQ, ipc, 0x00000200UL) + S_(SECCLASS_SHM, ipc, 0x00000200UL) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#10 (text+ko) ==== @@ -1,148 +1,132 @@ /* This file is automatically generated. Do not edit. */ -/* FLASK */ - -typedef struct -{ - u16 tclass; - u32 value; - char *name; -} av_perm_to_string_t; - -static av_perm_to_string_t av_perm_to_string[] = { - { SECCLASS_FILESYSTEM, FILESYSTEM__MOUNT, "mount" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__REMOUNT, "remount" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__UNMOUNT, "unmount" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__GETATTR, "getattr" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__RELABELFROM, "relabelfrom" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__RELABELTO, "relabelto" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__TRANSITION, "transition" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, "associate" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__QUOTAMOD, "quotamod" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__QUOTAGET, "quotaget" }, - { SECCLASS_DIR, DIR__ADD_NAME, "add_name" }, - { SECCLASS_DIR, DIR__REMOVE_NAME, "remove_name" }, - { SECCLASS_DIR, DIR__REPARENT, "reparent" }, - { SECCLASS_DIR, DIR__SEARCH, "search" }, - { SECCLASS_DIR, DIR__RMDIR, "rmdir" }, - { SECCLASS_FILE, FILE__EXECUTE_NO_TRANS, "execute_no_trans" }, - { SECCLASS_FILE, FILE__ENTRYPOINT, "entrypoint" }, - { SECCLASS_FD, FD__CREATE, "create" }, - { SECCLASS_FD, FD__USE, "use" }, - { SECCLASS_TCP_SOCKET, TCP_SOCKET__CONNECTTO, "connectto" }, - { SECCLASS_TCP_SOCKET, TCP_SOCKET__NEWCONN, "newconn" }, - { SECCLASS_TCP_SOCKET, TCP_SOCKET__ACCEPTFROM, "acceptfrom" }, - { SECCLASS_TCP_SOCKET, TCP_SOCKET__NODE_BIND, "node_bind" }, - { SECCLASS_UDP_SOCKET, UDP_SOCKET__NODE_BIND, "node_bind" }, - { SECCLASS_RAWIP_SOCKET, RAWIP_SOCKET__NODE_BIND, "node_bind" }, - { SECCLASS_NODE, NODE__TCP_RECV, "tcp_recv" }, - { SECCLASS_NODE, NODE__TCP_SEND, "tcp_send" }, - { SECCLASS_NODE, NODE__UDP_RECV, "udp_recv" }, - { SECCLASS_NODE, NODE__UDP_SEND, "udp_send" }, - { SECCLASS_NODE, NODE__RAWIP_RECV, "rawip_recv" }, - { SECCLASS_NODE, NODE__RAWIP_SEND, "rawip_send" }, - { SECCLASS_NODE, NODE__ENFORCE_DEST, "enforce_dest" }, - { SECCLASS_NETIF, NETIF__GETATTR, "getattr" }, - { SECCLASS_NETIF, NETIF__SETATTR, "setattr" }, - { SECCLASS_NETIF, NETIF__TCP_RECV, "tcp_recv" }, - { SECCLASS_NETIF, NETIF__TCP_SEND, "tcp_send" }, - { SECCLASS_NETIF, NETIF__UDP_RECV, "udp_recv" }, - { SECCLASS_NETIF, NETIF__UDP_SEND, "udp_send" }, - { SECCLASS_NETIF, NETIF__RAWIP_RECV, "rawip_recv" }, - { SECCLASS_NETIF, NETIF__RAWIP_SEND, "rawip_send" }, - { SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__CONNECTTO, "connectto" }, - { SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__NEWCONN, "newconn" }, - { SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__ACCEPTFROM, "acceptfrom" }, - { SECCLASS_PROCESS, PROCESS__FORK, "fork" }, - { SECCLASS_PROCESS, PROCESS__TRANSITION, "transition" }, - { SECCLASS_PROCESS, PROCESS__SIGCHLD, "sigchld" }, - { SECCLASS_PROCESS, PROCESS__SIGKILL, "sigkill" }, - { SECCLASS_PROCESS, PROCESS__SIGSTOP, "sigstop" }, - { SECCLASS_PROCESS, PROCESS__SIGNULL, "signull" }, - { SECCLASS_PROCESS, PROCESS__SIGNAL, "signal" }, - { SECCLASS_PROCESS, PROCESS__PTRACE, "ptrace" }, - { SECCLASS_PROCESS, PROCESS__GETSCHED, "getsched" }, - { SECCLASS_PROCESS, PROCESS__SETSCHED, "setsched" }, - { SECCLASS_PROCESS, PROCESS__GETSESSION, "getsession" }, - { SECCLASS_PROCESS, PROCESS__GETPGID, "getpgid" }, - { SECCLASS_PROCESS, PROCESS__SETPGID, "setpgid" }, - { SECCLASS_PROCESS, PROCESS__GETCAP, "getcap" }, - { SECCLASS_PROCESS, PROCESS__SETCAP, "setcap" }, - { SECCLASS_PROCESS, PROCESS__SHARE, "share" }, - { SECCLASS_PROCESS, PROCESS__GETATTR, "getattr" }, - { SECCLASS_PROCESS, PROCESS__SETEXEC, "setexec" }, - { SECCLASS_PROCESS, PROCESS__SETFSCREATE, "setfscreate" }, - { SECCLASS_PROCESS, PROCESS__NOATSECURE, "noatsecure" }, - { SECCLASS_PROCESS, PROCESS__SIGINH, "siginh" }, - { SECCLASS_PROCESS, PROCESS__SETRLIMIT, "setrlimit" }, - { SECCLASS_PROCESS, PROCESS__RLIMITINH, "rlimitinh" }, - { SECCLASS_PROCESS, PROCESS__DYNTRANSITION, "dyntransition" }, - { SECCLASS_MSGQ, MSGQ__ENQUEUE, "enqueue" }, - { SECCLASS_MSG, MSG__SEND, "send" }, - { SECCLASS_MSG, MSG__RECEIVE, "receive" }, - { SECCLASS_MSG, MSG__DESTROY, "destroy" }, - { SECCLASS_SHM, SHM__LOCK, "lock" }, - { SECCLASS_SECURITY, SECURITY__COMPUTE_AV, "compute_av" }, - { SECCLASS_SECURITY, SECURITY__COMPUTE_CREATE, "compute_create" }, - { SECCLASS_SECURITY, SECURITY__COMPUTE_MEMBER, "compute_member" }, - { SECCLASS_SECURITY, SECURITY__CHECK_CONTEXT, "check_context" }, - { SECCLASS_SECURITY, SECURITY__LOAD_POLICY, "load_policy" }, - { SECCLASS_SECURITY, SECURITY__COMPUTE_RELABEL, "compute_relabel" }, - { SECCLASS_SECURITY, SECURITY__COMPUTE_USER, "compute_user" }, - { SECCLASS_SECURITY, SECURITY__SETENFORCE, "setenforce" }, - { SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool" }, - { SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info" }, - { SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read" }, - { SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod" }, - { SECCLASS_SYSTEM, SYSTEM__SYSLOG_CONSOLE, "syslog_console" }, - { SECCLASS_CAPABILITY, CAPABILITY__CHOWN, "chown" }, - { SECCLASS_CAPABILITY, CAPABILITY__DAC_EXECUTE, "dac_execute" }, - { SECCLASS_CAPABILITY, CAPABILITY__DAC_WRITE, "dac_write" }, - { SECCLASS_CAPABILITY, CAPABILITY__DAC_READ_SEARCH, "dac_read_search" }, - { SECCLASS_CAPABILITY, CAPABILITY__FOWNER, "fowner" }, - { SECCLASS_CAPABILITY, CAPABILITY__FSETID, "fsetid" }, - { SECCLASS_CAPABILITY, CAPABILITY__KILL, "kill" }, - { SECCLASS_CAPABILITY, CAPABILITY__SETFCAP, "setfcap" }, - { SECCLASS_CAPABILITY, CAPABILITY__SETGID, "setgid" }, - { SECCLASS_CAPABILITY, CAPABILITY__SETUID, "setuid" }, - { SECCLASS_CAPABILITY, CAPABILITY__AUDIT_CONTROL, "audit_control" }, - { SECCLASS_CAPABILITY, CAPABILITY__AUDIT_WRITE, "audit_write" }, - { SECCLASS_CAPABILITY, CAPABILITY__LINUX_IMMUTABLE, "linux_immutable" }, - { SECCLASS_CAPABILITY, CAPABILITY__NET_BIND_SERVICE, "net_bind_service" }, - { SECCLASS_CAPABILITY, CAPABILITY__NET_BROADCAST, "net_broadcast" }, - { SECCLASS_CAPABILITY, CAPABILITY__NET_ADMIN, "net_admin" }, - { SECCLASS_CAPABILITY, CAPABILITY__NET_RAW, "net_raw" }, - { SECCLASS_CAPABILITY, CAPABILITY__IPC_LOCK, "ipc_lock" }, - { SECCLASS_CAPABILITY, CAPABILITY__IPC_OWNER, "ipc_owner" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_MODULE, "sys_module" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_RAWIO, "sys_rawio" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_CHROOT, "sys_chroot" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_PTRACE, "sys_ptrace" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_PACCT, "sys_pacct" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_ADMIN, "sys_admin" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_BOOT, "sys_boot" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_NICE, "sys_nice" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_RESOURCE, "sys_resource" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_TIME, "sys_time" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_TTY_CONFIG, "sys_tty_config" }, - { SECCLASS_CAPABILITY, CAPABILITY__MKNOD, "mknod" }, - { SECCLASS_MACH_PORT, MACH_PORT__RELABELFROM, "relabelfrom" }, - { SECCLASS_MACH_PORT, MACH_PORT__RELABELTO, "relabelto" }, - { SECCLASS_MACH_PORT, MACH_PORT__SEND, "send" }, - { SECCLASS_MACH_PORT, MACH_PORT__RECV, "recv" }, - { SECCLASS_MACH_PORT, MACH_PORT__MAKE_SEND, "make_send" }, - { SECCLASS_MACH_PORT, MACH_PORT__MAKE_SEND_ONCE, "make_send_once" }, - { SECCLASS_MACH_PORT, MACH_PORT__COPY_SEND, "copy_send" }, - { SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND, "move_send" }, - { SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND_ONCE, "move_send_once" }, - { SECCLASS_MACH_PORT, MACH_PORT__MOVE_RECV, "move_recv" }, - { SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND, "hold_send" }, - { SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND_ONCE, "hold_send_once" }, - { SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV, "hold_recv" }, - { SECCLASS_MACH_TASK, MACH_TASK__TERMINATE, "terminate" }, - { SECCLASS_MACH_TASK, MACH_TASK__SET_SPECIAL_PORT, "set_special_port" }, -}; - -#define AV_PERM_TO_STRING_SIZE (sizeof(av_perm_to_string)/sizeof(av_perm_to_string_t)) - - -/* FLASK */ + S_(SECCLASS_FILESYSTEM, FILESYSTEM__MOUNT, "mount") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__REMOUNT, "remount") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__UNMOUNT, "unmount") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__GETATTR, "getattr") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__RELABELFROM, "relabelfrom") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__RELABELTO, "relabelto") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__TRANSITION, "transition") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, "associate") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__QUOTAMOD, "quotamod") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__QUOTAGET, "quotaget") + S_(SECCLASS_DIR, DIR__ADD_NAME, "add_name") + S_(SECCLASS_DIR, DIR__REMOVE_NAME, "remove_name") + S_(SECCLASS_DIR, DIR__REPARENT, "reparent") + S_(SECCLASS_DIR, DIR__SEARCH, "search") + S_(SECCLASS_DIR, DIR__RMDIR, "rmdir") + S_(SECCLASS_FILE, FILE__EXECUTE_NO_TRANS, "execute_no_trans") + S_(SECCLASS_FILE, FILE__ENTRYPOINT, "entrypoint") + S_(SECCLASS_FD, FD__CREATE, "create") + S_(SECCLASS_FD, FD__USE, "use") + S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__CONNECTTO, "connectto") + S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NEWCONN, "newconn") + S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__ACCEPTFROM, "acceptfrom") + S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NODE_BIND, "node_bind") + S_(SECCLASS_UDP_SOCKET, UDP_SOCKET__NODE_BIND, "node_bind") + S_(SECCLASS_RAWIP_SOCKET, RAWIP_SOCKET__NODE_BIND, "node_bind") + S_(SECCLASS_NODE, NODE__TCP_RECV, "tcp_recv") + S_(SECCLASS_NODE, NODE__TCP_SEND, "tcp_send") + S_(SECCLASS_NODE, NODE__UDP_RECV, "udp_recv") + S_(SECCLASS_NODE, NODE__UDP_SEND, "udp_send") + S_(SECCLASS_NODE, NODE__RAWIP_RECV, "rawip_recv") + S_(SECCLASS_NODE, NODE__RAWIP_SEND, "rawip_send") + S_(SECCLASS_NODE, NODE__ENFORCE_DEST, "enforce_dest") + S_(SECCLASS_NETIF, NETIF__GETATTR, "getattr") + S_(SECCLASS_NETIF, NETIF__SETATTR, "setattr") + S_(SECCLASS_NETIF, NETIF__TCP_RECV, "tcp_recv") + S_(SECCLASS_NETIF, NETIF__TCP_SEND, "tcp_send") + S_(SECCLASS_NETIF, NETIF__UDP_RECV, "udp_recv") + S_(SECCLASS_NETIF, NETIF__UDP_SEND, "udp_send") + S_(SECCLASS_NETIF, NETIF__RAWIP_RECV, "rawip_recv") + S_(SECCLASS_NETIF, NETIF__RAWIP_SEND, "rawip_send") + S_(SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__CONNECTTO, "connectto") + S_(SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__NEWCONN, "newconn") + S_(SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__ACCEPTFROM, "acceptfrom") + S_(SECCLASS_PROCESS, PROCESS__FORK, "fork") + S_(SECCLASS_PROCESS, PROCESS__TRANSITION, "transition") + S_(SECCLASS_PROCESS, PROCESS__SIGCHLD, "sigchld") + S_(SECCLASS_PROCESS, PROCESS__SIGKILL, "sigkill") + S_(SECCLASS_PROCESS, PROCESS__SIGSTOP, "sigstop") + S_(SECCLASS_PROCESS, PROCESS__SIGNULL, "signull") + S_(SECCLASS_PROCESS, PROCESS__SIGNAL, "signal") + S_(SECCLASS_PROCESS, PROCESS__PTRACE, "ptrace") + S_(SECCLASS_PROCESS, PROCESS__GETSCHED, "getsched") + S_(SECCLASS_PROCESS, PROCESS__SETSCHED, "setsched") + S_(SECCLASS_PROCESS, PROCESS__GETSESSION, "getsession") + S_(SECCLASS_PROCESS, PROCESS__GETPGID, "getpgid") + S_(SECCLASS_PROCESS, PROCESS__SETPGID, "setpgid") + S_(SECCLASS_PROCESS, PROCESS__GETCAP, "getcap") + S_(SECCLASS_PROCESS, PROCESS__SETCAP, "setcap") + S_(SECCLASS_PROCESS, PROCESS__SHARE, "share") + S_(SECCLASS_PROCESS, PROCESS__GETATTR, "getattr") + S_(SECCLASS_PROCESS, PROCESS__SETEXEC, "setexec") + S_(SECCLASS_PROCESS, PROCESS__SETFSCREATE, "setfscreate") + S_(SECCLASS_PROCESS, PROCESS__NOATSECURE, "noatsecure") + S_(SECCLASS_PROCESS, PROCESS__SIGINH, "siginh") + S_(SECCLASS_PROCESS, PROCESS__SETRLIMIT, "setrlimit") + S_(SECCLASS_PROCESS, PROCESS__RLIMITINH, "rlimitinh") + S_(SECCLASS_PROCESS, PROCESS__DYNTRANSITION, "dyntransition") + S_(SECCLASS_MSGQ, MSGQ__ENQUEUE, "enqueue") + S_(SECCLASS_MSG, MSG__SEND, "send") + S_(SECCLASS_MSG, MSG__RECEIVE, "receive") + S_(SECCLASS_MSG, MSG__DESTROY, "destroy") + S_(SECCLASS_SHM, SHM__LOCK, "lock") + S_(SECCLASS_SECURITY, SECURITY__COMPUTE_AV, "compute_av") + S_(SECCLASS_SECURITY, SECURITY__COMPUTE_CREATE, "compute_create") + S_(SECCLASS_SECURITY, SECURITY__COMPUTE_MEMBER, "compute_member") + S_(SECCLASS_SECURITY, SECURITY__CHECK_CONTEXT, "check_context") + S_(SECCLASS_SECURITY, SECURITY__LOAD_POLICY, "load_policy") + S_(SECCLASS_SECURITY, SECURITY__COMPUTE_RELABEL, "compute_relabel") + S_(SECCLASS_SECURITY, SECURITY__COMPUTE_USER, "compute_user") + S_(SECCLASS_SECURITY, SECURITY__SETENFORCE, "setenforce") + S_(SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool") + S_(SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info") + S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read") + S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod") + S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_CONSOLE, "syslog_console") + S_(SECCLASS_CAPABILITY, CAPABILITY__CHOWN, "chown") + S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_EXECUTE, "dac_execute") + S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_WRITE, "dac_write") + S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_READ_SEARCH, "dac_read_search") + S_(SECCLASS_CAPABILITY, CAPABILITY__FOWNER, "fowner") + S_(SECCLASS_CAPABILITY, CAPABILITY__FSETID, "fsetid") + S_(SECCLASS_CAPABILITY, CAPABILITY__KILL, "kill") + S_(SECCLASS_CAPABILITY, CAPABILITY__SETFCAP, "setfcap") + S_(SECCLASS_CAPABILITY, CAPABILITY__SETGID, "setgid") + S_(SECCLASS_CAPABILITY, CAPABILITY__SETUID, "setuid") + S_(SECCLASS_CAPABILITY, CAPABILITY__AUDIT_CONTROL, "audit_control") + S_(SECCLASS_CAPABILITY, CAPABILITY__AUDIT_WRITE, "audit_write") + S_(SECCLASS_CAPABILITY, CAPABILITY__LINUX_IMMUTABLE, "linux_immutable") + S_(SECCLASS_CAPABILITY, CAPABILITY__NET_BIND_SERVICE, "net_bind_service") + S_(SECCLASS_CAPABILITY, CAPABILITY__NET_BROADCAST, "net_broadcast") + S_(SECCLASS_CAPABILITY, CAPABILITY__NET_ADMIN, "net_admin") + S_(SECCLASS_CAPABILITY, CAPABILITY__NET_RAW, "net_raw") + S_(SECCLASS_CAPABILITY, CAPABILITY__IPC_LOCK, "ipc_lock") + S_(SECCLASS_CAPABILITY, CAPABILITY__IPC_OWNER, "ipc_owner") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_MODULE, "sys_module") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_RAWIO, "sys_rawio") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_CHROOT, "sys_chroot") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_PTRACE, "sys_ptrace") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_PACCT, "sys_pacct") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_ADMIN, "sys_admin") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_BOOT, "sys_boot") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_NICE, "sys_nice") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_RESOURCE, "sys_resource") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_TIME, "sys_time") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_TTY_CONFIG, "sys_tty_config") + S_(SECCLASS_CAPABILITY, CAPABILITY__MKNOD, "mknod") + S_(SECCLASS_MACH_PORT, MACH_PORT__RELABELFROM, "relabelfrom") + S_(SECCLASS_MACH_PORT, MACH_PORT__RELABELTO, "relabelto") + S_(SECCLASS_MACH_PORT, MACH_PORT__SEND, "send") + S_(SECCLASS_MACH_PORT, MACH_PORT__RECV, "recv") + S_(SECCLASS_MACH_PORT, MACH_PORT__MAKE_SEND, "make_send") + S_(SECCLASS_MACH_PORT, MACH_PORT__MAKE_SEND_ONCE, "make_send_once") + S_(SECCLASS_MACH_PORT, MACH_PORT__COPY_SEND, "copy_send") + S_(SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND, "move_send") + S_(SECCLASS_MACH_PORT, MACH_PORT__MOVE_SEND_ONCE, "move_send_once") + S_(SECCLASS_MACH_PORT, MACH_PORT__MOVE_RECV, "move_recv") + S_(SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND, "hold_send") + S_(SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND_ONCE, "hold_send_once") + S_(SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV, "hold_recv") + S_(SECCLASS_MACH_TASK, MACH_TASK__TERMINATE, "terminate") + S_(SECCLASS_MACH_TASK, MACH_TASK__SET_SPECIAL_PORT, "set_special_port") ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#9 (text+ko) ==== @@ -1,623 +1,619 @@ /* This file is automatically generated. Do not edit. */ -/* FLASK */ +#define COMMON_FILE__POLL 0x00000001UL +#define COMMON_FILE__IOCTL 0x00000002UL +#define COMMON_FILE__READ 0x00000004UL +#define COMMON_FILE__WRITE 0x00000008UL +#define COMMON_FILE__CREATE 0x00000010UL +#define COMMON_FILE__GETATTR 0x00000020UL +#define COMMON_FILE__SETATTR 0x00000040UL +#define COMMON_FILE__LOCK 0x00000080UL +#define COMMON_FILE__RELABELFROM 0x00000100UL +#define COMMON_FILE__RELABELTO 0x00000200UL +#define COMMON_FILE__TRANSITION 0x00000400UL +#define COMMON_FILE__APPEND 0x00000800UL +#define COMMON_FILE__ACCESS 0x00001000UL +#define COMMON_FILE__UNLINK 0x00002000UL +#define COMMON_FILE__LINK 0x00004000UL +#define COMMON_FILE__RENAME 0x00008000UL +#define COMMON_FILE__EXECUTE 0x00010000UL +#define COMMON_FILE__SWAPON 0x00020000UL +#define COMMON_FILE__QUOTAON 0x00040000UL +#define COMMON_FILE__MOUNTON 0x00080000UL -#define COMMON_FILE__POLL 0x0000000000000001UL -#define COMMON_FILE__IOCTL 0x0000000000000002UL -#define COMMON_FILE__READ 0x0000000000000004UL -#define COMMON_FILE__WRITE 0x0000000000000008UL -#define COMMON_FILE__CREATE 0x0000000000000010UL -#define COMMON_FILE__GETATTR 0x0000000000000020UL -#define COMMON_FILE__SETATTR 0x0000000000000040UL -#define COMMON_FILE__LOCK 0x0000000000000080UL -#define COMMON_FILE__RELABELFROM 0x0000000000000100UL -#define COMMON_FILE__RELABELTO 0x0000000000000200UL -#define COMMON_FILE__TRANSITION 0x0000000000000400UL -#define COMMON_FILE__APPEND 0x0000000000000800UL -#define COMMON_FILE__ACCESS 0x0000000000001000UL -#define COMMON_FILE__UNLINK 0x0000000000002000UL -#define COMMON_FILE__LINK 0x0000000000004000UL -#define COMMON_FILE__RENAME 0x0000000000008000UL -#define COMMON_FILE__EXECUTE 0x0000000000010000UL -#define COMMON_FILE__SWAPON 0x0000000000020000UL -#define COMMON_FILE__QUOTAON 0x0000000000040000UL -#define COMMON_FILE__MOUNTON 0x0000000000080000UL +#define COMMON_SOCKET__POLL 0x00000001UL +#define COMMON_SOCKET__IOCTL 0x00000002UL +#define COMMON_SOCKET__READ 0x00000004UL +#define COMMON_SOCKET__WRITE 0x00000008UL +#define COMMON_SOCKET__CREATE 0x00000010UL +#define COMMON_SOCKET__GETATTR 0x00000020UL +#define COMMON_SOCKET__SETATTR 0x00000040UL +#define COMMON_SOCKET__LOCK 0x00000080UL +#define COMMON_SOCKET__RELABELFROM 0x00000100UL +#define COMMON_SOCKET__RELABELTO 0x00000200UL +#define COMMON_SOCKET__TRANSITION 0x00000400UL +#define COMMON_SOCKET__APPEND 0x00000800UL +#define COMMON_SOCKET__BIND 0x00001000UL +#define COMMON_SOCKET__CONNECT 0x00002000UL +#define COMMON_SOCKET__LISTEN 0x00004000UL +#define COMMON_SOCKET__ACCEPT 0x00008000UL +#define COMMON_SOCKET__GETOPT 0x00010000UL +#define COMMON_SOCKET__SETOPT 0x00020000UL +#define COMMON_SOCKET__SHUTDOWN 0x00040000UL +#define COMMON_SOCKET__RECVFROM 0x00080000UL +#define COMMON_SOCKET__SENDTO 0x00100000UL +#define COMMON_SOCKET__RECV_MSG 0x00200000UL +#define COMMON_SOCKET__SEND_MSG 0x00400000UL +#define COMMON_SOCKET__NAME_BIND 0x00800000UL -#define COMMON_SOCKET__POLL 0x0000000000000001UL -#define COMMON_SOCKET__IOCTL 0x0000000000000002UL -#define COMMON_SOCKET__READ 0x0000000000000004UL -#define COMMON_SOCKET__WRITE 0x0000000000000008UL -#define COMMON_SOCKET__CREATE 0x0000000000000010UL -#define COMMON_SOCKET__GETATTR 0x0000000000000020UL -#define COMMON_SOCKET__SETATTR 0x0000000000000040UL -#define COMMON_SOCKET__LOCK 0x0000000000000080UL -#define COMMON_SOCKET__RELABELFROM 0x0000000000000100UL -#define COMMON_SOCKET__RELABELTO 0x0000000000000200UL -#define COMMON_SOCKET__TRANSITION 0x0000000000000400UL -#define COMMON_SOCKET__APPEND 0x0000000000000800UL -#define COMMON_SOCKET__BIND 0x0000000000001000UL -#define COMMON_SOCKET__CONNECT 0x0000000000002000UL -#define COMMON_SOCKET__LISTEN 0x0000000000004000UL -#define COMMON_SOCKET__ACCEPT 0x0000000000008000UL -#define COMMON_SOCKET__GETOPT 0x0000000000010000UL -#define COMMON_SOCKET__SETOPT 0x0000000000020000UL -#define COMMON_SOCKET__SHUTDOWN 0x0000000000040000UL -#define COMMON_SOCKET__RECVFROM 0x0000000000080000UL -#define COMMON_SOCKET__SENDTO 0x0000000000100000UL -#define COMMON_SOCKET__RECV_MSG 0x0000000000200000UL -#define COMMON_SOCKET__SEND_MSG 0x0000000000400000UL -#define COMMON_SOCKET__NAME_BIND 0x0000000000800000UL +#define COMMON_IPC__CREATE 0x00000001UL +#define COMMON_IPC__DESTROY 0x00000002UL +#define COMMON_IPC__GETATTR 0x00000004UL +#define COMMON_IPC__SETATTR 0x00000008UL +#define COMMON_IPC__READ 0x00000010UL +#define COMMON_IPC__WRITE 0x00000020UL +#define COMMON_IPC__ASSOCIATE 0x00000040UL +#define COMMON_IPC__UNIX_READ 0x00000080UL +#define COMMON_IPC__UNIX_WRITE 0x00000100UL -#define COMMON_IPC__CREATE 0x0000000000000001UL -#define COMMON_IPC__DESTROY 0x0000000000000002UL -#define COMMON_IPC__GETATTR 0x0000000000000004UL -#define COMMON_IPC__SETATTR 0x0000000000000008UL -#define COMMON_IPC__READ 0x0000000000000010UL -#define COMMON_IPC__WRITE 0x0000000000000020UL -#define COMMON_IPC__ASSOCIATE 0x0000000000000040UL -#define COMMON_IPC__UNIX_READ 0x0000000000000080UL -#define COMMON_IPC__UNIX_WRITE 0x0000000000000100UL +#define FILESYSTEM__MOUNT 0x00000001UL +#define FILESYSTEM__REMOUNT 0x00000002UL +#define FILESYSTEM__UNMOUNT 0x00000004UL +#define FILESYSTEM__GETATTR 0x00000008UL +#define FILESYSTEM__RELABELFROM 0x00000010UL +#define FILESYSTEM__RELABELTO 0x00000020UL +#define FILESYSTEM__TRANSITION 0x00000040UL +#define FILESYSTEM__ASSOCIATE 0x00000080UL +#define FILESYSTEM__QUOTAMOD 0x00000100UL +#define FILESYSTEM__QUOTAGET 0x00000200UL -#define FILESYSTEM__MOUNT 0x0000000000000001UL -#define FILESYSTEM__REMOUNT 0x0000000000000002UL -#define FILESYSTEM__UNMOUNT 0x0000000000000004UL -#define FILESYSTEM__GETATTR 0x0000000000000008UL -#define FILESYSTEM__RELABELFROM 0x0000000000000010UL -#define FILESYSTEM__RELABELTO 0x0000000000000020UL -#define FILESYSTEM__TRANSITION 0x0000000000000040UL -#define FILESYSTEM__ASSOCIATE 0x0000000000000080UL -#define FILESYSTEM__QUOTAMOD 0x0000000000000100UL -#define FILESYSTEM__QUOTAGET 0x0000000000000200UL +#define DIR__POLL 0x00000001UL +#define DIR__IOCTL 0x00000002UL +#define DIR__READ 0x00000004UL +#define DIR__WRITE 0x00000008UL +#define DIR__CREATE 0x00000010UL +#define DIR__GETATTR 0x00000020UL +#define DIR__SETATTR 0x00000040UL +#define DIR__LOCK 0x00000080UL +#define DIR__RELABELFROM 0x00000100UL +#define DIR__RELABELTO 0x00000200UL +#define DIR__TRANSITION 0x00000400UL +#define DIR__APPEND 0x00000800UL +#define DIR__ACCESS 0x00001000UL +#define DIR__UNLINK 0x00002000UL +#define DIR__LINK 0x00004000UL +#define DIR__RENAME 0x00008000UL +#define DIR__EXECUTE 0x00010000UL +#define DIR__SWAPON 0x00020000UL +#define DIR__QUOTAON 0x00040000UL +#define DIR__MOUNTON 0x00080000UL -#define DIR__WRITE 0x0000000000000008UL -#define DIR__EXECUTE 0x0000000000010000UL -#define DIR__RENAME 0x0000000000008000UL -#define DIR__READ 0x0000000000000004UL -#define DIR__CREATE 0x0000000000000010UL -#define DIR__SETATTR 0x0000000000000040UL -#define DIR__LINK 0x0000000000004000UL -#define DIR__IOCTL 0x0000000000000002UL -#define DIR__QUOTAON 0x0000000000040000UL -#define DIR__APPEND 0x0000000000000800UL -#define DIR__RELABELTO 0x0000000000000200UL -#define DIR__MOUNTON 0x0000000000080000UL -#define DIR__RELABELFROM 0x0000000000000100UL -#define DIR__TRANSITION 0x0000000000000400UL -#define DIR__GETATTR 0x0000000000000020UL -#define DIR__POLL 0x0000000000000001UL -#define DIR__SWAPON 0x0000000000020000UL -#define DIR__ACCESS 0x0000000000001000UL -#define DIR__UNLINK 0x0000000000002000UL -#define DIR__LOCK 0x0000000000000080UL +#define DIR__ADD_NAME 0x00100000UL +#define DIR__REMOVE_NAME 0x00200000UL +#define DIR__REPARENT 0x00400000UL +#define DIR__SEARCH 0x00800000UL +#define DIR__RMDIR 0x01000000UL -#define DIR__ADD_NAME 0x0000000000100000UL -#define DIR__REMOVE_NAME 0x0000000000200000UL -#define DIR__REPARENT 0x0000000000400000UL -#define DIR__SEARCH 0x0000000000800000UL -#define DIR__RMDIR 0x0000000001000000UL +#define FILE__POLL 0x00000001UL +#define FILE__IOCTL 0x00000002UL +#define FILE__READ 0x00000004UL +#define FILE__WRITE 0x00000008UL +#define FILE__CREATE 0x00000010UL +#define FILE__GETATTR 0x00000020UL +#define FILE__SETATTR 0x00000040UL +#define FILE__LOCK 0x00000080UL +#define FILE__RELABELFROM 0x00000100UL +#define FILE__RELABELTO 0x00000200UL +#define FILE__TRANSITION 0x00000400UL +#define FILE__APPEND 0x00000800UL +#define FILE__ACCESS 0x00001000UL +#define FILE__UNLINK 0x00002000UL +#define FILE__LINK 0x00004000UL +#define FILE__RENAME 0x00008000UL +#define FILE__EXECUTE 0x00010000UL +#define FILE__SWAPON 0x00020000UL +#define FILE__QUOTAON 0x00040000UL +#define FILE__MOUNTON 0x00080000UL -#define FILE__WRITE 0x0000000000000008UL -#define FILE__EXECUTE 0x0000000000010000UL -#define FILE__RENAME 0x0000000000008000UL -#define FILE__READ 0x0000000000000004UL -#define FILE__CREATE 0x0000000000000010UL -#define FILE__SETATTR 0x0000000000000040UL -#define FILE__LINK 0x0000000000004000UL -#define FILE__IOCTL 0x0000000000000002UL -#define FILE__QUOTAON 0x0000000000040000UL -#define FILE__APPEND 0x0000000000000800UL -#define FILE__RELABELTO 0x0000000000000200UL -#define FILE__MOUNTON 0x0000000000080000UL -#define FILE__RELABELFROM 0x0000000000000100UL -#define FILE__TRANSITION 0x0000000000000400UL -#define FILE__GETATTR 0x0000000000000020UL -#define FILE__POLL 0x0000000000000001UL -#define FILE__SWAPON 0x0000000000020000UL -#define FILE__ACCESS 0x0000000000001000UL -#define FILE__UNLINK 0x0000000000002000UL -#define FILE__LOCK 0x0000000000000080UL +#define FILE__EXECUTE_NO_TRANS 0x00100000UL +#define FILE__ENTRYPOINT 0x00200000UL -#define FILE__EXECUTE_NO_TRANS 0x0000000000100000UL -#define FILE__ENTRYPOINT 0x0000000000200000UL +#define LNK_FILE__POLL 0x00000001UL +#define LNK_FILE__IOCTL 0x00000002UL +#define LNK_FILE__READ 0x00000004UL +#define LNK_FILE__WRITE 0x00000008UL +#define LNK_FILE__CREATE 0x00000010UL +#define LNK_FILE__GETATTR 0x00000020UL +#define LNK_FILE__SETATTR 0x00000040UL +#define LNK_FILE__LOCK 0x00000080UL +#define LNK_FILE__RELABELFROM 0x00000100UL +#define LNK_FILE__RELABELTO 0x00000200UL +#define LNK_FILE__TRANSITION 0x00000400UL +#define LNK_FILE__APPEND 0x00000800UL +#define LNK_FILE__ACCESS 0x00001000UL +#define LNK_FILE__UNLINK 0x00002000UL +#define LNK_FILE__LINK 0x00004000UL +#define LNK_FILE__RENAME 0x00008000UL +#define LNK_FILE__EXECUTE 0x00010000UL +#define LNK_FILE__SWAPON 0x00020000UL +#define LNK_FILE__QUOTAON 0x00040000UL +#define LNK_FILE__MOUNTON 0x00080000UL -#define LNK_FILE__WRITE 0x0000000000000008UL -#define LNK_FILE__EXECUTE 0x0000000000010000UL -#define LNK_FILE__RENAME 0x0000000000008000UL -#define LNK_FILE__READ 0x0000000000000004UL -#define LNK_FILE__CREATE 0x0000000000000010UL -#define LNK_FILE__SETATTR 0x0000000000000040UL -#define LNK_FILE__LINK 0x0000000000004000UL -#define LNK_FILE__IOCTL 0x0000000000000002UL -#define LNK_FILE__QUOTAON 0x0000000000040000UL -#define LNK_FILE__APPEND 0x0000000000000800UL -#define LNK_FILE__RELABELTO 0x0000000000000200UL -#define LNK_FILE__MOUNTON 0x0000000000080000UL -#define LNK_FILE__RELABELFROM 0x0000000000000100UL -#define LNK_FILE__TRANSITION 0x0000000000000400UL -#define LNK_FILE__GETATTR 0x0000000000000020UL -#define LNK_FILE__POLL 0x0000000000000001UL -#define LNK_FILE__SWAPON 0x0000000000020000UL -#define LNK_FILE__ACCESS 0x0000000000001000UL -#define LNK_FILE__UNLINK 0x0000000000002000UL -#define LNK_FILE__LOCK 0x0000000000000080UL +#define CHR_FILE__POLL 0x00000001UL +#define CHR_FILE__IOCTL 0x00000002UL +#define CHR_FILE__READ 0x00000004UL +#define CHR_FILE__WRITE 0x00000008UL +#define CHR_FILE__CREATE 0x00000010UL +#define CHR_FILE__GETATTR 0x00000020UL +#define CHR_FILE__SETATTR 0x00000040UL +#define CHR_FILE__LOCK 0x00000080UL +#define CHR_FILE__RELABELFROM 0x00000100UL +#define CHR_FILE__RELABELTO 0x00000200UL +#define CHR_FILE__TRANSITION 0x00000400UL +#define CHR_FILE__APPEND 0x00000800UL +#define CHR_FILE__ACCESS 0x00001000UL +#define CHR_FILE__UNLINK 0x00002000UL +#define CHR_FILE__LINK 0x00004000UL +#define CHR_FILE__RENAME 0x00008000UL +#define CHR_FILE__EXECUTE 0x00010000UL +#define CHR_FILE__SWAPON 0x00020000UL +#define CHR_FILE__QUOTAON 0x00040000UL +#define CHR_FILE__MOUNTON 0x00080000UL -#define CHR_FILE__WRITE 0x0000000000000008UL -#define CHR_FILE__EXECUTE 0x0000000000010000UL -#define CHR_FILE__RENAME 0x0000000000008000UL -#define CHR_FILE__READ 0x0000000000000004UL -#define CHR_FILE__CREATE 0x0000000000000010UL -#define CHR_FILE__SETATTR 0x0000000000000040UL -#define CHR_FILE__LINK 0x0000000000004000UL -#define CHR_FILE__IOCTL 0x0000000000000002UL -#define CHR_FILE__QUOTAON 0x0000000000040000UL -#define CHR_FILE__APPEND 0x0000000000000800UL -#define CHR_FILE__RELABELTO 0x0000000000000200UL -#define CHR_FILE__MOUNTON 0x0000000000080000UL -#define CHR_FILE__RELABELFROM 0x0000000000000100UL -#define CHR_FILE__TRANSITION 0x0000000000000400UL -#define CHR_FILE__GETATTR 0x0000000000000020UL -#define CHR_FILE__POLL 0x0000000000000001UL -#define CHR_FILE__SWAPON 0x0000000000020000UL -#define CHR_FILE__ACCESS 0x0000000000001000UL -#define CHR_FILE__UNLINK 0x0000000000002000UL -#define CHR_FILE__LOCK 0x0000000000000080UL +#define BLK_FILE__POLL 0x00000001UL +#define BLK_FILE__IOCTL 0x00000002UL +#define BLK_FILE__READ 0x00000004UL +#define BLK_FILE__WRITE 0x00000008UL +#define BLK_FILE__CREATE 0x00000010UL +#define BLK_FILE__GETATTR 0x00000020UL +#define BLK_FILE__SETATTR 0x00000040UL +#define BLK_FILE__LOCK 0x00000080UL +#define BLK_FILE__RELABELFROM 0x00000100UL +#define BLK_FILE__RELABELTO 0x00000200UL +#define BLK_FILE__TRANSITION 0x00000400UL +#define BLK_FILE__APPEND 0x00000800UL +#define BLK_FILE__ACCESS 0x00001000UL +#define BLK_FILE__UNLINK 0x00002000UL +#define BLK_FILE__LINK 0x00004000UL +#define BLK_FILE__RENAME 0x00008000UL +#define BLK_FILE__EXECUTE 0x00010000UL +#define BLK_FILE__SWAPON 0x00020000UL +#define BLK_FILE__QUOTAON 0x00040000UL +#define BLK_FILE__MOUNTON 0x00080000UL -#define BLK_FILE__WRITE 0x0000000000000008UL -#define BLK_FILE__EXECUTE 0x0000000000010000UL -#define BLK_FILE__RENAME 0x0000000000008000UL -#define BLK_FILE__READ 0x0000000000000004UL -#define BLK_FILE__CREATE 0x0000000000000010UL -#define BLK_FILE__SETATTR 0x0000000000000040UL -#define BLK_FILE__LINK 0x0000000000004000UL -#define BLK_FILE__IOCTL 0x0000000000000002UL -#define BLK_FILE__QUOTAON 0x0000000000040000UL -#define BLK_FILE__APPEND 0x0000000000000800UL -#define BLK_FILE__RELABELTO 0x0000000000000200UL -#define BLK_FILE__MOUNTON 0x0000000000080000UL -#define BLK_FILE__RELABELFROM 0x0000000000000100UL -#define BLK_FILE__TRANSITION 0x0000000000000400UL -#define BLK_FILE__GETATTR 0x0000000000000020UL -#define BLK_FILE__POLL 0x0000000000000001UL -#define BLK_FILE__SWAPON 0x0000000000020000UL -#define BLK_FILE__ACCESS 0x0000000000001000UL -#define BLK_FILE__UNLINK 0x0000000000002000UL -#define BLK_FILE__LOCK 0x0000000000000080UL +#define SOCK_FILE__POLL 0x00000001UL +#define SOCK_FILE__IOCTL 0x00000002UL +#define SOCK_FILE__READ 0x00000004UL +#define SOCK_FILE__WRITE 0x00000008UL +#define SOCK_FILE__CREATE 0x00000010UL +#define SOCK_FILE__GETATTR 0x00000020UL +#define SOCK_FILE__SETATTR 0x00000040UL +#define SOCK_FILE__LOCK 0x00000080UL +#define SOCK_FILE__RELABELFROM 0x00000100UL +#define SOCK_FILE__RELABELTO 0x00000200UL +#define SOCK_FILE__TRANSITION 0x00000400UL +#define SOCK_FILE__APPEND 0x00000800UL +#define SOCK_FILE__ACCESS 0x00001000UL +#define SOCK_FILE__UNLINK 0x00002000UL +#define SOCK_FILE__LINK 0x00004000UL +#define SOCK_FILE__RENAME 0x00008000UL +#define SOCK_FILE__EXECUTE 0x00010000UL +#define SOCK_FILE__SWAPON 0x00020000UL +#define SOCK_FILE__QUOTAON 0x00040000UL +#define SOCK_FILE__MOUNTON 0x00080000UL -#define SOCK_FILE__WRITE 0x0000000000000008UL -#define SOCK_FILE__EXECUTE 0x0000000000010000UL -#define SOCK_FILE__RENAME 0x0000000000008000UL -#define SOCK_FILE__READ 0x0000000000000004UL -#define SOCK_FILE__CREATE 0x0000000000000010UL -#define SOCK_FILE__SETATTR 0x0000000000000040UL -#define SOCK_FILE__LINK 0x0000000000004000UL -#define SOCK_FILE__IOCTL 0x0000000000000002UL -#define SOCK_FILE__QUOTAON 0x0000000000040000UL -#define SOCK_FILE__APPEND 0x0000000000000800UL -#define SOCK_FILE__RELABELTO 0x0000000000000200UL -#define SOCK_FILE__MOUNTON 0x0000000000080000UL -#define SOCK_FILE__RELABELFROM 0x0000000000000100UL -#define SOCK_FILE__TRANSITION 0x0000000000000400UL -#define SOCK_FILE__GETATTR 0x0000000000000020UL -#define SOCK_FILE__POLL 0x0000000000000001UL -#define SOCK_FILE__SWAPON 0x0000000000020000UL -#define SOCK_FILE__ACCESS 0x0000000000001000UL -#define SOCK_FILE__UNLINK 0x0000000000002000UL -#define SOCK_FILE__LOCK 0x0000000000000080UL +#define FIFO_FILE__POLL 0x00000001UL +#define FIFO_FILE__IOCTL 0x00000002UL +#define FIFO_FILE__READ 0x00000004UL +#define FIFO_FILE__WRITE 0x00000008UL +#define FIFO_FILE__CREATE 0x00000010UL +#define FIFO_FILE__GETATTR 0x00000020UL +#define FIFO_FILE__SETATTR 0x00000040UL +#define FIFO_FILE__LOCK 0x00000080UL +#define FIFO_FILE__RELABELFROM 0x00000100UL +#define FIFO_FILE__RELABELTO 0x00000200UL +#define FIFO_FILE__TRANSITION 0x00000400UL +#define FIFO_FILE__APPEND 0x00000800UL +#define FIFO_FILE__ACCESS 0x00001000UL +#define FIFO_FILE__UNLINK 0x00002000UL +#define FIFO_FILE__LINK 0x00004000UL +#define FIFO_FILE__RENAME 0x00008000UL +#define FIFO_FILE__EXECUTE 0x00010000UL +#define FIFO_FILE__SWAPON 0x00020000UL +#define FIFO_FILE__QUOTAON 0x00040000UL +#define FIFO_FILE__MOUNTON 0x00080000UL -#define FIFO_FILE__WRITE 0x0000000000000008UL -#define FIFO_FILE__EXECUTE 0x0000000000010000UL -#define FIFO_FILE__RENAME 0x0000000000008000UL -#define FIFO_FILE__READ 0x0000000000000004UL -#define FIFO_FILE__CREATE 0x0000000000000010UL -#define FIFO_FILE__SETATTR 0x0000000000000040UL -#define FIFO_FILE__LINK 0x0000000000004000UL -#define FIFO_FILE__IOCTL 0x0000000000000002UL -#define FIFO_FILE__QUOTAON 0x0000000000040000UL -#define FIFO_FILE__APPEND 0x0000000000000800UL -#define FIFO_FILE__RELABELTO 0x0000000000000200UL -#define FIFO_FILE__MOUNTON 0x0000000000080000UL -#define FIFO_FILE__RELABELFROM 0x0000000000000100UL -#define FIFO_FILE__TRANSITION 0x0000000000000400UL -#define FIFO_FILE__GETATTR 0x0000000000000020UL -#define FIFO_FILE__POLL 0x0000000000000001UL -#define FIFO_FILE__SWAPON 0x0000000000020000UL -#define FIFO_FILE__ACCESS 0x0000000000001000UL -#define FIFO_FILE__UNLINK 0x0000000000002000UL -#define FIFO_FILE__LOCK 0x0000000000000080UL +#define FD__CREATE 0x00000001UL +#define FD__USE 0x00000002UL -#define FD__CREATE 0x0000000000000001UL -#define FD__USE 0x0000000000000002UL +#define SOCKET__POLL 0x00000001UL +#define SOCKET__IOCTL 0x00000002UL +#define SOCKET__READ 0x00000004UL +#define SOCKET__WRITE 0x00000008UL +#define SOCKET__CREATE 0x00000010UL +#define SOCKET__GETATTR 0x00000020UL +#define SOCKET__SETATTR 0x00000040UL +#define SOCKET__LOCK 0x00000080UL +#define SOCKET__RELABELFROM 0x00000100UL +#define SOCKET__RELABELTO 0x00000200UL +#define SOCKET__TRANSITION 0x00000400UL +#define SOCKET__APPEND 0x00000800UL +#define SOCKET__BIND 0x00001000UL +#define SOCKET__CONNECT 0x00002000UL +#define SOCKET__LISTEN 0x00004000UL +#define SOCKET__ACCEPT 0x00008000UL +#define SOCKET__GETOPT 0x00010000UL +#define SOCKET__SETOPT 0x00020000UL +#define SOCKET__SHUTDOWN 0x00040000UL +#define SOCKET__RECVFROM 0x00080000UL +#define SOCKET__SENDTO 0x00100000UL +#define SOCKET__RECV_MSG 0x00200000UL +#define SOCKET__SEND_MSG 0x00400000UL +#define SOCKET__NAME_BIND 0x00800000UL -#define SOCKET__TRANSITION 0x0000000000000400UL -#define SOCKET__SHUTDOWN 0x0000000000040000UL -#define SOCKET__POLL 0x0000000000000001UL -#define SOCKET__SEND_MSG 0x0000000000400000UL -#define SOCKET__LOCK 0x0000000000000080UL -#define SOCKET__RECVFROM 0x0000000000080000UL -#define SOCKET__BIND 0x0000000000001000UL -#define SOCKET__ACCEPT 0x0000000000008000UL -#define SOCKET__RELABELFROM 0x0000000000000100UL -#define SOCKET__GETOPT 0x0000000000010000UL -#define SOCKET__WRITE 0x0000000000000008UL -#define SOCKET__SETATTR 0x0000000000000040UL -#define SOCKET__READ 0x0000000000000004UL -#define SOCKET__NAME_BIND 0x0000000000800000UL -#define SOCKET__LISTEN 0x0000000000004000UL -#define SOCKET__CREATE 0x0000000000000010UL -#define SOCKET__SETOPT 0x0000000000020000UL -#define SOCKET__RECV_MSG 0x0000000000200000UL -#define SOCKET__SENDTO 0x0000000000100000UL -#define SOCKET__GETATTR 0x0000000000000020UL -#define SOCKET__CONNECT 0x0000000000002000UL -#define SOCKET__APPEND 0x0000000000000800UL -#define SOCKET__IOCTL 0x0000000000000002UL -#define SOCKET__RELABELTO 0x0000000000000200UL +#define TCP_SOCKET__POLL 0x00000001UL +#define TCP_SOCKET__IOCTL 0x00000002UL +#define TCP_SOCKET__READ 0x00000004UL +#define TCP_SOCKET__WRITE 0x00000008UL +#define TCP_SOCKET__CREATE 0x00000010UL +#define TCP_SOCKET__GETATTR 0x00000020UL +#define TCP_SOCKET__SETATTR 0x00000040UL +#define TCP_SOCKET__LOCK 0x00000080UL +#define TCP_SOCKET__RELABELFROM 0x00000100UL +#define TCP_SOCKET__RELABELTO 0x00000200UL +#define TCP_SOCKET__TRANSITION 0x00000400UL +#define TCP_SOCKET__APPEND 0x00000800UL +#define TCP_SOCKET__BIND 0x00001000UL +#define TCP_SOCKET__CONNECT 0x00002000UL +#define TCP_SOCKET__LISTEN 0x00004000UL +#define TCP_SOCKET__ACCEPT 0x00008000UL +#define TCP_SOCKET__GETOPT 0x00010000UL +#define TCP_SOCKET__SETOPT 0x00020000UL +#define TCP_SOCKET__SHUTDOWN 0x00040000UL +#define TCP_SOCKET__RECVFROM 0x00080000UL +#define TCP_SOCKET__SENDTO 0x00100000UL +#define TCP_SOCKET__RECV_MSG 0x00200000UL +#define TCP_SOCKET__SEND_MSG 0x00400000UL +#define TCP_SOCKET__NAME_BIND 0x00800000UL -#define TCP_SOCKET__TRANSITION 0x0000000000000400UL -#define TCP_SOCKET__SHUTDOWN 0x0000000000040000UL -#define TCP_SOCKET__POLL 0x0000000000000001UL -#define TCP_SOCKET__SEND_MSG 0x0000000000400000UL -#define TCP_SOCKET__LOCK 0x0000000000000080UL -#define TCP_SOCKET__RECVFROM 0x0000000000080000UL -#define TCP_SOCKET__BIND 0x0000000000001000UL -#define TCP_SOCKET__ACCEPT 0x0000000000008000UL -#define TCP_SOCKET__RELABELFROM 0x0000000000000100UL -#define TCP_SOCKET__GETOPT 0x0000000000010000UL -#define TCP_SOCKET__WRITE 0x0000000000000008UL -#define TCP_SOCKET__SETATTR 0x0000000000000040UL -#define TCP_SOCKET__READ 0x0000000000000004UL -#define TCP_SOCKET__NAME_BIND 0x0000000000800000UL -#define TCP_SOCKET__LISTEN 0x0000000000004000UL -#define TCP_SOCKET__CREATE 0x0000000000000010UL -#define TCP_SOCKET__SETOPT 0x0000000000020000UL -#define TCP_SOCKET__RECV_MSG 0x0000000000200000UL -#define TCP_SOCKET__SENDTO 0x0000000000100000UL -#define TCP_SOCKET__GETATTR 0x0000000000000020UL -#define TCP_SOCKET__CONNECT 0x0000000000002000UL -#define TCP_SOCKET__APPEND 0x0000000000000800UL -#define TCP_SOCKET__IOCTL 0x0000000000000002UL -#define TCP_SOCKET__RELABELTO 0x0000000000000200UL +#define TCP_SOCKET__CONNECTTO 0x01000000UL +#define TCP_SOCKET__NEWCONN 0x02000000UL +#define TCP_SOCKET__ACCEPTFROM 0x04000000UL +#define TCP_SOCKET__NODE_BIND 0x08000000UL -#define TCP_SOCKET__CONNECTTO 0x0000000001000000UL -#define TCP_SOCKET__NEWCONN 0x0000000002000000UL -#define TCP_SOCKET__ACCEPTFROM 0x0000000004000000UL -#define TCP_SOCKET__NODE_BIND 0x0000000008000000UL +#define UDP_SOCKET__POLL 0x00000001UL +#define UDP_SOCKET__IOCTL 0x00000002UL +#define UDP_SOCKET__READ 0x00000004UL +#define UDP_SOCKET__WRITE 0x00000008UL +#define UDP_SOCKET__CREATE 0x00000010UL +#define UDP_SOCKET__GETATTR 0x00000020UL +#define UDP_SOCKET__SETATTR 0x00000040UL +#define UDP_SOCKET__LOCK 0x00000080UL +#define UDP_SOCKET__RELABELFROM 0x00000100UL +#define UDP_SOCKET__RELABELTO 0x00000200UL +#define UDP_SOCKET__TRANSITION 0x00000400UL +#define UDP_SOCKET__APPEND 0x00000800UL +#define UDP_SOCKET__BIND 0x00001000UL +#define UDP_SOCKET__CONNECT 0x00002000UL +#define UDP_SOCKET__LISTEN 0x00004000UL +#define UDP_SOCKET__ACCEPT 0x00008000UL +#define UDP_SOCKET__GETOPT 0x00010000UL +#define UDP_SOCKET__SETOPT 0x00020000UL +#define UDP_SOCKET__SHUTDOWN 0x00040000UL +#define UDP_SOCKET__RECVFROM 0x00080000UL +#define UDP_SOCKET__SENDTO 0x00100000UL +#define UDP_SOCKET__RECV_MSG 0x00200000UL +#define UDP_SOCKET__SEND_MSG 0x00400000UL +#define UDP_SOCKET__NAME_BIND 0x00800000UL -#define UDP_SOCKET__TRANSITION 0x0000000000000400UL -#define UDP_SOCKET__SHUTDOWN 0x0000000000040000UL -#define UDP_SOCKET__POLL 0x0000000000000001UL -#define UDP_SOCKET__SEND_MSG 0x0000000000400000UL -#define UDP_SOCKET__LOCK 0x0000000000000080UL -#define UDP_SOCKET__RECVFROM 0x0000000000080000UL -#define UDP_SOCKET__BIND 0x0000000000001000UL -#define UDP_SOCKET__ACCEPT 0x0000000000008000UL -#define UDP_SOCKET__RELABELFROM 0x0000000000000100UL -#define UDP_SOCKET__GETOPT 0x0000000000010000UL -#define UDP_SOCKET__WRITE 0x0000000000000008UL -#define UDP_SOCKET__SETATTR 0x0000000000000040UL -#define UDP_SOCKET__READ 0x0000000000000004UL -#define UDP_SOCKET__NAME_BIND 0x0000000000800000UL -#define UDP_SOCKET__LISTEN 0x0000000000004000UL -#define UDP_SOCKET__CREATE 0x0000000000000010UL -#define UDP_SOCKET__SETOPT 0x0000000000020000UL -#define UDP_SOCKET__RECV_MSG 0x0000000000200000UL -#define UDP_SOCKET__SENDTO 0x0000000000100000UL -#define UDP_SOCKET__GETATTR 0x0000000000000020UL -#define UDP_SOCKET__CONNECT 0x0000000000002000UL -#define UDP_SOCKET__APPEND 0x0000000000000800UL -#define UDP_SOCKET__IOCTL 0x0000000000000002UL -#define UDP_SOCKET__RELABELTO 0x0000000000000200UL +#define UDP_SOCKET__NODE_BIND 0x01000000UL -#define UDP_SOCKET__NODE_BIND 0x0000000001000000UL +#define RAWIP_SOCKET__POLL 0x00000001UL +#define RAWIP_SOCKET__IOCTL 0x00000002UL +#define RAWIP_SOCKET__READ 0x00000004UL +#define RAWIP_SOCKET__WRITE 0x00000008UL +#define RAWIP_SOCKET__CREATE 0x00000010UL +#define RAWIP_SOCKET__GETATTR 0x00000020UL +#define RAWIP_SOCKET__SETATTR 0x00000040UL +#define RAWIP_SOCKET__LOCK 0x00000080UL +#define RAWIP_SOCKET__RELABELFROM 0x00000100UL +#define RAWIP_SOCKET__RELABELTO 0x00000200UL +#define RAWIP_SOCKET__TRANSITION 0x00000400UL +#define RAWIP_SOCKET__APPEND 0x00000800UL +#define RAWIP_SOCKET__BIND 0x00001000UL +#define RAWIP_SOCKET__CONNECT 0x00002000UL +#define RAWIP_SOCKET__LISTEN 0x00004000UL +#define RAWIP_SOCKET__ACCEPT 0x00008000UL +#define RAWIP_SOCKET__GETOPT 0x00010000UL >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 15:39:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E3D4E16A40D for ; Thu, 20 Apr 2006 15:39:18 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A16043D91 for ; Thu, 20 Apr 2006 15:39:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9924546C4B for ; Thu, 20 Apr 2006 11:39:00 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DD04D72948; Thu, 20 Apr 2006 15:38:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D508816A436; Thu, 20 Apr 2006 15:38:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8205416A433 for ; Thu, 20 Apr 2006 15:38:59 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01A2A43D55 for ; Thu, 20 Apr 2006 15:38:50 +0000 (GMT) (envelope-from millert@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 k3KFco47093093 for ; Thu, 20 Apr 2006 15:38:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KFcoC1093087 for perforce@freebsd.org; Thu, 20 Apr 2006 15:38:50 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 15:38:50 GMT Message-Id: <200604201538.k3KFcoC1093087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95685 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 15:39:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=95685 Change 95685 by millert@millert_g5tower on 2006/04/20 15:38:13 Remove files that are no longer used. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/fileutils.c#4 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/fileutils.h#4 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 15:42:20 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C398716A432 for ; Thu, 20 Apr 2006 15:42:20 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70D0E43D66 for ; Thu, 20 Apr 2006 15:42:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8B58046C56 for ; Thu, 20 Apr 2006 11:42:03 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 421957280D; Thu, 20 Apr 2006 15:42:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C6DC16A437; Thu, 20 Apr 2006 15:42:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 06D0C16A432 for ; Thu, 20 Apr 2006 15:42:02 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5437143D69 for ; Thu, 20 Apr 2006 15:41:55 +0000 (GMT) (envelope-from millert@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 k3KFftBB095361 for ; Thu, 20 Apr 2006 15:41:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KFftq3095348 for perforce@freebsd.org; Thu, 20 Apr 2006 15:41:55 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 15:41:55 GMT Message-Id: <200604201541.k3KFftq3095348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95687 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 15:42:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=95687 Change 95687 by millert@millert_g5tower on 2006/04/20 15:41:36 Use OSSwapInt* functions for byte swapping. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/Makeconfig.in#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#16 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/Makeconfig.in#4 (text+ko) ==== @@ -33,7 +33,7 @@ MANGRP= $(EXPORT_OWNER) BINDIR= /usr/bin -DARWIN_HDRS = -I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/osfmk -I$(EXPORT_HDRS) +DARWIN_HDRS = -I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/osfmk -I$(EXPORT_HDRS)/libkern -I$(EXPORT_HDRS) LIBMAC = -L$(DARWIN_ROOT)/libmac -lmac LIBEXTATTR = -L$(DARWIN_ROOT)/libextattr -lextattr LIBBSM = -L$(DARWIN_ROOT)/bsm/bsm/lib -lbsm ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#16 (text+ko) ==== From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 15:42:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 367BA16A402 for ; Thu, 20 Apr 2006 15:42:59 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BB1743D70 for ; Thu, 20 Apr 2006 15:42:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D914A46C66 for ; Thu, 20 Apr 2006 11:42:57 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5F08C5C5AD; Thu, 20 Apr 2006 15:42:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5805916A40B; Thu, 20 Apr 2006 15:42:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 341D416A402 for ; Thu, 20 Apr 2006 15:42:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F24B043D6D for ; Thu, 20 Apr 2006 15:42:56 +0000 (GMT) (envelope-from millert@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 k3KFguWU096308 for ; Thu, 20 Apr 2006 15:42:56 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KFgull096302 for perforce@freebsd.org; Thu, 20 Apr 2006 15:42:56 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 15:42:56 GMT Message-Id: <200604201542.k3KFgull096302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95688 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 15:42:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=95688 Change 95688 by millert@millert_g5tower on 2006/04/20 15:42:20 Style fix Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.c#11 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/services.c#11 (text+ko) ==== @@ -1679,12 +1679,13 @@ u32 **sids, int *numsids) { - struct context *scontext = sidtab_search(&sidtab, user); + struct getfilesids p; + struct context *scontext; + scontext = sidtab_search(&sidtab, user); if (scontext == NULL) goto out_err; - struct getfilesids p; p.scon = scontext; p.sclass = sclass; if (!sclass || sclass > policydb.p_classes.nprim) From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 15:47:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3329116A408 for ; Thu, 20 Apr 2006 15:47:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4028743D5E for ; Thu, 20 Apr 2006 15:47:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EC42646CE4 for ; Thu, 20 Apr 2006 11:47:25 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 780BD5B1ED; Thu, 20 Apr 2006 15:47:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7031E16A409; Thu, 20 Apr 2006 15:47:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2939416A406 for ; Thu, 20 Apr 2006 15:47:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2FD043D66 for ; Thu, 20 Apr 2006 15:47:02 +0000 (GMT) (envelope-from millert@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 k3KFl2ZS096676 for ; Thu, 20 Apr 2006 15:47:02 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KFl2vx096673 for perforce@freebsd.org; Thu, 20 Apr 2006 15:47:02 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 15:47:02 GMT Message-Id: <200604201547.k3KFl2vx096673@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95689 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 15:47:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=95689 Change 95689 by millert@millert_g5tower on 2006/04/20 15:46:01 Convert SEBSDCALL_GETUSERSIDS, SEBSDCALL_GETFILESIDS and SEBSDCALL_CHANGE_SID to sysctls. Move struct lp_args definition to sebsd_syscalls.h Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#14 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#14 (text+ko) ==== @@ -51,11 +51,6 @@ #define MAX_UC 510 -struct lp_args { - void *data; - size_t len; -}; - static int sys_load_policy(struct proc *td, void *data, size_t len) { @@ -98,137 +93,7 @@ return (rc); } -/* - * Lists the SIDs currently available for transition to by a given - * "context\0username\0" - * - * or, lists the SIDs that a given context can relabel files to. (username is ignored) - */ -static int -sys_get_sids(int function, char *context, char *username, char *out, int *outlen) -{ - u_int32_t n, nsids, scontext_len; - u_int32_t *sids, sid; - char * scontext; - int error; - int olen = 1; - int ubufsz; - - if (copyin(outlen, &ubufsz, sizeof(int))) { - error = EFAULT; - goto out; - } - - /* - * XXX We need POLICY_RDLOCK here, but it's not exported! - */ - error = security_context_to_sid(context, strlen (context), &sid); - if (error) - goto out; - switch (function) { - case SEBSDCALL_GETUSERSIDS: - error = security_get_user_sids(sid, username, &sids, &nsids); - break; - - case SEBSDCALL_GETFILESIDS: - error = security_get_file_sids(sid, SECCLASS_FILE, &sids, - &nsids); - break; - - default: - error = ENOSYS; - break; - } - if (error) - goto out; - for (n = 0; n < nsids; n++) { - error = security_sid_to_context(sids[n], &scontext, - &scontext_len); - if (error) - goto out2; - if (out && olen + scontext_len <= ubufsz) { - error = copyout(scontext, out, scontext_len); - out += scontext_len; - } else if (out) - error = ENOMEM; - olen += scontext_len; - security_free_context(scontext); - if (error) - goto out2; - } - error = copyout(&olen, outlen, sizeof(int)); -out2: - sebsd_free(sids, M_SEBSD); -out: - return (error); -} - static int -sys_change_sid(char *domains, char *sources, char *sclasss, char *out, - int *outlen) -{ - u_int32_t domain, source; - struct class_datum *cld; - char *outc; - int error; - int ubufsz, outclen; - - if (copyin(outlen, &ubufsz, sizeof(int))) - return (EFAULT); - - /* - * XXX We need POLICY_RDLOCK here, but it's not exported! - */ - error = security_context_to_sid(sources, strlen (sources), &source); - if (error) - return (error); - - error = security_context_to_sid(domains, strlen (domains), &domain); - if (error) - return (error); - - cld = hashtab_search(policydb.p_classes.table, sclasss); - if (cld == NULL) - return (EINVAL); - - error = security_change_sid(domain, source, cld->value, &source); - if (error) - return (error); - error = security_sid_to_context(source, &outc, &outclen); - if (error) - return (error); - if (out) { - if (outclen > ubufsz) { - error = ENOMEM; - goto out; - } - error = copyout(outc, out, outclen); - if (error) - goto out; - } - error = copyout(&outclen, outlen, sizeof(int)); - -out: - security_free_context (outc); - return (error); -} - -struct getsid_args { - char *ctx; - char *usr; - char *out; - int *outlen; -}; - -struct changesid_args { - char *domain; - char *source; - char *sclass; - char *out; - int *outlen; -}; - -static int sebsd_get_bools(struct proc *td, struct sebsd_get_bools *gb) { char *out = NULL; @@ -263,74 +128,6 @@ error = sys_load_migscs(td, p.data, p.len); break; - case SEBSDCALL_GETUSERSIDS: - case SEBSDCALL_GETFILESIDS: - { - struct getsid_args uap; - size_t dummy; - char *ctx, *usr; - - error = copyin(args, &uap, sizeof(struct getsid_args)); - if (error) - return (error); - ctx = sebsd_malloc(MAX_UC, M_SEBSD, M_WAITOK); - error = copyinstr(uap.ctx, ctx, MAX_UC, &dummy); - if (error) { - sebsd_free(ctx, M_SEBSD); - return (error); - } - usr = sebsd_malloc(MAX_UC, M_SEBSD, M_WAITOK); - error = copyinstr(uap.usr, usr, MAX_UC, &dummy); - if (error) { - sebsd_free(ctx, M_SEBSD); - sebsd_free(usr, M_SEBSD); - return (error); - } - ctx[MAX_UC-1] = 0; - usr[MAX_UC-1] = 0; - error = sys_get_sids(call, ctx, usr, uap.out, uap.outlen); - sebsd_free(ctx, M_SEBSD); - sebsd_free(usr, M_SEBSD); - break; - } - - case SEBSDCALL_CHANGE_SID: - { - struct changesid_args uap; - size_t dummy; - char *doms, *srcs, *scs; - - error = copyin(args, &uap, sizeof(struct changesid_args)); - if (error) - return (error); - doms = sebsd_malloc(MAX_UC, M_SEBSD, M_WAITOK); - error = copyinstr(uap.domain, doms, MAX_UC, &dummy); - if (error) { - sebsd_free(doms, M_SEBSD); - return (error); - } - srcs = sebsd_malloc(MAX_UC, M_SEBSD, M_WAITOK); - error = copyinstr(uap.source, srcs, MAX_UC, &dummy); - if (error) { - sebsd_free(doms, M_SEBSD); - sebsd_free(srcs, M_SEBSD); - return (error); - } - scs = sebsd_malloc(MAX_UC, M_SEBSD, M_WAITOK); - error = copyinstr(uap.sclass, scs, MAX_UC, &dummy); - if (error) { - sebsd_free(doms, M_SEBSD); - sebsd_free(srcs, M_SEBSD); - sebsd_free(scs, M_SEBSD); - return (error); - } - error = sys_change_sid(doms, srcs, scs, uap.out, uap.outlen); - sebsd_free(doms, M_SEBSD); - sebsd_free(srcs, M_SEBSD); - sebsd_free(scs, M_SEBSD); - return (error); - } - case SEBSDCALL_GET_BOOLS: { struct sebsd_get_bools gb; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#9 (text+ko) ==== @@ -12,9 +12,6 @@ #define SEBSDCALL_GET_BOOL 9 #define SEBSDCALL_SET_BOOL 10 #define SEBSDCALL_COMMIT_BOOLS 11 -#define SEBSDCALL_GETUSERSIDS 6 -#define SEBSDCALL_GETFILESIDS 5 -#define SEBSDCALL_CHANGE_SID 4 #define SEBSDCALL_NUM 7 @@ -40,4 +37,9 @@ char *out; }; +struct lp_args { + void *data; + size_t len; +}; + #endif /* _SEBSD_SYSCALLS_H_ */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#9 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002 Networks Associates Technology, Inc. - * Copyright (c) 2005, 2006 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by NAI Labs, the @@ -55,13 +55,12 @@ extern unsigned int policydb_loaded_version; -#if 0 /* * Sysctl handler for security.mac.sebsd.sids * Lists the SIDs currently active in the security server */ static int -sysctl_list_sids(SYSCTL_HANDLER_ARGS) +sysctl_list_sids SYSCTL_HANDLER_ARGS { const int linesize = 128; /* conservative */ int i, count, error, len; @@ -71,7 +70,7 @@ char *scontext; count = sidtab.nel; - MALLOC(buffer, char *, linesize, M_TEMP, M_WAITOK); + buffer = sebsd_malloc(linesize, M_TEMP, M_WAITOK); len = snprintf(buffer, linesize, "\n SID Context\n"); error = SYSCTL_OUT(req, buffer, len); if (error) @@ -98,10 +97,9 @@ } error = SYSCTL_OUT(req, "", 1); out: - FREE(buffer, M_TEMP); + sebsd_free(buffer, M_TEMP); return (error); } -#endif /* * Sysctl handler for security.mac.sebsd.auditing. Get or set whether the @@ -167,13 +165,11 @@ return (0); } -#if 0 -/* - * Sysctl handler for security.mac.sebsd.user_sids. Lists the SIDs currently - * available for transition to by a given "context\0username\0". - */ +#define SEBSD_GETUSERSIDS 1 +#define SEBSD_GETFILESIDS 2 + static int -sysctl_user_sids(SYSCTL_HANDLER_ARGS) +sebsd_get_sids(int function, struct sysctl_req *req) { u_int32_t n, nsids, scontext_len; u_int32_t *sids, sid; @@ -193,19 +189,29 @@ error = EINVAL; goto out; } - len = strlen(context); - if (len + 1 >= req->newlen) { - error = EINVAL; - goto out; - } - username = context + len + 1; /* * XXX We need POLICY_RDLOCK here, but it's not exported! */ + len = strlen(context); error = security_context_to_sid(context, len + 1, &sid); if (error) goto out; - error = security_get_user_sids(sid, username, &sids, &nsids); + switch (function) { + case SEBSD_GETUSERSIDS: + if (len + 1 >= req->newlen) { + error = EINVAL; + goto out2; + } + username = context + len + 1; + error = security_get_user_sids(sid, username, &sids, &nsids); + break; + case SEBSD_GETFILESIDS: + error = security_get_file_sids(sid, SECCLASS_FILE, &sids, + &nsids); + break; + default: + error = EINVAL; + } if (error) goto out; for (n = 0; n < nsids; n++) { @@ -227,11 +233,33 @@ } /* + * Sysctl handler for security.mac.sebsd.user_sids. Lists the SIDs currently + * available for transition to by a given "context\0username\0". + */ +static int +sysctl_user_sids SYSCTL_HANDLER_ARGS +{ + + return (sebsd_get_sids(SEBSD_GETUSERSIDS, req)); +} + +/* + * Sysctl handler for security.mac.sebsd.file_sids. Lists the file + * SIDs available for a given "context\0". + */ +static int +sysctl_file_sids SYSCTL_HANDLER_ARGS +{ + + return (sebsd_get_sids(SEBSD_GETFILESIDS, req)); +} + +/* * Sysctl handler for security.mac.sebsd.change_sid * Report the SID to relabel to given input "scontext\0tcontext\0",tclass */ static int -sysctl_change_sid(SYSCTL_HANDLER_ARGS) +sysctl_change_sid SYSCTL_HANDLER_ARGS { u_int32_t newcontext_len; u_int32_t sid, tsid, newsid; @@ -284,7 +312,7 @@ * given input "scontext\0tcontext\0", tclass, av. */ static int -sysctl_compute_av(SYSCTL_HANDLER_ARGS) +sysctl_compute_av SYSCTL_HANDLER_ARGS { u_int32_t sid, tsid; u_int16_t tclass; @@ -333,7 +361,6 @@ sebsd_free(scontext, M_SEBSD); return (error); } -#endif SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, sebsd, CTLFLAG_RW, 0, @@ -341,19 +368,20 @@ SYSCTL_INT(_security_mac_sebsd, OID_AUTO, verbose, CTLFLAG_RW, &sebsd_verbose, 0, " SEBSD Verbose Debug Stuff"); -#if 0 SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, sids, CTLTYPE_STRING|CTLFLAG_RD, NULL, 0, sysctl_list_sids, "A", "SEBSD SIDs"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, user_sids, CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_user_sids, "A", "SEBSD transitionable user SIDs"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, file_sids, CTLTYPE_STRING | + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_file_sids, "A", + "SEBSD transitionable file SIDs"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, change_sid, CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_change_sid, "A", "SEBSD (tty) SID relabel to perform along with transition"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_av, CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_av, "A", "SEBSD access vector decision query"); -#endif SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, auditing, CTLTYPE_INT | CTLFLAG_RW, NULL, 0, sysctl_sebsd_auditing, "I", "SEBSD avc auditing"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, enforcing, CTLTYPE_INT | @@ -367,6 +395,11 @@ { sysctl_register_oid(&sysctl__security_mac_sebsd); sysctl_register_oid(&sysctl__security_mac_sebsd_verbose); + sysctl_register_oid(&sysctl__security_mac_sebsd_sids); + sysctl_register_oid(&sysctl__security_mac_sebsd_user_sids); + sysctl_register_oid(&sysctl__security_mac_sebsd_file_sids); + sysctl_register_oid(&sysctl__security_mac_sebsd_change_sid); + sysctl_register_oid(&sysctl__security_mac_sebsd_compute_av); sysctl_register_oid(&sysctl__security_mac_sebsd_auditing); sysctl_register_oid(&sysctl__security_mac_sebsd_enforcing); sysctl_register_oid(&sysctl__security_mac_sebsd_policyvers); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 15:49:11 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5BD6416A404 for ; Thu, 20 Apr 2006 15:49:11 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E8E843D46 for ; Thu, 20 Apr 2006 15:49:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BCC3346C66 for ; Thu, 20 Apr 2006 11:49:08 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0C9315663E; Thu, 20 Apr 2006 15:49:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 04EA716A409; Thu, 20 Apr 2006 15:49:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF69116A405 for ; Thu, 20 Apr 2006 15:49:05 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 896AC43D48 for ; Thu, 20 Apr 2006 15:49:05 +0000 (GMT) (envelope-from millert@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 k3KFn5Vg096762 for ; Thu, 20 Apr 2006 15:49:05 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KFn5DU096759 for perforce@freebsd.org; Thu, 20 Apr 2006 15:49:05 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 15:49:05 GMT Message-Id: <200604201549.k3KFn5DU096759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95690 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 15:49:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=95690 Change 95690 by millert@millert_g5tower on 2006/04/20 15:48:36 Use OSSwapInt* functions for byte swapping. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#17 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#17 (text+ko) ==== @@ -48,8 +48,11 @@ #include /* NOTE: mach sys/types, not BSD one. */ #include /* For atomic operation protos */ -#include /* We need to explicitly include */ -#include /* byte order includes for mach. */ +#ifdef KERNEL +#include +#else +#include +#endif typedef u_int64_t u64; typedef u_int64_t __le64; @@ -71,12 +74,12 @@ #define le32_to_cpu(x) ((__uint32_t)(x)) #define le64_to_cpu(x) ((__uint64_t)(x)) #elif BYTE_ORDER == BIG_ENDIAN -#define cpu_to_le16(x) NXSwapHostShortToLittle(x) -#define cpu_to_le32(x) NXSwapHostLongToLittle(x) -#define cpu_to_le64(x) NXSwapHostLongLongToLittle(x) -#define le16_to_cpu(x) NXSwapLittleShortToHost(x) -#define le32_to_cpu(x) NXSwapLittleLongToHost(x) -#define le64_to_cpu(x) NXSwapLittleLongLongToHost(x) +#define cpu_to_le16(x) OSSwapInt16(x) +#define cpu_to_le32(x) OSSwapInt32(x) +#define cpu_to_le64(x) OSSwapInt64(x) +#define le16_to_cpu(x) OSSwapInt16(x) +#define le32_to_cpu(x) OSSwapInt32(x) +#define le64_to_cpu(x) OSSwapInt64(x) #else #error unsupported BYTE_ORDER #endif /* BYTE_ORDER */ From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 15:52:15 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB64A16A40A for ; Thu, 20 Apr 2006 15:52:15 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A82F43D4C for ; Thu, 20 Apr 2006 15:52:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 846E046C89 for ; Thu, 20 Apr 2006 11:52:12 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B780456DFF; Thu, 20 Apr 2006 15:52:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B1E5916A40E; Thu, 20 Apr 2006 15:52:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77FAA16A400 for ; Thu, 20 Apr 2006 15:52:10 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4242E43D45 for ; Thu, 20 Apr 2006 15:52:10 +0000 (GMT) (envelope-from millert@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 k3KFqAAu098469 for ; Thu, 20 Apr 2006 15:52:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KFqAx3098461 for perforce@freebsd.org; Thu, 20 Apr 2006 15:52:10 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 15:52:10 GMT Message-Id: <200604201552.k3KFqAx3098461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95692 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 15:52:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=95692 Change 95692 by millert@millert_g5tower on 2006/04/20 15:52:01 wslogin is obsoleted by the the SEDarwin login plugin module. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/English.lproj/MainMenu.nib/classes.nib#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/English.lproj/MainMenu.nib/info.nib#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/English.lproj/MainMenu.nib/objects.nib#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/LabelChooser.h#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/LabelChooser.m#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/Makefile#5 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/WindowServer.sedarwin#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/install-windowserver.sh#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/main.m#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/wslogin.c#5 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/wslogin/wsloginui.pbproj/project.pbxproj#3 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 21:10:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74DB216A401 for ; Thu, 20 Apr 2006 21:10:05 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AFF243D45 for ; Thu, 20 Apr 2006 21:10:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EFB2046C82 for ; Thu, 20 Apr 2006 17:10:01 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C0F885641A; Thu, 20 Apr 2006 21:10:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BAFB516A404; Thu, 20 Apr 2006 21:10:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 55F8616A401 for ; Thu, 20 Apr 2006 21:10:00 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDC4943D45 for ; Thu, 20 Apr 2006 21:09:59 +0000 (GMT) (envelope-from millert@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 k3KL9xav094391 for ; Thu, 20 Apr 2006 21:09:59 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KL9xGd094388 for perforce@freebsd.org; Thu, 20 Apr 2006 21:09:59 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 21:09:59 GMT Message-Id: <200604202109.k3KL9xGd094388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95716 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 21:10:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=95716 Change 95716 by millert@millert_g5tower on 2006/04/20 21:09:05 Update to libselinux 1.30 Obtained from: pleblanc Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/LICENSE#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/av_inherit.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/av_perm_to_string.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/av_permissions.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/avc.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/class_to_string.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/common_perm_to_string.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/flask.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/get_context_list.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/get_default_type.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/selinux.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/libselinux.spec#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_add_callback.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_audit.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_av_stats.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_cache_stats.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_cleanup.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_context_to_sid.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_destroy.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_entry_ref_init.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_has_perm.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_has_perm_noaudit.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_init.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_reset.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_sid_stats.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/avc_sid_to_context.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/checkPasswdAccess.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/context_free.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/context_new.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/context_range_get.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/context_range_set.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/context_role_get.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/context_role_set.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/context_type_get.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/context_type_set.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/context_user_get.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/context_user_set.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/freecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/freeconary.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/fsetfilecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/get_default_context.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/get_default_context_with_level.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/get_default_context_with_role.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/get_default_context_with_rolelevel.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/get_ordered_context_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/get_ordered_context_list_with_level.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/getcon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/getexeccon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/getfilecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/getfscreatecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/getpeercon.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/getpidcon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/getprevcon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/getseuserbyname.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/is_context_customizable.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/is_selinux_enabled.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/lsetfilecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/manual_user_enter_context.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/matchmediacon.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/matchpathcon.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/query_user_context.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/rpm_execcon.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_check_context.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_commit_booleans.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_compute_av.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_compute_create.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_compute_relabel.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_compute_user.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_get_boolean_active.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_get_boolean_names.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_get_boolean_pending.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_getenforce.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_load_booleans.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_load_policy.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_policyvers.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_set_boolean.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/security_setenforce.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_binary_policy_path.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_booleans_path.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_contexts_path.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_default_context_path.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_failsafe_context_path.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_file_context_path.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_getenforcemode.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_media_context_path.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_policy_root.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_policyroot.3#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_removable_context_path.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/selinux_user_contexts_path.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/set_matchpathcon_printf.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/setcon.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/setexeccon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/setfilecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/setfscreatecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/sidget.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man3/sidput.3#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man8/avcstat.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man8/booleans.8#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man8/getenforce.8#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man8/getsebool.8#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man8/matchpathcon.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man8/selinux.8#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man8/selinuxenabled.8#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man8/setenforce.8#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man8/setsebool.8#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/man/man8/togglesebool.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/Makefile.old#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/Makefile.orig#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/av_inherit.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/av_perm_to_string.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/avc.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/avc_internal.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/avc_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/avc_sidtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/avc_sidtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/booleans.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/booleans.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/canonicalize_context.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/canonicalize_context.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/checkAccess.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/check_context.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/check_context.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/class_to_string.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/common_perm_to_string.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compat_file_path.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compute_av.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compute_av.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compute_create.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compute_member.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compute_relabel.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compute_relabel.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compute_user.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compute_user.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/context.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/context.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/context_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/disable.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/disable.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/dso.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/enabled.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/enabled.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/fgetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/fgetfilecon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/file_path_suffixes.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/filecon.c#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/filecon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/freecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/freecon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/freeconary.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/freeconary.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/fsetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/fsetfilecon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/get_context_list.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/get_context_list.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/get_context_list_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/get_default_type.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/get_default_type.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/get_default_type_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/get_file_contexts.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/get_file_contexts.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getcon.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getcon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getenforce.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getexeccon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getexeccon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getfilecon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getfscreatecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getpeercon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getpeercon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getpidcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getpidcon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getprevcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getseccontext.c#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getseccontext.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/helpers.c#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/init.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/init.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/is_customizable_type.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/is_customizable_type.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/lgetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/lgetfilecon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/libselinux.a#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_migscs.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_migscs.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_policy.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/lsetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/lsetfilecon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/matchmediacon.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/matchmediacon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/matchpathcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/matchpathcon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/policyvers.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/policyvers.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/query_user_context.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/query_user_context.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/rpm.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/sebsd.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/security_get_user_contexts.c#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/security_get_user_contexts.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/sedarwin_config.c#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/sedarwin_config.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/selinux.py#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/selinux_config.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/selinux_config.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/selinux_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/selinux_netlink.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/selinuxswig.i#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/selinuxswig_wrap.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setcon.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setcon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setenforce.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setexeccon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setfilecon.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setfscreatecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/seusers.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/seusers.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/system.c#5 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/system.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/trans.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/trans.o#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/avcstat.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/compute_av.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/compute_create.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/compute_member.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/compute_relabel.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/compute_user.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/deftype.c#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/execcon.c#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getcon#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getconlist.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getenforcemode.c#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getfilecon#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getpidcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getsebool#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getsebool.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getseuser.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/matchpathcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/mkdircon.c#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/policyvers.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/selinuxconfig.c#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/selinuxdisable.c#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/selinuxenabled.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/setenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/setfilecon#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/setfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/setsebool#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/setsebool.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/togglesebool#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/togglesebool.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,359 @@ +1.30 2006-03-14 + * Updated version for release. + +1.29.8 2006-02-27 + * Altered rpm_execcon fallback logic for permissive mode to also + handle case where /selinux/enforce is not available. + +1.29.7 2006-01-20 + * Merged install-pywrap Makefile patch from Joshua Brindle. + +1.29.6 2006-01-18 + * Merged pywrap Makefile patch from Dan Walsh. + +1.29.5 2006-01-11 + * Added getseuser test program. + +1.29.4 2006-01-06 + * Added format attribute to myprintf in matchpathcon.c and + removed obsoleted rootlen variable in init_selinux_config(). + +1.29.3 2006-01-04 + * Merged several fixes and improvements from Ulrich Drepper + (Red Hat), including: + - corrected use of getline + - further calls to __fsetlocking for local files + - use of strdupa and asprintf + - proper handling of dirent in booleans code + - use of -z relro + - several other optimizations + * Merged getpidcon python wrapper from Dan Walsh (Red Hat). + +1.29.2 2005-12-14 + * Merged call to finish_context_translations from Dan Walsh. + This eliminates a memory leak from failing to release memory + allocated by libsetrans. + +1.29.1 2005-12-08 + * Merged patch for swig interfaces from Dan Walsh. + +1.28 2005-12-07 + * Updated version for release. + +1.27.28 2005-12-01 + * Added MATCHPATHCON_VALIDATE flag for set_matchpathcon_flags() and + modified matchpathcon implementation to make context validation/ + canonicalization optional at matchpathcon_init time, deferring it + to a successful matchpathcon by default unless the new flag is set + by the caller. + +1.27.27 2005-12-01 + * Added matchpathcon_init_prefix() interface, and + reworked matchpathcon implementation to support selective + loading of file contexts entries based on prefix matching + between the pathname regex stems and the specified path + prefix (stem must be a prefix of the specified path prefix). + +1.27.26 2005-11-29 + * Merged getsebool patch from Dan Walsh. + +1.27.25 2005-11-29 + * Added -f file_contexts option to matchpathcon util. + Fixed warning message in matchpathcon_init(). + +1.27.24 2005-11-29 + * Merged Makefile python definitions patch from Dan Walsh. + +1.27.23 2005-11-28 + * Merged swigify patch from Dan Walsh. + +1.27.22 2005-11-15 + * Merged make failure in rpm_execcon non-fatal in permissive mode + patch from Ivan Gyurdiev. + +1.27.21 2005-11-08 + * Added MATCHPATHCON_NOTRANS flag for set_matchpathcon_flags() + and modified matchpathcon_init() to skip context translation + if it is set by the caller. + +1.27.20 2005-11-07 + * Added security_canonicalize_context() interface and + set_matchpathcon_canoncon() interface for obtaining + canonical contexts. Changed matchpathcon internals + to obtain canonical contexts by default. Provided + fallback for kernels that lack extended selinuxfs context + interface. + +1.27.19 2005-11-04 + * Merged seusers parser changes from Ivan Gyurdiev. + * Merged setsebool to libsemanage patch from Ivan Gyurdiev. + * Changed seusers parser to reject empty fields. + +1.27.18 2005-11-03 + * Merged seusers empty level handling patch from Jonathan Kim (TCS). + +1.27.17 2005-10-27 + * Changed default entry for seusers to use __default__ to avoid + ambiguity with users named "default". + +1.27.16 2005-10-27 + * Fixed init_selinux_config() handling of missing /etc/selinux/config + or missing SELINUXTYPE= definition. + * Merged selinux_translations_path() patch from Dan Walsh. + +1.27.15 2005-10-25 + * Added hidden_proto/def for get_default_context_with_role. + +1.27.14 2005-10-25 + * Merged selinux_path() and selinux_homedir_context_path() + functions from Joshua Brindle. + +1.27.13 2005-10-19 + * Merged fixes for make DESTDIR= builds from Joshua Brindle. + +1.27.12 2005-10-18 + * Merged get_default_context_with_rolelevel and man pages from + Dan Walsh (Red Hat). + +1.27.11 2005-10-18 + * Updated call to sepol_policydb_to_image for sepol changes. + +1.27.10 2005-10-17 + * Changed getseuserbyname to ignore empty lines and to handle + no matching entry in the same manner as no seusers file. + +1.27.9 2005-10-13 + * Changed selinux_mkload_policy to try downgrading the + latest policy version available to the kernel-supported version. + +1.27.8 2005-10-11 + * Changed selinux_mkload_policy to fall back to the maximum + policy version supported by libsepol if the kernel policy version + falls outside of the supported range. + +1.27.7 2005-10-06 + * Changed getseuserbyname to fall back to the Linux username and + NULL level if seusers config file doesn't exist unless + REQUIRESEUSERS=1 is set in /etc/selinux/config. + * Moved seusers.conf under $SELINUXTYPE and renamed to seusers. + +1.27.6 2005-10-06 + * Added selinux_init_load_policy() function as an even higher level + interface for the initial policy load by /sbin/init. This obsoletes + the load_policy() function in the sysvinit-selinux.patch. + +1.27.5 2005-10-06 + * Added selinux_mkload_policy() function as a higher level interface + for loading policy than the security_load_policy() interface. + +1.27.4 2005-10-05 + * Merged fix for matchpathcon (regcomp error checking) from Johan + Fischer. Also added use of regerror to obtain the error string + for inclusion in the error message. + +1.27.3 2005-10-03 + * Changed getseuserbyname to not require (and ignore if present) + the MLS level in seusers.conf if MLS is disabled, setting *level + to NULL in this case. + +1.27.2 2005-09-30 + * Merged getseuserbyname patch from Dan Walsh. + +1.27.1 2005-09-19 + * Merged STRIP_LEVEL patch for matchpathcon from Dan Walsh. + This allows file_contexts with MLS fields to be processed on + non-MLS-enabled systems with policies that are otherwise + identical (e.g. same type definitions). + * Merged get_ordered_context_list_with_level() function from + Dan Walsh, and added get_default_context_with_level(). + This allows MLS level selection for users other than the + default level. + +1.26 2005-09-06 + * Updated version for release. + +1.25.7 2005-09-01 + * Merged modified form of patch to avoid dlopen/dlclose by + the static libselinux from Dan Walsh. Users of the static libselinux + will not have any context translation by default. + +1.25.6 2005-08-31 + * Added public functions to export context translation to + users of libselinux (selinux_trans_to_raw_context, + selinux_raw_to_trans_context). + +1.25.5 2005-08-26 + * Remove special definition for context_range_set; use + common code. + +1.25.4 2005-08-25 + * Hid translation-related symbols entirely and ensured that + raw functions have hidden definitions for internal use. + * Allowed setting NULL via context_set* functions. + * Allowed whitespace in MLS component of context. + * Changed rpm_execcon to use translated functions to workaround + lack of MLS level on upgraded systems. + +1.25.3 2005-08-23 + * Merged context translation patch, originally by TCS, + with modifications by Dan Walsh (Red Hat). + +1.25.2 2005-08-11 + * Merged several fixes for error handling paths in the + AVC sidtab, matchpathcon, booleans, context, and get_context_list + code from Serge Hallyn (IBM). Bugs found by Coverity. + +1.25.1 2005-08-10 + * Removed setupns; migrated to pam. + * Merged patches to rename checkPasswdAccess() from Joshua Brindle. + Original symbol is temporarily retained for compatibility until + all callers are updated. + +1.24 2005-06-20 + * Updated version for release. + +1.23.12 2005-06-13 + * Merged security_setupns() from Chad Sellers. + +1.23.11 2005-05-19 + * Merged avcstat and selinux man page from Dan Walsh. + * Changed security_load_booleans to process booleans.local + even if booleans file doesn't exist. + +1.23.10 2005-04-29 + * Merged set_selinuxmnt patch from Bill Nottingham (Red Hat). + +1.23.9 2005-04-26 + * Rewrote get_ordered_context_list and helpers, including + changing logic to allow variable MLS fields. + +1.23.8 2005-04-25 + * Merged matchpathcon and man page patch from Dan Walsh. + +1.23.7 2005-04-12 + * Changed boolean functions to return -1 with errno ENOENT + rather than assert on a NULL selinux_mnt (i.e. selinuxfs not + mounted). + +1.23.6 2005-04-08 + * Fixed bug in matchpathcon_filespec_destroy. + +1.23.5 2005-04-05 + * Fixed bug in rpm_execcon error handling path. + +1.23.4 2005-04-04 + * Merged fix for set_matchpathcon* functions from Andreas Steinmetz. + * Merged fix for getconlist utility from Andreas Steinmetz. + +1.23.3 2005-03-29 + * Merged security_set_boolean_list patch from Dan Walsh. + This introduces booleans.local support for setsebool. + +1.23.2 2005-03-17 + * Merged destructors patch from Tomas Mraz. + +1.23.1 2005-03-16 + * Added set_matchpathcon_flags() function for setting flags + controlling operation of matchpathcon. MATCHPATHCON_BASEONLY + means only process the base file_contexts file, not + file_contexts.homedirs or file_contexts.local, and is for use by + setfiles -c. + * Updated matchpathcon.3 man page. + +1.22 2005-03-09 + * Updated version for release. + +1.21.13 2005-03-08 + * Fixed bug in matchpathcon_filespec_add() - failure to clear fl_head. + +1.21.12 2005-03-01 + * Changed matchpathcon_common to ignore any non-format bits in the mode. + +1.21.11 2005-02-22 + * Merged several fixes from Ulrich Drepper. + +1.21.10 2005-02-17 + * Merged matchpathcon patch for file_contexts.homedir from Dan Walsh. + * Added selinux_users_path() for path to directory containing + system.users and local.users. + +1.21.9 2005-02-09 + * Changed relabel Makefile target to use restorecon. + +1.21.8 2005-02-07 + * Regenerated av_permissions.h. + +1.21.7 2005-02-01 + * Modified avc_dump_av to explicitly check for any permissions that + cannot be mapped to string names and display them as a hex value. + +1.21.6 2005-01-31 + * Regenerated av_permissions.h. + +1.21.5 2005-01-28 + * Generalized matchpathcon internals, exported more interfaces, + and moved additional code from setfiles into libselinux so that + setfiles can directly use matchpathcon. + +1.21.4 2005-01-27 + * Prevent overflow of spec array in matchpathcon. + +1.21.3 2005-01-26 + * Fixed several uses of internal functions to avoid relocations. + * Changed rpm_execcon to check is_selinux_enabled() and fallback to + a regular execve if not enabled (or unable to determine due to a lack + of /proc, e.g. chroot'd environment). + + +1.21.2 2005-01-24 + * Merged minor fix for avcstat from Dan Walsh. + +1.21.1 2005-01-19 + * Merged patch from Dan Walsh, including: + - new is_context_customizable function + - changed matchpathcon to also use file_contexts.local if present + - man page cleanups + +1.20 2005-01-04 + * Changed matchpathcon to return -1 with errno ENOENT for + <> entries, and also for an empty file_contexts configuration. + * Removed some trivial utils that were not useful or redundant. + * Changed BINDIR default to /usr/sbin to match change in Fedora. + * Added security_compute_member. + * Added man page for setcon. + * Merged more man pages from Dan Walsh. + * Merged avcstat from James Morris. + * Merged build fix for mips from Manoj Srivastava. + * Merged C++ support from John Ramsdell of MITRE. + * Merged setcon() function from Darrel Goeddel of TCS. + * Merged setsebool/togglesebool enhancement from Steve Grubb. + * Merged cleanup patches from Steve Grubb. + +1.18 2004-11-01 + * Merged cleanup patches from Steve Grubb. + * Added rpm_execcon. + * Merged setenforce and removable context patch from Dan Walsh. + * Merged build fix for alpha from Ulrich Drepper. + * Removed copyright/license from selinux_netlink.h - definitions only. + * Merged matchmediacon from Dan Walsh. + * Regenerated headers for new nscd permissions. + * Added get_default_context_with_role. + * Added set_matchpathcon_printf. + * Reworked av_inherit.h to allow easier re-use by kernel. + * Changed avc_has_perm_noaudit to not fail on netlink errors. + * Changed avc netlink code to check pid based on patch by Steve Grubb. + * Merged second optimization patch from Ulrich Drepper. + * Changed matchpathcon to skip invalid file_contexts entries. + * Made string tables private to libselinux. + * Merged strcat->stpcpy patch from Ulrich Drepper. + * Merged matchpathcon man page from Dan Walsh. + * Merged patch to eliminate PLTs for local syms from Ulrich Drepper. + * Autobind netlink socket. + * Dropped compatibility code from security_compute_user. + * Merged fix for context_range_set from Chad Hanson. + * Merged allocation failure checking patch from Chad Hanson. + * Merged avc netlink error message patch from Colin Walters. + 1.16 2004-08-19 * Regenerated headers for nscd class. * Merged man pages from Dan Walsh. ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/LICENSE#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/Makefile#2 (text+ko) ==== @@ -2,13 +2,20 @@ $(MAKE) -C src $(MAKE) -C utils +pywrap: + $(MAKE) -C src pywrap + install: $(MAKE) -C include install $(MAKE) -C src install $(MAKE) -C utils install $(MAKE) -C man install -relabel: +install-pywrap: + $(MAKE) -C src install-pywrap + +relabel: + $(MAKE) -C src relabel clean: $(MAKE) -C src clean ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.16 +1.30 ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ include ../../../Makeconfig # Installation directories. -PREFIX = $(DESTDIR)/usr -INCDIR = $(PREFIX)/include/selinux +PREFIX ?= $(DESTDIR)/usr +INCDIR ?= $(PREFIX)/include/selinux install: test -d $(INCDIR) || install -m 755 -d $(INCDIR) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/av_permissions.h#2 (text+ko) ==== @@ -1,6 +1,4 @@ /* This file is automatically generated. Do not edit. */ -/* FLASK */ - #define COMMON_FILE__IOCTL 0x00000001UL #define COMMON_FILE__READ 0x00000002UL #define COMMON_FILE__WRITE 0x00000004UL @@ -107,6 +105,7 @@ #define FILE__EXECUTE_NO_TRANS 0x00020000UL #define FILE__ENTRYPOINT 0x00040000UL +#define FILE__EXECMOD 0x00080000UL #define LNK_FILE__IOCTL 0x00000001UL #define LNK_FILE__READ 0x00000002UL @@ -144,6 +143,10 @@ #define CHR_FILE__QUOTAON 0x00008000UL #define CHR_FILE__MOUNTON 0x00010000UL +#define CHR_FILE__EXECUTE_NO_TRANS 0x00020000UL +#define CHR_FILE__ENTRYPOINT 0x00040000UL +#define CHR_FILE__EXECMOD 0x00080000UL + #define BLK_FILE__IOCTL 0x00000001UL #define BLK_FILE__READ 0x00000002UL #define BLK_FILE__WRITE 0x00000004UL @@ -458,6 +461,9 @@ #define PROCESS__SIGINH 0x00100000UL #define PROCESS__SETRLIMIT 0x00200000UL #define PROCESS__RLIMITINH 0x00400000UL +#define PROCESS__DYNTRANSITION 0x00800000UL +#define PROCESS__SETCURRENT 0x01000000UL +#define PROCESS__EXECMEM 0x02000000UL #define IPC__CREATE 0x00000001UL #define IPC__DESTROY 0x00000002UL @@ -515,6 +521,7 @@ #define SECURITY__COMPUTE_USER 0x00000040UL #define SECURITY__SETENFORCE 0x00000080UL #define SECURITY__SETBOOL 0x00000100UL +#define SECURITY__SETSECPARAM 0x00000200UL #define SYSTEM__IPC_INFO 0x00000001UL #define SYSTEM__SYSLOG_READ 0x00000002UL @@ -550,6 +557,8 @@ #define CAPABILITY__SYS_TTY_CONFIG 0x04000000UL #define CAPABILITY__MKNOD 0x08000000UL #define CAPABILITY__LEASE 0x10000000UL +#define CAPABILITY__AUDIT_WRITE 0x20000000UL +#define CAPABILITY__AUDIT_CONTROL 0x40000000UL #define PASSWD__PASSWD 0x00000001UL #define PASSWD__CHFN 0x00000002UL @@ -887,6 +896,10 @@ #define NSCD__GETHOST 0x00000004UL #define NSCD__GETSTAT 0x00000008UL #define NSCD__ADMIN 0x00000010UL +#define NSCD__SHMEMPWD 0x00000020UL +#define NSCD__SHMEMGRP 0x00000040UL +#define NSCD__SHMEMHOST 0x00000080UL +#define ASSOCIATION__SENDTO 0x00000001UL +#define ASSOCIATION__RECVFROM 0x00000002UL -/* FLASK */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/avc.h#2 (text+ko) ==== @@ -11,6 +11,10 @@ #include #include +#ifdef __cplusplus +extern "C" +{ +#endif /* * SID format and operations @@ -362,4 +366,8 @@ */ void avc_sid_stats(void); +#ifdef __cplusplus +} +#endif + #endif /* _SELINUX_AVC_H_ */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/context.h#2 (text+ko) ==== @@ -1,6 +1,11 @@ #ifndef _SELINUX_CONTEXT_H_ #define _SELINUX_CONTEXT_H_ +#ifdef __cplusplus +extern "C" +{ +#endif + /* * Functions to deal with security contexts in user space. */ @@ -40,4 +45,8 @@ extern int context_role_set(context_t,const char*); extern int context_user_set(context_t,const char*); +#ifdef __cplusplus +} +#endif + #endif ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/flask.h#2 (text+ko) ==== @@ -58,6 +58,7 @@ #define SECCLASS_NETLINK_DNRT_SOCKET 51 #define SECCLASS_DBUS 52 #define SECCLASS_NSCD 53 +#define SECCLASS_ASSOCIATION 54 /* * Security identifier indices for initial entities ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/get_context_list.h#2 (text+ko) ==== @@ -3,6 +3,11 @@ #include +#ifdef __cplusplus +extern "C" +{ +#endif + #define SELINUX_DEFAULTUSER "user_u" /* Get an ordered list of authorized security contexts for a user session @@ -16,6 +21,13 @@ security_context_t fromcon, security_context_t **list); +/* As above, but use the provided MLS level rather than the + default level for the user. */ +int get_ordered_context_list_with_level (const char *user, + const char *level, + security_context_t fromcon, + security_context_t **list); + /* Get the default security context for a user session for 'user' spawned by 'fromcon' and set *newcon to refer to it. The context will be one of those authorized by the policy, but the selection @@ -27,6 +39,30 @@ security_context_t fromcon, security_context_t *newcon); +/* As above, but use the provided MLS level rather than the + default level for the user. */ +int get_default_context_with_level(const char *user, + const char *level, + security_context_t fromcon, + security_context_t *newcon); + +/* Same as get_default_context, but only return a context + that has the specified role. If no reachable context exists + for the user with that role, then return -1. */ +int get_default_context_with_role(const char* user, + const char *role, + security_context_t fromcon, + security_context_t *newcon); + +/* Same as get_default_context, but only return a context + that has the specified role and level. If no reachable context exists + for the user with that role, then return -1. */ +int get_default_context_with_rolelevel(const char* user, + const char *level, + const char *role, + security_context_t fromcon, + security_context_t *newcon); + /* Given a list of authorized security contexts for the user, query the user to select one and set *newcon to refer to it. Caller must free via freecon. @@ -41,4 +77,8 @@ extern int manual_user_enter_context(const char *user, security_context_t *newcon); +#ifdef __cplusplus +} +#endif + #endif ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/get_default_type.h#2 (text+ko) ==== @@ -5,12 +5,21 @@ #ifndef _SELINUX_GET_DEFAULT_TYPE_H_ #define _SELINUX_GET_DEFAULT_TYPE_H_ +#ifdef __cplusplus +extern "C" +{ +#endif + /* Return path to default type file. */ -char *selinux_default_type_path(void); +const char *selinux_default_type_path(void); /* Get the default type (domain) for 'role' and set 'type' to refer to it. Caller must free via free(). Return 0 on success or -1 otherwise. */ int get_default_type (const char* role, char** type); +#ifdef __cplusplus +} +#endif + #endif /* ifndef _GET_DEFAULT_TYPE_H_ */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/include/selinux/selinux.h#2 (text+ko) ==== @@ -2,17 +2,20 @@ #define _SELINUX_H_ #include +#include -#define _LINUX_FLASK_TYPES_H_ -typedef unsigned short security_class_t; -typedef unsigned int access_vector_t; -typedef char *security_context_t; +#ifdef __cplusplus +extern "C" +{ +#endif /* Return 1 if we are running on a SELinux kernel, or 0 if not or -1 if we get an error. */ extern int is_selinux_enabled(void); /* Return 1 if we are running on a SELinux MLS kernel, or 0 otherwise. */ extern int is_selinux_mls_enabled(void); +typedef char* security_context_t; + /* Free the memory allocated for a context by any of the below get* calls. */ extern void freecon(security_context_t con); @@ -24,32 +27,55 @@ /* Get current context, and set *con to refer to it. Caller must free via freecon. */ extern int getcon(security_context_t *con); +extern int getcon_raw(security_context_t *con); +/* Set the current security context to con. + Note that use of this function requires that the entire application + be trusted to maintain any desired separation between the old and new + security contexts, unlike exec-based transitions performed via setexeccon. + When possible, decompose your application and use setexeccon()+execve() + instead. Note that the application may lose access to its open descriptors + as a result of a setcon() unless policy allows it to use descriptors opened + by the old context. */ +extern int setcon(security_context_t con); +extern int setcon_raw(security_context_t con); + /* Get context of process identified by pid, and - set *con to refer to it. Caller must free via freecon. */ -extern int getpidcon(pid_t pid, security_context_t *con); + set *con to refer to it. Caller must free via freecon. + This has not been ported to SEBSD yet. */ +//extern int getpidcon(pid_t pid, security_context_t *con); +//extern int getpidcon_raw(pid_t pid, security_context_t *con); /* Get previous context (prior to last exec), and set *con to refer to it. - Caller must free via freecon. */ -extern int getprevcon(security_context_t *con); + Caller must free via freecon. + This has not been ported to SEBSD yet.*/ +//extern int getprevcon(security_context_t *con); +//extern int getprevcon_raw(security_context_t *con); /* Get exec context, and set *con to refer to it. Sets *con to NULL if no exec context has been set, i.e. using default. If non-NULL, caller must free via freecon. */ extern int getexeccon(security_context_t *con); +extern int getexeccon_raw(security_context_t *con); /* Set exec security context for the next execve. - Call with NULL if you want to reset to the default. */ -extern int setexeccon(security_context_t con); + Call with NULL if you want to reset to the default. + This is not yet supported by SEBSD. */ +//extern int setexeccon(security_context_t con); +//extern int setexeccon_raw(security_context_t con); /* Get fscreate context, and set *con to refer to it. Sets *con to NULL if no fs create context has been set, i.e. using default. - If non-NULL, caller must free via freecon. */ -extern int getfscreatecon(security_context_t *con); + If non-NULL, caller must free via freecon. + This has not been ported to SEBSD yet. */ +//extern int getfscreatecon(security_context_t *con); +//extern int getfscreatecon_raw(security_context_t *con); /* Set the fscreate security context for subsequent file creations. - Call with NULL if you want to reset to the default. */ -extern int setfscreatecon(security_context_t context); + Call with NULL if you want to reset to the default. + This has not been ported to SEBSD yet. */ +//extern int setfscreatecon(security_context_t context); +//extern int setfscreatecon_raw(security_context_t context); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 21:24:23 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ADAA116A400 for ; Thu, 20 Apr 2006 21:24:23 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FD3543D46 for ; Thu, 20 Apr 2006 21:24:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BE37F46C2D for ; Thu, 20 Apr 2006 17:24:21 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 11DF957E34; Thu, 20 Apr 2006 21:24:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AB4616A401; Thu, 20 Apr 2006 21:24:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C445416A403 for ; Thu, 20 Apr 2006 21:24:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 823A943D49 for ; Thu, 20 Apr 2006 21:24:19 +0000 (GMT) (envelope-from millert@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 k3KLOJLl005093 for ; Thu, 20 Apr 2006 21:24:19 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KLOJ05005090 for perforce@freebsd.org; Thu, 20 Apr 2006 21:24:19 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 21:24:19 GMT Message-Id: <200604202124.k3KLOJ05005090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95720 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 21:24:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=95720 Change 95720 by millert@millert_g5tower on 2006/04/20 21:23:48 Remove object files mistakenly submitted Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/booleans.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/canonicalize_context.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/check_context.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compute_av.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compute_relabel.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/compute_user.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/context.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/disable.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/enabled.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/fgetfilecon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/filecon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/freecon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/freeconary.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/fsetfilecon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/get_context_list.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/get_default_type.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/get_file_contexts.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getcon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getenforce.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getexeccon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getfilecon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getpeercon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getpidcon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getseccontext.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/init.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/is_customizable_type.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/lgetfilecon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/libselinux.a#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_migscs.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_policy.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/lsetfilecon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/matchmediacon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/matchpathcon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/policyvers.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/query_user_context.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/security_get_user_contexts.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/sedarwin_config.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/selinux_config.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setcon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setenforce.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setfilecon.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/seusers.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/system.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/trans.o#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getcon#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getfilecon#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/getsebool#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/setfilecon#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/setsebool#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/utils/togglesebool#2 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 21:27:47 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5547E16A405 for ; Thu, 20 Apr 2006 21:27:47 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42E2143D5E for ; Thu, 20 Apr 2006 21:27:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6E78D46C75 for ; Thu, 20 Apr 2006 17:27:37 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 53C0073134; Thu, 20 Apr 2006 21:26:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6784016A40B; Thu, 20 Apr 2006 21:26:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 136ED16A402 for ; Thu, 20 Apr 2006 21:26:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A267043D46 for ; Thu, 20 Apr 2006 21:26:22 +0000 (GMT) (envelope-from millert@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 k3KLQMsG005621 for ; Thu, 20 Apr 2006 21:26:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KLQMQI005610 for perforce@freebsd.org; Thu, 20 Apr 2006 21:26:22 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 21:26:22 GMT Message-Id: <200604202126.k3KLQMQI005610@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95721 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 21:27:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=95721 Change 95721 by millert@millert_g5tower on 2006/04/20 21:25:44 Update to libsepol 1.12 Obtained from: pleblance Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/COPYING#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/ChangeLog#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/VERSION#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/avtab.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/boolean_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/booleans.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/conditional.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/constraint.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/context_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/debug.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/ebitmap.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/flask.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/flask_types.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/handle.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/hashtab.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/iface_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/interfaces.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/mls.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/mls_types.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/module.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/node_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/nodes.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/avrule_block.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/avtab.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/conditional.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/constraint.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/context.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/ebitmap.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/expand.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/flask.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/flask_types.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/hashtab.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/hierarchy.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/link.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/mls_types.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/module.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/policydb.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/services.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/sidtab.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb/symtab.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/port_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/ports.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/roles.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/sepol.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/services.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/sidtab.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/symtab.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/user_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/users.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sys/endian.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/man/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/man/man3/sepol_check_context.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/man/man3/sepol_genbools.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/man/man3/sepol_genusers.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/man/man8/chkcon.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/man/man8/genpolbools.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/man/man8/genpolusers.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/assertion.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/av_permissions.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/avrule_block.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/avtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/boolean_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/boolean_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/booleans.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/conditional.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/constraint.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/context.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/context.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/context_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/context_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/debug.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/debug.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/dso.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/ebitmap.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/expand.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/genbools.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/genusers.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/handle.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/handle.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/hashtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/hierarchy.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/iface_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/iface_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/interfaces.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/libsepol.map#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/link.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/mls.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/mls.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/module.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/module_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/node_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/node_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/nodes.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/policydb_convert.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/policydb_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/policydb_public.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/port_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/port_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/ports.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/private.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/roles.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/services.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/sidtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/symtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/user_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/user_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/users.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/util.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/write.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/utils/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/utils/chkcon.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/utils/genpolbools.c#2 delete Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/context.h#2 (text+ko) ==== @@ -1,131 +1,31 @@ +#ifndef _SEPOL_CONTEXT_H_ +#define _SEPOL_CONTEXT_H_ -/* Author : Stephen Smalley, */ +#include +#include +#include -/* FLASK */ +/* -- Deprecated -- */ -/* - * A security context is a set of security attributes - * associated with each subject and object controlled - * by the security policy. Security contexts are - * externally represented as variable-length strings - * that can be interpreted by a user or application - * with an understanding of the security policy. - * Internally, the security server uses a simple - * structure. This structure is private to the - * security server and can be changed without affecting - * clients of the security server. - */ +extern int sepol_check_context( + const char *context); -#ifndef _CONTEXT_H_ -#define _CONTEXT_H_ +/* -- End deprecated -- */ -#include +extern int sepol_context_check( + sepol_handle_t* handle, + const sepol_policydb_t* policydb, + const sepol_context_t* context); -#include +extern int sepol_mls_contains( + sepol_handle_t* handle, + const sepol_policydb_t* policydb, + const char* mls1, + const char* mls2, + int* response); -/* - * A security context consists of an authenticated user - * identity, a role, a type and a MLS range. - */ -typedef struct context_struct { - uint32_t user; - uint32_t role; - uint32_t type; -#ifdef CONFIG_SECURITY_SELINUX_MLS - mls_range_t range; -#endif -} context_struct_t; - - -#ifdef CONFIG_SECURITY_SELINUX_MLS - -static inline void mls_context_init(context_struct_t * c) -{ - memset(&c->range, 0, sizeof(c->range)); -} - -static inline int mls_context_cpy(context_struct_t * dst, - context_struct_t * src) -{ - int rc; - - dst->range.level[0].sens = src->range.level[0].sens; - rc = ebitmap_cpy(&dst->range.level[0].cat, &src->range.level[0].cat); - if (rc) - goto out; - - dst->range.level[1].sens = src->range.level[1].sens; - rc = ebitmap_cpy(&dst->range.level[1].cat, &src->range.level[1].cat); - if (rc) - ebitmap_destroy(&dst->range.level[0].cat); -out: - return rc; -} - -static inline int mls_context_cmp(context_struct_t * c1, - context_struct_t * c2) -{ - return ((c1->range.level[0].sens == c2->range.level[0].sens) && - ebitmap_cmp(&c1->range.level[0].cat,&c2->range.level[0].cat) && - (c1->range.level[1].sens == c2->range.level[1].sens) && - ebitmap_cmp(&c1->range.level[1].cat,&c2->range.level[1].cat)); -} - -static inline void mls_context_destroy(context_struct_t * c) -{ - ebitmap_destroy(&c->range.level[0].cat); - ebitmap_destroy(&c->range.level[1].cat); - mls_context_init(c); -} - -#else - -static inline void mls_context_init(context_struct_t *c __attribute__ ((unused))) -{ } - -static inline int mls_context_cpy(context_struct_t * dst __attribute__ ((unused)), - context_struct_t * src __attribute__ ((unused))) -{ return 0; } - -static inline int mls_context_cmp(context_struct_t * c1 __attribute__ ((unused)), - context_struct_t * c2 __attribute__ ((unused))) -{ return 1; } - -static inline void mls_context_destroy(context_struct_t * c __attribute__ ((unused))) -{ } - +extern int sepol_mls_check( + sepol_handle_t* handle, + const sepol_policydb_t* policydb, + const char* mls); #endif - -static inline void context_init(context_struct_t * c) -{ - memset(c, 0, sizeof(*c)); -} - -static inline int context_cpy(context_struct_t * dst, - context_struct_t * src) -{ - dst->user = src->user; - dst->role = src->role; - dst->type = src->type; - return mls_context_cpy(dst, src); -} - -static inline void context_destroy(context_struct_t * c) -{ - c->user = c->role = c->type = 0; - mls_context_destroy(c); -} - -static inline int context_cmp(context_struct_t * c1, - context_struct_t * c2) -{ - return ((c1->user == c2->user) && - (c1->role == c2->role) && - (c1->type == c2->type) && - mls_context_cmp(c1, c2)); -} - -#endif /* _CONTEXT_H_ */ - -/* FLASK */ - ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/policydb.h#2 (text+ko) ==== @@ -1,327 +1,130 @@ +#ifndef _SEPOL_POLICYDB_H_ +#define _SEPOL_POLICYDB_H_ -/* Author : Stephen Smalley, */ +#include +#include -/* Updated: Frank Mayer and Karl MacMillan - * - * Added conditional policy language extensions - * - * Copyright (C) 2003 - 2004 Tresys Technology, LLC - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 2. - */ +#include -/* FLASK */ +struct sepol_policy_file; +typedef struct sepol_policy_file sepol_policy_file_t; -/* - * A policy database (policydb) specifies the - * configuration data for the security policy. - */ +struct sepol_policydb; +typedef struct sepol_policydb sepol_policydb_t; -#ifndef _POLICYDB_H_ -#define _POLICYDB_H_ +/* Policy file public interfaces. */ -#include +/* Create and free memory associated with a policy file. */ +extern int sepol_policy_file_create(sepol_policy_file_t **pf); +extern void sepol_policy_file_free(sepol_policy_file_t *pf); -#include -#include -#include -#include -#include -#include +/* + * Set the policy file to represent a binary policy memory image. + * Subsequent operations using the policy file will read and write + * the image located at the specified address with the specified length. + * If 'len' is 0, then merely compute the necessary length upon + * subsequent policydb write operations in order to determine the + * necessary buffer size to allocate. + */ +extern void sepol_policy_file_set_mem(sepol_policy_file_t *pf, + char *data, + size_t len); /* - * A datum type is defined for each kind of symbol - * in the configuration data: individual permissions, - * common prefixes for access vectors, classes, - * users, roles, types, sensitivities, categories, etc. + * Get the size of the buffer needed to store a policydb write + * previously done on this policy file. */ +extern int sepol_policy_file_get_len(sepol_policy_file_t *pf, + size_t *len); -/* Permission attributes */ -typedef struct perm_datum { - uint32_t value; /* permission bit + 1 */ -#ifdef CONFIG_SECURITY_SELINUX_MLS -#define MLS_BASE_READ 1 /* MLS base permission `read' */ -#define MLS_BASE_WRITE 2 /* MLS base permission `write' */ -#define MLS_BASE_READBY 4 /* MLS base permission `readby' */ -#define MLS_BASE_WRITEBY 8 /* MLS base permission `writeby' */ - uint32_t base_perms; /* MLS base permission mask */ -#endif -} perm_datum_t; +/* + * Set the policy file to represent a FILE. + * Subsequent operations using the policy file will read and write + * to the FILE. + */ +extern void sepol_policy_file_set_fp(sepol_policy_file_t *pf, + FILE *fp); -/* Attributes of a common prefix for access vectors */ -typedef struct common_datum { - uint32_t value; /* internal common value */ - symtab_t permissions; /* common permissions */ -} common_datum_t; +/* + * Associate a handle with a policy file, for use in + * error reporting from subsequent calls that take the + * policy file as an argument. + */ +extern void sepol_policy_file_set_handle(sepol_policy_file_t *pf, + sepol_handle_t *handle); -/* Class attributes */ -typedef struct class_datum { - uint32_t value; /* class value */ - char *comkey; /* common name */ - common_datum_t *comdatum; /* common datum */ - symtab_t permissions; /* class-specific permission symbol table */ - constraint_node_t *constraints; /* constraints on class permissions */ -#ifdef CONFIG_SECURITY_SELINUX_MLS - mls_perms_t mlsperms; /* MLS base permission masks */ -#endif -} class_datum_t; +/* Policydb public interfaces. */ -/* Role attributes */ -typedef struct role_datum { - uint32_t value; /* internal role value */ - ebitmap_t dominates; /* set of roles dominated by this role */ - ebitmap_t types; /* set of authorized types for role */ -} role_datum_t; +/* Create and free memory associated with a policydb. */ +extern int sepol_policydb_create(sepol_policydb_t **p); +extern void sepol_policydb_free(sepol_policydb_t *p); -typedef struct role_trans { - uint32_t role; /* current role */ - uint32_t type; /* program executable type */ - uint32_t new_role; /* new role */ - struct role_trans *next; -} role_trans_t; +/* Legal types of policies that the policydb can represent. */ +#define SEPOL_POLICY_KERN 0 +#define SEPOL_POLICY_BASE 1 +#define SEPOL_POLICY_MOD 2 -typedef struct role_allow { - uint32_t role; /* current role */ - uint32_t new_role; /* new role */ - struct role_allow *next; -} role_allow_t; +/* + * Range of policy versions for the kernel policy type supported + * by this library. + */ +extern int sepol_policy_kern_vers_min(void); +extern int sepol_policy_kern_vers_max(void); -/* Type attributes */ -typedef struct type_datum { - uint32_t value; /* internal type value */ - unsigned char primary; /* primary name? */ -#ifndef __KERNEL__ - unsigned char isattr; /* is this a type attribute? */ - ebitmap_t types; /* types with this attribute */ -#endif -} type_datum_t; +/* + * Set the policy type as specified, and automatically initialize the + * policy version accordingly to the maximum version supported for the + * policy type. + * Returns -1 if the policy type is not legal. + */ +extern int sepol_policydb_set_typevers(sepol_policydb_t *p, unsigned int type); -/* User attributes */ -typedef struct user_datum { - uint32_t value; /* internal user value */ - ebitmap_t roles; /* set of authorized roles for user */ -#ifdef CONFIG_SECURITY_SELINUX_MLS - mls_range_list_t *ranges; /* list of authorized MLS ranges for user */ -#endif - unsigned defined; -} user_datum_t; +/* + * Set the policy version to a different value. + * Returns -1 if the policy version is not in the supported range for + * the (previously set) policy type. + */ +extern int sepol_policydb_set_vers(sepol_policydb_t *p, unsigned int vers); +/* + * Read a policydb from a policy file. + * This automatically sets the type and version based on the + * image contents. + */ +extern int sepol_policydb_read(sepol_policydb_t *p, + sepol_policy_file_t *pf); -#ifdef CONFIG_SECURITY_SELINUX_MLS -/* Sensitivity attributes */ -typedef struct level_datum { - mls_level_t *level; /* sensitivity and associated categories */ - unsigned char isalias; /* is this sensitivity an alias for another? */ -} level_datum_t; +/* + * Write a policydb to a policy file. + * The generated image will be in the binary format corresponding + * to the policy version associated with the policydb. + */ +extern int sepol_policydb_write(sepol_policydb_t *p, + sepol_policy_file_t *pf); -/* Category attributes */ -typedef struct cat_datum { - uint32_t value; /* internal category bit + 1 */ - unsigned char isalias; /* is this category an alias for another? */ -} cat_datum_t; -#endif - -/* Boolean data type */ -typedef struct cond_bool_datum { - uint32_t value; /* internal type value */ - int state; -} cond_bool_datum_t; - -struct cond_node; - -typedef struct cond_node cond_list_t; - /* - * The configuration data includes security contexts for - * initial SIDs, unlabeled file systems, TCP and UDP port numbers, - * network interfaces, and nodes. This structure stores the - * relevant data for one such entry. Entries of the same kind - * (e.g. all initial SIDs) are linked together into a list. + * Extract a policydb from a binary policy memory image. + * This is equivalent to sepol_policydb_read with a policy file + * set to refer to memory. */ -typedef struct ocontext { - union { - char *name; /* name of initial SID, fs, netif, fstype, path */ - struct { - uint8_t protocol; - uint16_t low_port; - uint16_t high_port; - } port; /* TCP or UDP port information */ - struct { - uint32_t addr; - uint32_t mask; - } node; /* node information */ - struct { - uint32_t addr[4]; - uint32_t mask[4]; - } node6; /* IPv6 node information */ - } u; - union { - uint32_t sclass; /* security class for genfs */ - uint32_t behavior; /* labeling behavior for fs_use */ - } v; - context_struct_t context[2]; /* security context(s) */ - security_id_t sid[2]; /* SID(s) */ - struct ocontext *next; -} ocontext_t; - -typedef struct genfs { - char *fstype; - struct ocontext *head; - struct genfs *next; -} genfs_t; - -/* symbol table array indices */ -#define SYM_COMMONS 0 -#define SYM_CLASSES 1 -#define SYM_ROLES 2 -#define SYM_TYPES 3 -#define SYM_USERS 4 -#ifdef CONFIG_SECURITY_SELINUX_MLS -#define SYM_LEVELS 5 -#define SYM_CATS 6 -#define SYM_BOOLS 7 -#define SYM_NUM 8 -#else -#define SYM_BOOLS 5 -#define SYM_NUM 6 -#endif - -/* object context array indices */ -#define OCON_ISID 0 /* initial SIDs */ -#define OCON_FS 1 /* unlabeled file systems */ -#define OCON_PORT 2 /* TCP and UDP port numbers */ -#define OCON_NETIF 3 /* network interfaces */ -#define OCON_NODE 4 /* nodes */ -#define OCON_FSUSE 5 /* fs_use */ -#define OCON_NODE6 6 /* IPv6 nodes */ -#define OCON_NUM 7 - -/* The policy database */ -typedef struct policydb { - /* symbol tables */ - symtab_t symtab[SYM_NUM]; -#define p_commons symtab[SYM_COMMONS] -#define p_classes symtab[SYM_CLASSES] -#define p_roles symtab[SYM_ROLES] -#define p_types symtab[SYM_TYPES] -#define p_users symtab[SYM_USERS] -#define p_levels symtab[SYM_LEVELS] -#define p_cats symtab[SYM_CATS] -#define p_bools symtab[SYM_BOOLS] +extern int sepol_policydb_from_image(sepol_handle_t *handle, + void* data, size_t len, + sepol_policydb_t *p); - /* symbol names indexed by (value - 1) */ - char **sym_val_to_name[SYM_NUM]; -#define p_common_val_to_name sym_val_to_name[SYM_COMMONS] -#define p_class_val_to_name sym_val_to_name[SYM_CLASSES] -#define p_role_val_to_name sym_val_to_name[SYM_ROLES] -#define p_type_val_to_name sym_val_to_name[SYM_TYPES] -#define p_user_val_to_name sym_val_to_name[SYM_USERS] -#define p_sens_val_to_name sym_val_to_name[SYM_LEVELS] -#define p_cat_val_to_name sym_val_to_name[SYM_CATS] -#define p_bool_val_to_name sym_val_to_name[SYM_BOOLS] - /* class, role, and user attributes indexed by (value - 1) */ - class_datum_t **class_val_to_struct; - role_datum_t **role_val_to_struct; - user_datum_t **user_val_to_struct; - - /* type enforcement access vectors and transitions */ - avtab_t te_avtab; - - /* bools indexed by (value - 1) */ - cond_bool_datum_t **bool_val_to_struct; - /* type enforcement conditional access vectors and transitions */ - avtab_t te_cond_avtab; - /* linked list indexing te_cond_avtab by conditional */ - cond_list_t* cond_list; - - /* role transitions */ - role_trans_t *role_tr; - - /* role allows */ - role_allow_t *role_allow; - - /* security contexts of initial SIDs, unlabeled file systems, - TCP or UDP port numbers, network interfaces and nodes */ - ocontext_t *ocontexts[OCON_NUM]; - - /* security contexts for files in filesystems that cannot support - a persistent label mapping or use another - fixed labeling behavior. */ - genfs_t *genfs; - -#ifdef CONFIG_SECURITY_SELINUX_MLS - /* number of legitimate MLS levels */ - uint32_t nlevels; - - ebitmap_t trustedreaders; - ebitmap_t trustedwriters; - ebitmap_t trustedobjects; -#endif - - unsigned policyvers; -} policydb_t; - -extern int policydb_init(policydb_t * p); - -extern int policydb_index_classes(policydb_t * p); - -extern int policydb_index_bools(policydb_t * p); - -extern int policydb_index_others(policydb_t * p, unsigned int verbose); - -extern int constraint_expr_destroy(constraint_expr_t * expr); - -extern void policydb_destroy(policydb_t * p); - -extern int policydb_load_isids(policydb_t *p, sidtab_t *s); - -extern int policydb_context_isvalid(policydb_t *p, context_struct_t *c); - -/* A policy "file" may be a memory region referenced by a (data, len) pair - or a file referenced by a FILE pointer. */ -struct policy_file { -#define PF_USE_MEMORY 0 -#define PF_USE_STDIO 1 - unsigned type; - char *data; - size_t len; - FILE *fp; -}; - -extern int policydb_read(policydb_t * p, struct policy_file * fp, unsigned int verbose); - -extern int policydb_write(struct policydb *p, struct policy_file *pf); - -#define PERM_SYMTAB_SIZE 32 - -/* Identify specific policy version changes */ -#define POLICYDB_VERSION_BASE 15 -#define POLICYDB_VERSION_BOOL 16 -#define POLICYDB_VERSION_IPV6 17 -#define POLICYDB_VERSION_NLCLASS 18 - -/* Range of policy versions we understand*/ -#define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE -#define POLICYDB_VERSION_MAX POLICYDB_VERSION_NLCLASS - /* - * Set policy version for writing policies. - * May be any value from POLICYDB_VERSION_MIN to POLICYDB_VERSION_MAX. - * If not set, then policydb_write defaults to the max. + * Generate a binary policy memory image from a policydb. + * This is equivalent to sepol_policydb_write with a policy file + * set to refer to memory, but internally handles computing the + * necessary length and allocating an appropriately sized memory + * buffer for the caller. */ -extern int sepol_set_policyvers(unsigned int policyvers); +extern int sepol_policydb_to_image(sepol_handle_t *handle, + sepol_policydb_t *p, + void **newdata, + size_t *newlen); -#define POLICYDB_CONFIG_MLS 1 +extern int sepol_policydb_mls_enabled( + const sepol_policydb_t* p); -#define OBJECT_R "object_r" -#define OBJECT_R_VAL 1 - -#define POLICYDB_MAGIC SELINUX_MAGIC -#define POLICYDB_STRING "SE Linux" - -#endif /* _POLICYDB_H_ */ - -/* FLASK */ - +#endif ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sepol/sepol.h#2 (text+ko) ==== @@ -1,21 +1,28 @@ #ifndef _SEPOL_H_ #define _SEPOL_H_ -#include +#include +#include -/* Given an existing binary policy (starting at 'data', with length 'len') - and a boolean configuration file named by 'boolpath', rewrite the binary - policy for the boolean settings in the boolean configuration file. - The binary policy is rewritten in place in memory. - Returns 0 upon success, or -1 otherwise. */ -extern int sepol_genbools(void *data, size_t len, char *boolpath); +#include +#include +#include +#include +#include +#include -/* Given an existing binary policy (starting at 'data', with length 'len') - and boolean settings specified by the parallel arrays ('names', 'values') - with 'nel' elements, rewrite the binary policy for the boolean settings. - The binary policy is rewritten in place in memory. - Returns 0 upon success or -1 otherwise. */ -extern int sepol_genbools_array(void *data, size_t len, char **names, int *values, int nel); +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/* Set internal policydb from a file for subsequent service calls. */ +extern int sepol_set_policydb_from_file(FILE *fp); #endif ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/Makefile#3 (text+ko) ==== @@ -7,32 +7,29 @@ LIBVERSION = 1 -# Set to y for MLS -MLS=n - LIBA=libsepol.a #TARGET=libsepol.so #LIBSO=$(TARGET).$(LIBVERSION) OBJS= $(patsubst %.c,%.o,$(wildcard *.c)) #LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c)) -CFLAGS = -Wall $(OPTIONS) -override CFLAGS += -I. -I../include +CFLAGS ?= -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute +override CFLAGS += -I. -I../include -I../../libsecompat -D_GNU_SOURCE -all: $(LIBA) +all: $(LIBA) $(LIBSO) $(LIBA): $(OBJS) $(AR) rcs $@ $^ ranlib $@ $(LIBSO): $(LOBJS) - $(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,$(LIBSO),--version-script=libsepol.map + $(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,$(LIBSO),--version-script=libsepol.map,-z,defs ln -sf $@ $(TARGET) %.o: %.c $(CC) $(CFLAGS) -c -o $@ $< %.lo: %.c - $(CC) $(CFLAGS) -fPIC -c -o $@ $< + $(CC) $(CFLAGS) -fPIC -DSHARED -c -o $@ $< install: all test -d $(LIBDIR) || install -m 755 -d $(LIBDIR) @@ -41,6 +38,9 @@ # install -m 755 $(LIBSO) $(SHLIBDIR) # cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) +relabel: +# /sbin/restorecon $(SHLIBDIR)/$(LIBSO) + clean: - rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET) + -rm -f $(OBJS) $(LOBJS) $(LIBA) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/av_permissions.h#2 (text+ko) ==== @@ -1,2 +1,3 @@ /* Used by security_compute_av. */ #define PROCESS__TRANSITION 0x00000002UL +#define PROCESS__DYNTRANSITION 0x00800000UL ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/avtab.c#2 (text+ko) ==== @@ -5,10 +5,26 @@ * * Added conditional policy language extensions * + * Updated: Red Hat, Inc. James Morris + * + * Code cleanup + * * Copyright (C) 2003 Tresys Technology, LLC - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 2. + * Copyright (C) 2003 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* FLASK */ @@ -18,9 +34,10 @@ */ #include -#include -#include +#include +#include +#include "debug.h" #include "private.h" #define AVTAB_HASH(keyp) \ @@ -30,7 +47,7 @@ AVTAB_HASH_MASK) static avtab_ptr_t - avtab_insert_node(avtab_t *h, int hvalue, avtab_ptr_t prev, avtab_ptr_t cur, avtab_key_t *key, avtab_datum_t *datum) + avtab_insert_node(avtab_t *h, int hvalue, avtab_ptr_t prev, avtab_key_t *key, avtab_datum_t *datum) { avtab_ptr_t newnode; newnode = (avtab_ptr_t) malloc(sizeof(struct avtab_node)); @@ -57,6 +74,7 @@ { int hvalue; avtab_ptr_t prev, cur, newnode; + uint16_t specified = key->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); if (!h) return -ENOMEM; @@ -68,7 +86,7 @@ if (key->source_type == cur->key.source_type && key->target_type == cur->key.target_type && key->target_class == cur->key.target_class && - (datum->specified & cur->datum.specified)) + (specified & cur->key.specified)) return -EEXIST; if (key->source_type < cur->key.source_type) break; @@ -81,7 +99,7 @@ break; } - newnode = avtab_insert_node(h, hvalue, prev, cur, key, datum); + newnode = avtab_insert_node(h, hvalue, prev, key, datum); if(!newnode) return -ENOMEM; @@ -97,6 +115,7 @@ { int hvalue; avtab_ptr_t prev, cur, newnode; + uint16_t specified = key->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); if (!h) return NULL; @@ -107,7 +126,7 @@ if (key->source_type == cur->key.source_type && key->target_type == cur->key.target_type && key->target_class == cur->key.target_class && - (datum->specified & cur->datum.specified)) + (specified & cur->key.specified)) break; if (key->source_type < cur->key.source_type) break; @@ -119,37 +138,17 @@ key->target_class < cur->key.target_class) break; } - newnode = avtab_insert_node(h, hvalue, prev, cur, key, datum); + newnode = avtab_insert_node(h, hvalue, prev, key, datum); return newnode; } -/* Unlike avtab_insert(), this function stores a caller-provided parse_context pointer, AND - * allow multiple insertions of the same key/specified mask into the table, AND returns - * a pointer to the new node added, all as needed by the conditional avtab. - */ -avtab_ptr_t - avtab_insert_with_parse_context(avtab_t *h, avtab_key_t *key, avtab_datum_t *datum, void *parse_context) -{ - avtab_ptr_t newnode; - - if (!h) - return NULL; - - newnode = avtab_insert_nonunique(h, key, datum); - if(!newnode) - return NULL; - - newnode->parse_context = parse_context; - - return newnode; -} - avtab_datum_t * - avtab_search(avtab_t * h, avtab_key_t * key, int specified) + avtab_search(avtab_t * h, avtab_key_t * key) { int hvalue; avtab_ptr_t cur; + uint16_t specified = key->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); if (!h) @@ -160,7 +159,7 @@ if (key->source_type == cur->key.source_type && key->target_type == cur->key.target_type && key->target_class == cur->key.target_class && - (specified & cur->datum.specified)) + (specified & cur->key.specified)) return &cur->datum; if (key->source_type < cur->key.source_type) @@ -181,10 +180,11 @@ * conjunction with avtab_search_next_node() */ avtab_ptr_t - avtab_search_node(avtab_t * h, avtab_key_t * key, int specified) + avtab_search_node(avtab_t * h, avtab_key_t * key) { int hvalue; avtab_ptr_t cur; + uint16_t specified = key->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); if (!h) return NULL; @@ -194,7 +194,7 @@ if (key->source_type == cur->key.source_type && key->target_type == cur->key.target_type && key->target_class == cur->key.target_class && - (specified & cur->datum.specified)) + (specified & cur->key.specified)) return cur; if (key->source_type < cur->key.source_type) @@ -218,11 +218,12 @@ if (!node) return NULL; + specified &= ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); for (cur = node->next; cur; cur = cur->next) { if (node->key.source_type == cur->key.source_type && node->key.target_type == cur->key.target_type && node->key.target_class == cur->key.target_class && >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 21:31:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E8F916A47F for ; Thu, 20 Apr 2006 21:31:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B48A843D48 for ; Thu, 20 Apr 2006 21:31:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2E06646C75 for ; Thu, 20 Apr 2006 17:31:33 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8588A57ECB; Thu, 20 Apr 2006 21:31:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F54C16A406; Thu, 20 Apr 2006 21:31:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 469EC16A400 for ; Thu, 20 Apr 2006 21:31:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F51643D48 for ; Thu, 20 Apr 2006 21:31:30 +0000 (GMT) (envelope-from millert@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 k3KLVUKM007322 for ; Thu, 20 Apr 2006 21:31:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KLVU42007314 for perforce@freebsd.org; Thu, 20 Apr 2006 21:31:30 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 21:31:30 GMT Message-Id: <200604202131.k3KLVU42007314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95724 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 21:31:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=95724 Change 95724 by millert@millert_g5tower on 2006/04/20 21:31:04 Add a compat lib for libc functions not present on Darwin. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/ftw.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/getline.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/nftw.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/secompat.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/strndup.c#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 21:38:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E75F16A402 for ; Thu, 20 Apr 2006 21:38:50 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C18843D45 for ; Thu, 20 Apr 2006 21:38:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8CEF646C65 for ; Thu, 20 Apr 2006 17:38:48 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 79F6F58AA9; Thu, 20 Apr 2006 21:35:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 734B716A408; Thu, 20 Apr 2006 21:35:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 38FD016A402 for ; Thu, 20 Apr 2006 21:35:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3F5843D46 for ; Thu, 20 Apr 2006 21:35:35 +0000 (GMT) (envelope-from millert@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 k3KLZZux011080 for ; Thu, 20 Apr 2006 21:35:35 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KLZZnQ011074 for perforce@freebsd.org; Thu, 20 Apr 2006 21:35:35 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 21:35:35 GMT Message-Id: <200604202135.k3KLZZnQ011074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95725 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 21:38:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=95725 Change 95725 by millert@millert_g5tower on 2006/04/20 21:35:22 libsemanage 1.6 Obtained from: SELinux Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/COPYING#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/ChangeLog#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/VERSION#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/boolean_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/booleans_active.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/booleans_local.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/booleans_policy.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/context_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/debug.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/fcontext_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/fcontexts_local.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/fcontexts_policy.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/handle.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/iface_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/interfaces_local.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/interfaces_policy.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/modules.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/node_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/nodes_local.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/nodes_policy.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/port_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/ports_local.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/ports_policy.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/semanage.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/seuser_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/seusers_local.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/seusers_policy.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/user_record.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/users_local.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/include/semanage/users_policy.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_count.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_count_active.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_count_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_del_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_exists.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_exists_active.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_exists_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_iterate.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_iterate_active.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_iterate_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_list.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_list_active.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_list_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_modify_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_query.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_query_active.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_query_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_bool_set_active.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_count.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_count_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_del_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_exists.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_exists_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_iterate.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_iterate_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_list.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_list_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_modify_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_query.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_fcontext_query_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_count.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_count_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_del_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_exists.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_exists_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_iterate.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_iterate_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_list.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_list_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_modify_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_query.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_iface_query_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_count.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_count_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_del_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_exists.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_exists_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_iterate.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_iterate_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_list.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_list_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_modify_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_query.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_node_query_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_count.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_count_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_del_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_exists.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_exists_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_iterate.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_iterate_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_list.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_list_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_modify_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_query.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_port_query_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_count.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_count_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_del_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_exists.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_exists_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_iterate.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_iterate_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_list.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_list_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_modify_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_query.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_seuser_query_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_count.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_count_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_del_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_exists.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_exists_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_iterate.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_iterate_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_list.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_list_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_modify_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_query.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/man/man3/semanage_user_query_local.3#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/boolean_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/boolean_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/booleans_active.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/booleans_activedb.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/booleans_file.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/booleans_local.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/booleans_policy.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/booleans_policydb.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/conf-parse.y#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/conf-scan.l#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/context_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/context_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database_activedb.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database_activedb.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database_file.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database_file.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database_join.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database_join.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database_llist.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database_llist.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database_policydb.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/database_policydb.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/debug.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/debug.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/direct_api.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/direct_api.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/dso.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/fcontext_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/fcontext_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/fcontexts_file.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/fcontexts_local.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/fcontexts_policy.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/handle.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/handle.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/handle_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/iface_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/iface_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/interfaces_file.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/interfaces_local.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/interfaces_policy.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/interfaces_policydb.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/libsemanage.map#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/module_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/modules.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/modules.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/node_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/node_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/nodes_file.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/nodes_local.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/nodes_policy.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/nodes_policydb.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/parse_utils.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/parse_utils.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/policy.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/policy_components.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/port_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/port_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/ports_file.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/ports_local.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/ports_policy.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/ports_policydb.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/private.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/pywrap-test.py#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/semanage.conf#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/semanage.py#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/semanage_conf.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/semanage_store.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/semanage_store.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/semanageswig.i#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/semanageswig_python.i#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/semanageswig_wrap.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/seuser_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/seuser_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/seusers_file.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/seusers_local.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/seusers_policy.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/strverscmp.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/user_base_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/user_extra_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/user_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/user_record.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/users_base_file.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/users_base_policydb.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/users_extra_file.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/users_join.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/users_local.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/users_policy.c#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 21:39:15 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E3E6F16A403 for ; Thu, 20 Apr 2006 21:39:15 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5ED9D43D55 for ; Thu, 20 Apr 2006 21:39:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9C15F46CD8 for ; Thu, 20 Apr 2006 17:39:04 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3F89073177; Thu, 20 Apr 2006 21:37:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 391AB16A407; Thu, 20 Apr 2006 21:37:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F215016A402 for ; Thu, 20 Apr 2006 21:37:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5D9743D5A for ; Thu, 20 Apr 2006 21:37:38 +0000 (GMT) (envelope-from millert@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 k3KLbckN013770 for ; Thu, 20 Apr 2006 21:37:38 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KLbc42013764 for perforce@freebsd.org; Thu, 20 Apr 2006 21:37:38 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 21:37:38 GMT Message-Id: <200604202137.k3KLbc42013764@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95726 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 21:39:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=95726 Change 95726 by millert@millert_g5tower on 2006/04/20 21:37:09 policycoreutils 1.30 Obtained from: SELinux Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/COPYING#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/ChangeLog#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/VERSION#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/audit2allow/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/audit2allow/audit2allow#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/audit2allow/audit2allow.1#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/audit2allow/audit2allow.perl#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/audit2why/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/audit2why/audit2why.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/audit2why/audit2why.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/load_policy/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/load_policy/load_policy.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/load_policy/load_policy.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/newrole/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/newrole/newrole.1#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/newrole/newrole.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/newrole/newrole.pamd#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/Makefile.in#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/Makefile.in.in#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/POTFILES#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/POTFILES.in#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/da.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/de.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/es.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/et.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/fr.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/gl.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/id.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/it.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/ko.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/nl.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/pl.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/policycoreutils.pot#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/pt_BR.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/ru.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/po/sv.po#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/restorecon/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/restorecon/restorecon.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/restorecon/restorecon.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/run_init/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/run_init/open_init_pty.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/run_init/open_init_pty.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/run_init/run_init.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/run_init/run_init.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/run_init/run_init.pamd#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/scripts/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/scripts/chcat#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/scripts/chcat.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/scripts/fixfiles#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/scripts/fixfiles.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/scripts/genhomedircon#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/scripts/genhomedircon.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semanage/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semanage/semanage#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semanage/semanage.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semanage/seobject.py#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule/semodule.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule/semodule.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule_expand/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule_expand/semodule_expand.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule_expand/semodule_expand.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule_link/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule_link/semodule_link.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule_link/semodule_link.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule_package/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule_package/semodule_package.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/semodule_package/semodule_package.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/sestatus/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/sestatus/sestatus.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/sestatus/sestatus.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/sestatus/sestatus.conf#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/setfiles/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/setfiles/setfiles.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/setfiles/setfiles.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/setsebool/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/setsebool/setsebool.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/setsebool/setsebool.c#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 21:49:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F54E16A405 for ; Thu, 20 Apr 2006 21:49:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABFE743D5A for ; Thu, 20 Apr 2006 21:49:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 57E3146C65 for ; Thu, 20 Apr 2006 17:49:56 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E189157232; Thu, 20 Apr 2006 21:49:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DB10116A407; Thu, 20 Apr 2006 21:49:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E94916A405 for ; Thu, 20 Apr 2006 21:49:54 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F56543D49 for ; Thu, 20 Apr 2006 21:49:54 +0000 (GMT) (envelope-from millert@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 k3KLnsU0018829 for ; Thu, 20 Apr 2006 21:49:54 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KLnrvM018826 for perforce@freebsd.org; Thu, 20 Apr 2006 21:49:53 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 21:49:53 GMT Message-Id: <200604202149.k3KLnrvM018826@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95727 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 21:49:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=95727 Change 95727 by millert@millert_g5tower on 2006/04/20 21:49:11 checkpolicy 1.30 Obtained from: SELinux Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkmodule.8#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkmodule.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/genpolusers.c#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/module_compiler.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/module_compiler.h#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/test/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/test/dismod.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/test/dispol.c#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/Makefile#5 (text+ko) ==== @@ -1,20 +1,19 @@ -all: - cd sedarwin && gnumake - cd libsepol/src && gnumake - cd libselinux && gnumake - cd programs && gnumake - cd policy && gnumake +SUBDIR= sedarwin \ + libsecompat \ + libsepol \ + libselinux \ + libsemanage \ + programs \ + policy + +.PHONY: $(SUBDIR) all install clean + +all: $(SUBDIR) -clean: - cd sedarwin && gnumake clean - cd libsepol/src && gnumake clean - cd libselinux && gnumake clean - cd programs && gnumake clean - cd policy && gnumake clean +$(SUBDIR): + $(MAKE) -w -C $@ -install: - cd sedarwin && gnumake install - cd libsepol/src && gnumake install - cd libselinux && gnumake install - cd programs && gnumake install - cd policy && gnumake install +install clean: + for dir in $(SUBDIR); do \ + $(MAKE) -w -C $$dir $@; \ + done ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/Makefile#5 (text+ko) ==== @@ -1,24 +1,24 @@ -include ../../Makeconfig - SUBDIR= checkpolicy \ - loadpolicy \ + genhomedircon \ + load_policy \ newrole \ - relabel_gui + setfiles \ + setsebool \ + semodule \ + semodule_expand \ + semodule_link \ + semodule_package \ + relabel_gui \ + restorecon + +.PHONY: $(SUBDIR) all install clean -all: - cd checkpolicy ; gnumake - cd loadpolicy ; gnumake - cd newrole ; gnumake - cd relabel_gui ; gnumake +all: $(SUBDIR) -clean: - cd checkpolicy ; gnumake clean - cd loadpolicy ; gnumake clean - cd newrole ; gnumake clean - cd relabel_gui ; gnumake clean +$(SUBDIR): + $(MAKE) -w -C $@ -install: - cd checkpolicy ; gnumake install - cd loadpolicy ; gnumake install - cd newrole ; gnumake install - cd relabel_gui ; gnumake install +install clean: + for dir in $(SUBDIR); do \ + $(MAKE) -w -C $$dir $@; \ + done From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 21:52:00 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 591A016A405 for ; Thu, 20 Apr 2006 21:52:00 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D186843D45 for ; Thu, 20 Apr 2006 21:51:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6E67C46C7E for ; Thu, 20 Apr 2006 17:51:59 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C8A8F55415; Thu, 20 Apr 2006 21:51:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C2F4716A406; Thu, 20 Apr 2006 21:51:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B30A16A401 for ; Thu, 20 Apr 2006 21:51:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 426AD43D48 for ; Thu, 20 Apr 2006 21:51:57 +0000 (GMT) (envelope-from millert@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 k3KLpvEH020511 for ; Thu, 20 Apr 2006 21:51:57 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KLpvbf020503 for perforce@freebsd.org; Thu, 20 Apr 2006 21:51:57 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 21:51:57 GMT Message-Id: <200604202151.k3KLpvbf020503@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95728 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 21:52:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=95728 Change 95728 by millert@millert_g5tower on 2006/04/20 21:51:43 Remove old loadpolicy Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/Makefile#6 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.8#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/loadpolicy/loadpolicy.c#3 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 20 21:58:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D2F1216A471 for ; Thu, 20 Apr 2006 21:58:08 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4826D43D46 for ; Thu, 20 Apr 2006 21:58:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D93B846CF9 for ; Thu, 20 Apr 2006 17:58:07 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3EF8657C03; Thu, 20 Apr 2006 21:58:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 380B616A404; Thu, 20 Apr 2006 21:58:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 147E516A402 for ; Thu, 20 Apr 2006 21:58:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCA4E43D49 for ; Thu, 20 Apr 2006 21:58:06 +0000 (GMT) (envelope-from millert@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 k3KLw6ks025600 for ; Thu, 20 Apr 2006 21:58:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KLw6GI025597 for perforce@freebsd.org; Thu, 20 Apr 2006 21:58:06 GMT (envelope-from millert@freebsd.org) Date: Thu, 20 Apr 2006 21:58:06 GMT Message-Id: <200604202158.k3KLw6GI025597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95731 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 21:58:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=95731 Change 95731 by millert@millert_g5tower on 2006/04/20 21:58:02 Build components of policycoreutils Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/genhomedircon/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.1#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.c#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/restorecon/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/semodule/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/semodule_expand/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/semodule_link/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/semodule_package/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/setfiles/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/setsebool/Makefile#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Fri Apr 21 17:45:09 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 50D5E16A400 for ; Fri, 21 Apr 2006 17:45:09 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A74F43D4C for ; Fri, 21 Apr 2006 17:45:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6CE5646BC1 for ; Fri, 21 Apr 2006 13:45:06 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 18BD356716; Fri, 21 Apr 2006 17:44:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1120E16A404; Fri, 21 Apr 2006 17:44:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C321B16A403 for ; Fri, 21 Apr 2006 17:44:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A28AB43D5C for ; Fri, 21 Apr 2006 17:44:47 +0000 (GMT) (envelope-from millert@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 k3LHilNS067379 for ; Fri, 21 Apr 2006 17:44:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3LHilrF067376 for perforce@freebsd.org; Fri, 21 Apr 2006 17:44:47 GMT (envelope-from millert@freebsd.org) Date: Fri, 21 Apr 2006 17:44:47 GMT Message-Id: <200604211744.k3LHilrF067376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95805 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Apr 2006 17:45:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=95805 Change 95805 by millert@millert_g5tower on 2006/04/21 17:43:50 Adapt to selinux userland update Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MAC.loginPlugin.xcode/project.pbxproj#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.m#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_sedarwin/GNUmakefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_sedarwin/pam_sedarwin.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/LabelDialog.m#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/MAC.loginPlugin.xcode/project.pbxproj#3 (text+ko) ==== @@ -81,8 +81,8 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = plugins/SEDarwin/Info.plist; - OTHER_CFLAGS = "-I../../xnu/BUILD/obj/EXPORT_HDRS/bsd -idirafter ../../xnu/BUILD/obj/EXPORT_HDRS/osfmk -I../../../sedarwin/libselinux/include -I../../../sedarwin"; - OTHER_LDFLAGS = "-framework Foundation -framework AppKit -L../../libmac -lmac -L../../../sedarwin/libselinux/src -lselinux"; + OTHER_CFLAGS = "-I../../xnu/BUILD/obj/EXPORT_HDRS/bsd -idirafter ../../xnu/BUILD/obj/EXPORT_HDRS/osfmk -I../../../sedarwin/libselinux/include"; + OTHER_LDFLAGS = "-framework Foundation -framework AppKit -L../../../sedarwin/libselinux/src -lselinux -L../../../sedarwin/libsepol/src -lsepol -L../../../sedarwin/libsecompat -lsecompat -L../../libmac -lmac"; OTHER_REZFLAGS = ""; PRODUCT_NAME = SEDarwin; SECTORDER_FLAGS = ""; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.h#3 (text+ko) ==== @@ -6,8 +6,8 @@ #include #include #include +#include #include -#include @interface SEDarwin : NSObject { ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/osx_cmds/MAC.loginPlugin/plugins/SEDarwin/SEDarwin.m#4 (text+ko) ==== @@ -41,7 +41,7 @@ return; } - if (!sebsd_enabled()) + if (!is_selinux_enabled()) return; /* @@ -88,7 +88,7 @@ } /* XXX - use SELINUX_DEFAULTUSER and fill in selector if not enabled? */ - if (!sebsd_enabled()) + if (!is_selinux_enabled()) return (MAC_LOGIN_OK); /* ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_sedarwin/GNUmakefile#3 (text+ko) ==== @@ -7,9 +7,11 @@ Extra_CC_Flags =-I../../pam/pam/libpam/include/pam/ \ -I../../xnu/BUILD/obj/EXPORT_HDRS/bsd/ \ -idirafter ../../xnu/BUILD/obj/EXPORT_HDRS/osfmk \ - -I../../../sedarwin -I../../../sedarwin/libselinux/include + -I../../../sedarwin/libselinux/include Extra_LD_Flags =-L../../../sedarwin/libselinux/src/ -lselinux \ + -L../../../sedarwin/libsepol/src/ -lsepol \ + -L../../../sedarwin/libsecompat/ -lsecompat \ -L../../libmac/ -lmac include ../PAMModule.defs ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/pam_modules/pam_sedarwin/pam_sedarwin.c#3 (text+ko) ==== @@ -32,8 +32,8 @@ #define _BSD_SOURCE #include #include +#include #include -#include #include #include @@ -115,7 +115,7 @@ int ncontexts, retval, which; /* XXX - use SELINUX_DEFAULTUSER if not enabled? */ - if (!sebsd_enabled()) { + if (!is_selinux_enabled()) { syslog(LOG_ERR, "%s(): SEDarwin not enabled", __func__); return (PAM_SUCCESS); } @@ -171,7 +171,7 @@ mac_t label; int retval; - if (!sebsd_enabled()) { + if (!is_selinux_enabled()) { syslog(LOG_ERR, "%s(): SEDarwin not enabled", __func__); return (PAM_SUCCESS); } ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/LabelDialog.m#4 (text+ko) ==== @@ -2,7 +2,8 @@ #import "LabelDialog.h" #import #import -#import +//#import +#import const char *filename; char *initial; @@ -10,9 +11,6 @@ char **users, **roles, **types; size_t nusers, nroles, ntypes; -extern int security_get_file_contexts(const char *fromcontext, char ***retcontexts, size_t *ncontexts); -extern char *getseccontext(void); - static void addstring (char **ar, size_t *n, char *in) { int i; @@ -55,8 +53,16 @@ char **filelabels; size_t nfilelabels; - if (security_get_file_contexts (getseccontext(), &filelabels, &nfilelabels)) + char *seccon; + + if (getcon(&seccon)) { + fprintf(stderr, "Failed to get the current security context\n"); + exit(1); + } + if (security_get_file_contexts (seccon, &filelabels, &nfilelabels)) +// if (security_get_file_contexts (getseccontext(), &filelabels, &nfilelabels)) exit (1); + free(seccon); users = (char **) malloc (sizeof (char *) * (1+nfilelabels)); roles = (char **) malloc (sizeof (char *) * (1+nfilelabels)); types = (char **) malloc (sizeof (char *) * (1+nfilelabels)); ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/relabel_gui/relabel_gui.pbproj/project.pbxproj#5 (text+ko) ==== @@ -173,7 +173,7 @@ HEADER_SEARCH_PATHS = ""; INSTALL_PATH = "/Applications"; LIBRARY_SEARCH_PATHS = ""; - OTHER_CFLAGS = "-I../.. -I../../../darwin/xnu/BUILD/obj/EXPORT_HDRS/bsd -idirafter ../../../darwin/xnu/BUILD/obj/EXPORT_HDRS/osfmk"; + OTHER_CFLAGS = "-I../../libselinux/include -I../../../darwin/xnu/BUILD/obj/EXPORT_HDRS/bsd -idirafter ../../../darwin/xnu/BUILD/obj/EXPORT_HDRS/osfmk"; OTHER_LDFLAGS = "../../libselinux/src/libselinux.a ../../../darwin/libmac/libmac.a"; PRODUCT_NAME = relabel; SECTORDER_FLAGS = ""; From owner-trustedbsd-cvs@FreeBSD.ORG Fri Apr 21 18:30:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2017416A402 for ; Fri, 21 Apr 2006 18:30:52 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDFC843D4C for ; Fri, 21 Apr 2006 18:30:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9E8CD46D2E for ; Fri, 21 Apr 2006 14:30:48 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E2FC7559C2; Fri, 21 Apr 2006 18:30:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DC94E16A435; Fri, 21 Apr 2006 18:30:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98F7316A43C for ; Fri, 21 Apr 2006 18:30:46 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55B8343D53 for ; Fri, 21 Apr 2006 18:30:46 +0000 (GMT) (envelope-from millert@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 k3LIUkIP094798 for ; Fri, 21 Apr 2006 18:30:46 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3LIUjbt094790 for perforce@freebsd.org; Fri, 21 Apr 2006 18:30:45 GMT (envelope-from millert@freebsd.org) Date: Fri, 21 Apr 2006 18:30:45 GMT Message-Id: <200604211830.k3LIUjbt094790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95810 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Apr 2006 18:30:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=95810 Change 95810 by millert@millert_g5tower on 2006/04/21 18:30:32 Remove a horrible policy hack and have mach_init use mac_execve() instead. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.c#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/macros/global_macros.te#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.c#9 (text+ko) ==== @@ -49,6 +49,7 @@ #import #import #import +#import #import #import #import @@ -825,8 +826,9 @@ static void exec_server(server_t *serverp) { - char **argv; + char **argv, *cp, textlabel[512]; sigset_t mask; + mac_t label; /* * Setup environment for server, someday this should be Mach stuff @@ -881,12 +883,19 @@ sigemptyset(&mask); (void) sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL); + if (mach_get_task_label_text(mach_task_self(), "sebsd", textlabel) == 0 + && (cp = rindex(textlabel, ':')) != NULL) { + *(cp + 1) = '\0'; + strlcat(textlabel, "mach_servers_d"); + if (mac_from_text(&label, textlabel) == 0) + mac_set_proc(label); + } execv(argv[0], argv); unix_fatal("Disabled server %x bootstrap %x: \"%s\": exec()", serverp->port, serverp->bootstrap->bootstrap_port, serverp->cmd); -} +} static char ** argvize(const char *string) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#9 (text+ko) ==== @@ -37,7 +37,7 @@ install: $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${DESTDIR} $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 sebsd_migscs ${DESTDIR} - $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 failsafe_context ${DESTDIR}/private/etc/sedarwin + $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 failsafe_context ${DESTDIR}/private/etc/sedarwin/contexts $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/sedarwin (cd $(CURDIR)/.. && tar -X policy/excludes -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/ && tar -xf -) (cd $(FLASK)/.. && tar -cf - flask) | (cd $(DESTDIR)/private/etc/sedarwin/policy && tar -xf -) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/macros/global_macros.te#6 (text+ko) ==== @@ -310,63 +310,6 @@ ################################# # -# domain_exec_trans(parent_domain, child_domain) -# -# Permissions for transitioning to a new domain. -# - -define(`domain_exec_trans',` - -# -# Allow the process to transition to the new domain. -# -allow $1 $2:process transition; - -# -# Do not audit when glibc secure mode is enabled upon the transition. -# -dontaudit $1 $2:process noatsecure; - -# -# Allow the process to execute the program. -# -allow $1 *:file { read x_file_perms }; - -# -# Allow the process to reap the new domain. -# -allow $2 $1:process sigchld; - -# -# Allow the new domain to inherit and use file -# descriptions from the creating process and vice versa. -# -allow $2 $1:fd use; -allow $1 $2:fd use; - -# -# Allow the new domain to write back to the old domain via a pipe. -# -allow $2 $1:fifo_file rw_file_perms; - -# -# Allow the new domain to read and execute the program. -# -allow $2 *:file rx_file_perms; - -# -# Allow the new domain to be entered via the program. -# -allow $2 *:file entrypoint; - -# -# Make the transition -# -type_transition $1 *:process $2; -') - -################################# -# # domain_auto_trans(parent_domain, program_type, child_domain) # # Define a default domain transition and allow it. ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#9 (text+ko) ==== @@ -131,15 +131,14 @@ #allow init_d { bin_t shell_exec_t file_t }:dir_file_class_set rw_file_perms; #allow init_d bin_t:file execute_no_trans; -# Things executed by mach_init transition to mach_servers_d -# XXX - awful hack -domain_exec_trans(mach_init_d,mach_servers_d); - # Transition from init_d -> mach_init_d when mach_init starts # and then back to init_d when BSD init is exec'd domain_auto_trans(init_d,mach_init_exec_t,mach_init_d); domain_auto_trans(mach_init_d,init_exec_t,init_d); +# mach_init_d does its own transition to mach_servers_d +allow mach_init_d mach_servers_d:process transition; + # User transitions for login and sshd domain_auto_trans(init_d,login_exec_t,login_d); domain_auto_trans(user_d,login_exec_t,login_d); @@ -194,11 +193,17 @@ allow user_d security_t:security *; # Transitions for mach servers started by mach_init -domain_auto_trans(mach_init_d,windowserver_exec_t,windowserver_d); -domain_auto_trans(mach_init_d,lookupd_exec_t,lookupd_d); -domain_auto_trans(mach_init_d,notifyd_exec_t,notifyd_d); -domain_auto_trans(mach_init_d,diskarbitrationd_exec_t,diskarbitrationd_d); -domain_auto_trans(mach_init_d,configd_exec_t,configd_d); +allow mach_servers_d file_t:file entrypoint; +domain_auto_trans(mach_servers_d,windowserver_exec_t,windowserver_d); +allow mach_servers_d windowserver_exec_t:file entrypoint; +domain_auto_trans(mach_servers_d,lookupd_exec_t,lookupd_d); +allow mach_servers_d lookupd_exec_t:file entrypoint; +domain_auto_trans(mach_servers_d,notifyd_exec_t,notifyd_d); +allow mach_servers_d notifyd_exec_t:file entrypoint; +domain_auto_trans(mach_servers_d,diskarbitrationd_exec_t,diskarbitrationd_d); +allow mach_servers_d diskarbitrationd_exec_t:file entrypoint; +domain_auto_trans(mach_servers_d,configd_exec_t,configd_d); +allow mach_servers_d configd_exec_t:file entrypoint; # Transitions for things started by BSD init domain_auto_trans(init_d,systemstarter_exec_t,systemstarter_d); From owner-trustedbsd-cvs@FreeBSD.ORG Fri Apr 21 18:33:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6235B16A403 for ; Fri, 21 Apr 2006 18:33:54 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BF8F43D45 for ; Fri, 21 Apr 2006 18:33:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3028746C5E for ; Fri, 21 Apr 2006 14:33:52 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5B406559C2; Fri, 21 Apr 2006 18:33:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 53F2B16A405; Fri, 21 Apr 2006 18:33:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 19B5316A401 for ; Fri, 21 Apr 2006 18:33:51 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBB8D43D49 for ; Fri, 21 Apr 2006 18:33:50 +0000 (GMT) (envelope-from millert@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 k3LIXoq5097579 for ; Fri, 21 Apr 2006 18:33:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3LIXoD7097576 for perforce@freebsd.org; Fri, 21 Apr 2006 18:33:50 GMT (envelope-from millert@freebsd.org) Date: Fri, 21 Apr 2006 18:33:50 GMT Message-Id: <200604211833.k3LIXoD7097576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95812 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Apr 2006 18:33:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=95812 Change 95812 by millert@millert_g5tower on 2006/04/21 18:33:00 Fix libselinux include path Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsemanage/src/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ include ../../../Makeconfig -CFLAGS+= -I$(EXPORT_HDRS)/bsd -idirafter $(EXPORT_HDRS)/osfmk -I../.. -I../include -I../include/selinux -I../../libsepol/include +CFLAGS+= -I$(EXPORT_HDRS)/bsd -idirafter $(EXPORT_HDRS)/osfmk -I../.. -I../include -I../../libselinux/include -I../../libsepol/include # Installation directories. PREFIX ?= $(DESTDIR)/usr From owner-trustedbsd-cvs@FreeBSD.ORG Fri Apr 21 19:20:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C74E16A404 for ; Fri, 21 Apr 2006 19:20:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D77B243D46 for ; Fri, 21 Apr 2006 19:20:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 54B2F46B9D for ; Fri, 21 Apr 2006 15:20:55 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0A422568A7; Fri, 21 Apr 2006 19:20:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 02DD616A403; Fri, 21 Apr 2006 19:20:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDAD316A401 for ; Fri, 21 Apr 2006 19:20:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8969143D4C for ; Fri, 21 Apr 2006 19:20:30 +0000 (GMT) (envelope-from millert@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 k3LJKTxw025542 for ; Fri, 21 Apr 2006 19:20:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3LJKTXH025530 for perforce@freebsd.org; Fri, 21 Apr 2006 19:20:29 GMT (envelope-from millert@freebsd.org) Date: Fri, 21 Apr 2006 19:20:29 GMT Message-Id: <200604211920.k3LJKTXH025530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 95818 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Apr 2006 19:20:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=95818 Change 95818 by millert@millert_g5tower on 2006/04/21 19:19:35 Improve readability Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/getline.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/getline.c#2 (text+ko) ==== @@ -37,24 +37,25 @@ * Note that outsize is not changed unless memory is allocated. */ ssize_t -getline(char **outbuf, size_t *outsize, FILE *fp) +getline(char **bufp, size_t *bufsizep, FILE *fp) { - char *buf; - size_t len; + char *line, *buf = *bufp; + size_t linelen, bufsize = *bufsizep; - buf = fgetln(fp, &len); - if (buf == NULL) + line = fgetln(fp, &linelen); + if (line == NULL) return (-1); /* Assumes realloc() accepts NULL for ptr (C99) */ - if (*outbuf == NULL || *outsize < len + 1) { - void *tmp = realloc(*outbuf, len + 1); - if (tmp == NULL) + if (buf == NULL || bufsize < linelen + 1) { + bufsize = linelen + 1; + buf = realloc(buf, bufsize); + if (buf == NULL) return (-1); - *outbuf = tmp; - *outsize = len + 1; + *bufp = buf; + *bufsizep = bufsize; } - memcpy(*outbuf, buf, len); - (*outbuf)[len] = '\0'; - return (len); + memcpy(buf, line, linelen); + buf[linelen] = '\0'; + return (linelen); } From owner-trustedbsd-cvs@FreeBSD.ORG Mon Apr 24 16:12:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47B0716A482 for ; Mon, 24 Apr 2006 16:12:37 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7B4643D45 for ; Mon, 24 Apr 2006 16:12:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1EC6F46B28 for ; Mon, 24 Apr 2006 12:12:35 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6CE0355651; Mon, 24 Apr 2006 16:10:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6395316A40A; Mon, 24 Apr 2006 16:10:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DB2516A408 for ; Mon, 24 Apr 2006 16:10:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E61BF43D48 for ; Mon, 24 Apr 2006 16:10:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3OGA8nZ044090 for ; Mon, 24 Apr 2006 16:10:08 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 k3OGA8iN044084 for perforce@freebsd.org; Mon, 24 Apr 2006 16:10:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Apr 2006 16:10:08 GMT Message-Id: <200604241610.k3OGA8iN044084@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 95998 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Apr 2006 16:12:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=95998 Change 95998 by rwatson@rwatson_peppercorn on 2006/04/24 16:09:54 Add HISTORY entry for audit_submit(). Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#12 (text+ko) ==== @@ -36,6 +36,8 @@ auditfilterd. The daemon reads from an audit pipe and feeds both BSM and parsed versions of records to shared objects using a module API. This will provide a framework for the writing of intrusion detection services. +- New utility API, audit_submit(), added to capture common elements of audit + record submission for many applications. OpenBSM 1.0 alpha 5 @@ -163,4 +165,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#11 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#12 $ From owner-trustedbsd-cvs@FreeBSD.ORG Mon Apr 24 16:23:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B28416A405 for ; Mon, 24 Apr 2006 16:23:52 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93E9F43D69 for ; Mon, 24 Apr 2006 16:23:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E1B4B46BA7 for ; Mon, 24 Apr 2006 12:23:50 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 32CB955E28; Mon, 24 Apr 2006 16:23:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 25C7016A40E; Mon, 24 Apr 2006 16:23:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDC3316A409 for ; Mon, 24 Apr 2006 16:23:47 +0000 (UTC) (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 8D2E843D45 for ; Mon, 24 Apr 2006 16:23:47 +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 k3OGNlE9050224 for ; Mon, 24 Apr 2006 16:23:47 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3OGNlgS050218 for perforce@freebsd.org; Mon, 24 Apr 2006 16:23:47 GMT (envelope-from csjp@freebsd.org) Date: Mon, 24 Apr 2006 16:23:47 GMT Message-Id: <200604241623.k3OGNlgS050218@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 96000 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Apr 2006 16:23:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=96000 Change 96000 by csjp@csjp_xor on 2006/04/24 16:22:46 s/au_ctx/auid to be more consistent with the rest of the API naming convention. Requested by: rwatson Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#20 edit .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#22 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#20 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#20 $ */ #ifndef _LIBBSM_H_ @@ -695,7 +695,7 @@ typedef struct tokenstr tokenstr_t; -int audit_submit(short au_event, au_id_t au_ctx, +int audit_submit(short au_event, au_id_t auid, char status, int reterr, const char *fmt, ...); /* ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#6 (text+ko) ==== @@ -26,7 +26,7 @@ .\" 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. -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#6 $ .Dd April 11, 2006 .Dt audit_submit 3 .Os @@ -38,7 +38,7 @@ .Sh SYNOPSIS .In stdio.h .Ft int -.Fn audit_submit "short au_event" "au_id_t au_ctx" "char status" "int reterr" "const char * restrict format" ... +.Fn audit_submit "short au_event" "au_id_t auid" "char status" "int reterr" "const char * restrict format" ... .Sh DESCRIPTION The .Nm ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#22 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#22 $ */ #ifdef __APPLE__ @@ -58,7 +58,7 @@ * General purpose audit submission mechanism for userspace. */ int -audit_submit(short au_event, au_id_t au_ctx, char status, +audit_submit(short au_event, au_id_t auid, char status, int reterr, const char *fmt, ...) { char text[MAX_AUDITSTRING_LEN]; @@ -95,7 +95,7 @@ /* XXX what should we do for termid? */ bzero(&termid, sizeof(termid)); pid = getpid(); - token = au_to_subject32(au_ctx, geteuid(), getegid(), + token = au_to_subject32(auid, geteuid(), getegid(), getuid(), getgid(), pid, pid, &termid); if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, From owner-trustedbsd-cvs@FreeBSD.ORG Mon Apr 24 19:53:45 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54E6E16A505 for ; Mon, 24 Apr 2006 19:53:45 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3597B43D67 for ; Mon, 24 Apr 2006 19:53:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4CCB146CD4 for ; Mon, 24 Apr 2006 15:53:34 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 22E8E5C0B4; Mon, 24 Apr 2006 19:53:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 19F0E16A4D3; Mon, 24 Apr 2006 19:53:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 047B916A4A5 for ; Mon, 24 Apr 2006 19:53:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 725D443DD1 for ; Mon, 24 Apr 2006 19:53:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3OJr7JD077305 for ; Mon, 24 Apr 2006 19:53:07 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 k3OJr6av077278 for perforce@freebsd.org; Mon, 24 Apr 2006 19:53:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Apr 2006 19:53:06 GMT Message-Id: <200604241953.k3OJr6av077278@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 96009 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Apr 2006 19:53:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=96009 Change 96009 by rwatson@rwatson_peppercorn on 2006/04/24 19:52:33 Integrate trustedbsd_openbsm into trustedbsd_audit3: - au_close() arguments are now named constants - Man page for au_open() and friends. - AUR_* now broadened. - au_close_token() to produce a single token in memory. - au_to_file() accepts timeval. - au_to_header32_tm() accepts timeval. Don't use time zone. - Don't reorder bytes for arguments to process/subject tokens. - IPs and ports assumed to be passed and returned in network byte order. - OpenBSM test framework beginnings. - auditd assigns more appropriate syslog levels/facilities. - Audit filter API, dummy module, auditeventd. - audit_submit(). Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_filter.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.guess#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.sub#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/depcomp#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/install-sh#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/missing#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_filter#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_open.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#1 branch Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#3 (text+ko) ==== @@ -1,3 +1,44 @@ +OpenBSM 1.0 alpha 6 + +- Use AU_TO_WRITE and AU_NO_TO_WRITE for the 'keep' argument to au_close(); + previously we used hard-coded 0 and 1 values. +- Add man page for au_open(), au_write(), au_close(), and + au_close_buffer(). +- Support a more complete range of data types for the arbitrary data token: + add AUR_CHAR (alias to AUR_BYTE), remove AUR_LONG, add AUR_INT32 (alias + to AUR_INT), add AUR_INT64. +- Add au_close_token(), which allows writing a single token_t to a memory + buffer. Not likely to be used much by applications, but useful for + writing test tools. +- Modify au_to_file() so that it accepts a timeval in user space, not just + kernel -- this is not a Solaris BSM API so can be modified without + causing compatibility issues. +- Define a new API, au_to_header32_tm(), which adds a struct timeval + argument to the ordinary au_to_header32(), which is now implemented by + wrapping au_to_header32_tm() and calling gettimeofday(). #ifndef KERNEL + the APIs that invoke gettimeofday(), rather than having a variable + definition. Don't try to retrieve time zone information using + gettimeofday(), as it's not needed, and introduces possible failure + modes. +- Don't perform byte order transformations on the addr/machine fields of + the terminal ID that appears in the process32/subject32 tokens. These + are assumed to be IP addresses, and as such, to be in network byte + order. +- Universally, APIs now assume that IP addresses and ports are provided + in network byte order. APIs now generally provide these types in + network byte order when decoding. +- Beginnings of an OpenBSM test framework can now be found in openbsm/test. + This code is not built or installed by default. +- auditd now assigns more appropriate syslog levels to its debugging and + error information. +- Support for audit filters introduced: audit filters are dynamically + loaded shared objects that run in the context of a new daemon, + auditfilterd. The daemon reads from an audit pipe and feeds both BSM and + parsed versions of records to shared objects using a module API. This + will provide a framework for the writing of intrusion detection services. +- New utility API, audit_submit(), added to capture common elements of audit + record submission for many applications. + OpenBSM 1.0 alpha 5 - Update install notes to indicate /etc files are to be installed manually. @@ -124,4 +165,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#2 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#3 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#3 (text+ko) ==== @@ -1,12 +1,13 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#3 $ # SUBDIRS = \ bsm \ libbsm \ bin \ - man + man \ + modules EXTRA_DIST = \ CHANGELOG \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#3 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -181,7 +181,8 @@ bsm \ libbsm \ bin \ - man + man \ + modules EXTRA_DIST = \ CHANGELOG \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#12 (text+ko) ==== @@ -27,7 +27,7 @@ OpenBSM is currently built using autoconf and automake, which should allow for building on a range of operating systems, including FreeBSD, Mac OS X, -and Linux. Depending on the availability of audit facailities in the +and Linux. Depending on the availability of audit facilities in the underlying operating system, some components that depend on kernel audit support are built conditionally. Typically, build will be performed using @@ -95,4 +95,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#11 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#12 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#8 (text+ko) ==== @@ -13,5 +13,9 @@ - It might be desirable to be able to provide EOPNOTSUPP system call stubs on systems that don't have the necessary audit system calls; that would allow the full libbsm and tool set to build, just not run. +- Teach praudit how to begin printing at any point in a token stream, not + just at the beginning of a record. This will make it easier to use + praudit in test suites processing single-token files without header and + trailer context. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#7 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#8 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#6 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_3 +OPENBSM_1_0_ALPHA_6 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#3 (text+ko) ==== @@ -1,8 +1,9 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#3 $ # SUBDIRS = \ + auditfilterd \ auditreduce \ praudit ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#3 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -62,7 +62,7 @@ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = auditreduce praudit audit auditd +DIST_SUBDIRS = auditfilterd auditreduce praudit audit auditd DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -165,7 +165,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = auditreduce praudit $(am__append_1) +SUBDIRS = auditfilterd auditreduce praudit $(am__append_1) all: all-recursive .SUFFIXES: ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#9 $ */ #include @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -63,6 +64,7 @@ static char *lastfile = NULL; static int allhardcount = 0; static int triggerfd = 0; +static int sigchlds, sigchlds_handled; static int sighups, sighups_handled; static int sigterms, sigterms_handled; static long global_flags; @@ -127,7 +129,7 @@ const char *sep = "/"; curdir = dirent->dirname; - syslog(LOG_INFO, "dir = %s\n", dirent->dirname); + syslog(LOG_DEBUG, "dir = %s", dirent->dirname); fn = malloc(strlen(curdir) + strlen(sep) + (2 * POSTFIX_LEN) + 1); if (fn == NULL) @@ -158,10 +160,10 @@ *ptr = '.'; strcpy(ptr+1, TS); if (rename(oldname, lastfile) != 0) - syslog(LOG_ERR, "Could not rename %s to %s \n", + syslog(LOG_ERR, "Could not rename %s to %s", oldname, lastfile); else - syslog(LOG_INFO, "renamed %s to %s \n", + syslog(LOG_INFO, "renamed %s to %s", oldname, lastfile); } free(lastfile); @@ -241,7 +243,7 @@ /* Try until we succeed. */ while ((dirent = TAILQ_FIRST(&dir_q))) { if ((fn = affixdir(timestr, dirent)) == NULL) { - syslog(LOG_INFO, "Failed to swap log at time %s\n", + syslog(LOG_INFO, "Failed to swap log at time %s", timestr); return (-1); } @@ -250,7 +252,7 @@ * Create and open the file; then close and pass to the * kernel if all went well. */ - syslog(LOG_INFO, "New audit file is %s\n", fn); + syslog(LOG_INFO, "New audit file is %s", fn); #ifdef AUDIT_REVIEW_GROUP fd = open_trail(fn, uid, gid); #else @@ -262,7 +264,7 @@ error = auditctl(fn); if (error) { syslog(LOG_ERR, - "auditctl failed setting log file! : %s\n", + "auditctl failed setting log file! : %s", strerror(errno)); close(fd); } else { @@ -284,7 +286,7 @@ free(dirent->dirname); free(dirent); } - syslog(LOG_INFO, "Log directories exhausted\n"); + syslog(LOG_ERR, "Log directories exhausted\n"); return (-1); } @@ -326,7 +328,7 @@ allhardcount = 0; if (swap_audit_file() == -1) { - syslog(LOG_ERR, "Could not swap audit file\n"); + syslog(LOG_ERR, "Could not swap audit file"); /* * XXX Faulty directory listing? - user should be given * XXX an opportunity to change the audit_control file @@ -341,16 +343,16 @@ * XXX is generated here? */ if (0 == (ret = getacmin(&minval))) { - syslog(LOG_INFO, "min free = %d\n", minval); + syslog(LOG_DEBUG, "min free = %d\n", minval); if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, - "could not get audit queue settings\n"); + "could not get audit queue settings"); return (-1); } qctrl.aq_minfree = minval; if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, - "could not set audit queue settings\n"); + "could not set audit queue settings"); return (-1); } } @@ -372,20 +374,20 @@ /* Generate an audit record. */ if ((aufd = au_open()) == -1) - syslog(LOG_ERR, "Could not create audit shutdown event.\n"); + syslog(LOG_ERR, "Could not create audit shutdown event."); else { if ((tok = au_to_text("auditd::Audit shutdown")) != NULL) au_write(aufd, tok); if (au_close(aufd, 1, AUE_audit_shutdown) == -1) syslog(LOG_ERR, - "Could not close audit shutdown event.\n"); + "Could not close audit shutdown event."); } /* Flush contents. */ cond = AUC_DISABLED; err_ret = auditon(A_SETCOND, &cond, sizeof(cond)); if (err_ret != 0) { - syslog(LOG_ERR, "Disabling audit failed! : %s\n", + syslog(LOG_ERR, "Disabling audit failed! : %s", strerror(errno)); err_ret = 1; } @@ -396,15 +398,15 @@ free_dir_q(); if ((remove(AUDITD_PIDFILE) == -1) || err_ret) { - syslog(LOG_ERR, "Could not unregister\n"); + syslog(LOG_ERR, "Could not unregister"); audit_warn_postsigterm(); return (1); } endac(); if (close(triggerfd) != 0) - syslog(LOG_ERR, "Error closing control file\n"); - syslog(LOG_INFO, "Finished.\n"); + syslog(LOG_ERR, "Error closing control file"); + syslog(LOG_INFO, "Finished"); return (0); } @@ -422,6 +424,8 @@ sighups++; if (signal == SIGTERM) sigterms++; + if (signal == SIGCHLD) + sigchlds++; } /* @@ -437,23 +441,22 @@ /* Set up the signal hander. */ if (signal(SIGTERM, relay_signal) == SIG_ERR) { syslog(LOG_ERR, - "Could not set signal handler for SIGTERM\n"); + "Could not set signal handler for SIGTERM"); fail_exit(); } if (signal(SIGCHLD, relay_signal) == SIG_ERR) { syslog(LOG_ERR, - "Could not set signal handler for SIGCHLD\n"); + "Could not set signal handler for SIGCHLD"); fail_exit(); } if (signal(SIGHUP, relay_signal) == SIG_ERR) { syslog(LOG_ERR, - "Could not set signal handler for SIGHUP\n"); + "Could not set signal handler for SIGHUP"); fail_exit(); } if ((pidfile = fopen(AUDITD_PIDFILE, "a")) == NULL) { - syslog(LOG_ERR, - "Could not open PID file\n"); + syslog(LOG_ERR, "Could not open PID file"); audit_warn_tmpfile(); return (-1); } @@ -462,7 +465,7 @@ fd = fileno(pidfile); if (flock(fd, LOCK_EX | LOCK_NB) < 0) { syslog(LOG_ERR, - "PID file is locked (is another auditd running?).\n"); + "PID file is locked (is another auditd running?)."); audit_warn_ebusy(); return (-1); } @@ -490,7 +493,6 @@ static int last_trigger; static time_t last_time; struct dir_ent *dirent; - int rc; /* * Suppres duplicate messages from the kernel within the specified @@ -516,7 +518,7 @@ switch(trigger) { case AUDIT_TRIGGER_LOW_SPACE: - syslog(LOG_INFO, "Got low space trigger\n"); + syslog(LOG_INFO, "Got low space trigger"); if (dirent && (dirent->softlim != 1)) { TAILQ_REMOVE(&dir_q, dirent, dirs); /* Add this node to the end of the list. */ @@ -526,7 +528,7 @@ if (TAILQ_NEXT(TAILQ_FIRST(&dir_q), dirs) != NULL && swap_audit_file() == -1) - syslog(LOG_ERR, "Error swapping audit file\n"); + syslog(LOG_ERR, "Error swapping audit file"); /* * Check if the next dir has already reached its soft @@ -548,7 +550,7 @@ break; case AUDIT_TRIGGER_NO_SPACE: - syslog(LOG_INFO, "Got no space trigger\n"); + syslog(LOG_INFO, "Got no space trigger"); /* Delete current dir, go on to next. */ TAILQ_REMOVE(&dir_q, dirent, dirs); @@ -557,7 +559,7 @@ free(dirent); if (swap_audit_file() == -1) - syslog(LOG_ERR, "Error swapping audit file\n"); + syslog(LOG_ERR, "Error swapping audit file"); /* We are out of log directories. */ audit_warn_allhard(++allhardcount); @@ -568,21 +570,21 @@ * Create a new file and swap with the one being used in * kernel */ - syslog(LOG_INFO, "Got open new trigger\n"); + syslog(LOG_INFO, "Got open new trigger"); if (swap_audit_file() == -1) - syslog(LOG_ERR, "Error swapping audit file\n"); + syslog(LOG_ERR, "Error swapping audit file"); break; case AUDIT_TRIGGER_READ_FILE: - syslog(LOG_INFO, "Got read file trigger\n"); + syslog(LOG_INFO, "Got read file trigger"); if (read_control_file() == -1) - syslog(LOG_ERR, "Error in audit control file\n"); + syslog(LOG_ERR, "Error in audit control file"); if (config_audit_controls() == -1) - syslog(LOG_ERR, "Error setting audit controls\n"); + syslog(LOG_ERR, "Error setting audit controls"); break; default: - syslog(LOG_ERR, "Got unknown trigger %d\n", trigger); + syslog(LOG_ERR, "Got unknown trigger %d", trigger); break; } } @@ -596,10 +598,38 @@ } /* - * Read the control file for triggers and handle appropriately. + * Reap our children. + */ +static void +reap_children(void) +{ + pid_t child; + int wstatus; + + while ((child = waitpid(-1, &wstatus, WNOHANG)) > 0) { + if (!wstatus) + continue; + syslog(LOG_INFO, "warn process [pid=%d] %s %d.", child, + ((WIFEXITED(wstatus)) ? "exited with non-zero status" : + "exited as a result of signal"), + ((WIFEXITED(wstatus)) ? WEXITSTATUS(wstatus) : + WTERMSIG(wstatus))); + } +} + +static void +handle_sigchld(void) +{ + + sigchlds_handled = sigchlds; + reap_children(); +} + +/* + * Read the control file for triggers/signals and handle appropriately. */ static int -wait_for_triggers(void) +wait_for_events(void) { int num; unsigned int trigger; @@ -607,24 +637,28 @@ for (;;) { num = read(triggerfd, &trigger, sizeof(trigger)); if ((num == -1) && (errno != EINTR)) { - syslog(LOG_ERR, "%s: error %d\n", __FUNCTION__, errno); + syslog(LOG_ERR, "%s: error %d", __FUNCTION__, errno); return (-1); } if (sigterms != sigterms_handled) { - syslog(LOG_INFO, "%s: SIGTERM", __FUNCTION__); + syslog(LOG_DEBUG, "%s: SIGTERM", __FUNCTION__); break; } + if (sigchlds != sigchlds_handled) { + syslog(LOG_DEBUG, "%s: SIGCHLD", __FUNCTION__); + handle_sigchld(); + } if (sighups != sighups_handled) { - syslog(LOG_INFO, "%s: SIGHUP", __FUNCTION__); + syslog(LOG_DEBUG, "%s: SIGHUP", __FUNCTION__); handle_sighup(); } if ((num == -1) && (errno == EINTR)) continue; if (num == 0) { - syslog(LOG_INFO, "%s: read EOF\n", __FUNCTION__); + syslog(LOG_ERR, "%s: read EOF", __FUNCTION__); return (-1); } - syslog(LOG_INFO, "%s: read %d\n", __FUNCTION__, trigger); + syslog(LOG_DEBUG, "%s: read %d", __FUNCTION__, trigger); if (trigger == AUDIT_TRIGGER_CLOSE_AND_DIE) break; else @@ -634,26 +668,6 @@ } /* - * Reap our children. - */ -static void -reap_children(void) -{ - pid_t child; - int wstatus; - - while ((child = waitpid(-1, &wstatus, WNOHANG)) > 0) { - if (!wstatus) - continue; - syslog(LOG_INFO, "warn process [pid=%d] %s %d.\n", child, - ((WIFEXITED(wstatus)) ? "exited with non-zero status" : - "exited as a result of signal"), - ((WIFEXITED(wstatus)) ? WEXITSTATUS(wstatus) : - WTERMSIG(wstatus))); - } -} - -/* * Configure the audit controls in the kernel: the event to class mapping, * kernel preselection mask, etc. */ @@ -700,7 +714,7 @@ if (ctr == 0) syslog(LOG_ERR, "No events to class mappings registered."); else - syslog(LOG_INFO, "Registered %d event to class mappings.", + syslog(LOG_DEBUG, "Registered %d event to class mappings.", ctr); /* @@ -713,7 +727,7 @@ syslog(LOG_ERR, "Failed to register non-attributable event mask."); else - syslog(LOG_INFO, + syslog(LOG_DEBUG, "Registered non-attributable event mask."); } else syslog(LOG_ERR, @@ -731,35 +745,53 @@ static void setup(void) { + auditinfo_t auinfo; int aufd; token_t *tok; if ((triggerfd = open(AUDIT_TRIGGER_FILE, O_RDONLY, 0)) < 0) { - syslog(LOG_ERR, "Error opening trigger file\n"); + syslog(LOG_ERR, "Error opening trigger file"); + fail_exit(); + } + + /* + * To provide event feedback cycles and avoid auditd becoming + * stalled if auditing is suspended, auditd and its children run + * without their events being audited. We allow the uid, tid, and + * mask fields to be implicitly set to zero, but do set the pid. We + * run this after opening the trigger device to avoid configuring + * audit state without audit present in the system. + * + * XXXRW: Is there more to it than this? + */ + bzero(&auinfo, sizeof(auinfo)); + auinfo.ai_asid = getpid(); + if (setaudit(&auinfo) == -1) { + syslog(LOG_ERR, "Error setting audit stat"); fail_exit(); } TAILQ_INIT(&dir_q); if (read_control_file() == -1) { - syslog(LOG_ERR, "Error reading control file\n"); + syslog(LOG_ERR, "Error reading control file"); fail_exit(); } /* Generate an audit record. */ if ((aufd = au_open()) == -1) - syslog(LOG_ERR, "Could not create audit startup event.\n"); + syslog(LOG_ERR, "Could not create audit startup event."); else { if ((tok = au_to_text("auditd::Audit startup")) != NULL) au_write(aufd, tok); if (au_close(aufd, 1, AUE_audit_startup) == -1) syslog(LOG_ERR, - "Could not close audit startup event.\n"); + "Could not close audit startup event."); } if (config_audit_controls() == 0) - syslog(LOG_INFO, "Audit controls init successful\n"); + syslog(LOG_INFO, "Audit controls init successful"); else - syslog(LOG_INFO, "Audit controls init failed\n"); + syslog(LOG_ERR, "Audit controls init failed"); } int @@ -800,22 +832,22 @@ #else openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); #endif - syslog(LOG_INFO, "starting...\n"); + syslog(LOG_INFO, "starting..."); if (debug == 0 && daemon(0, 0) == -1) { - syslog(LOG_ERR, "Failed to daemonize\n"); + syslog(LOG_ERR, "Failed to daemonize"); exit(1); } if (register_daemon() == -1) { - syslog(LOG_ERR, "Could not register as daemon\n"); + syslog(LOG_ERR, "Could not register as daemon"); exit(1); } setup(); - rc = wait_for_triggers(); - syslog(LOG_INFO, "auditd exiting.\n"); + rc = wait_for_events(); + syslog(LOG_INFO, "auditd exiting."); exit(rc); } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#7 $ */ /* @@ -42,11 +42,12 @@ #include +#include +#include +#include #include #include #include -#include -#include #include #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#3 (text+ko) ==== @@ -1,11 +1,12 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#3 $ # openbsmdir = $(includedir)/bsm openbsm_HEADERS = \ audit.h \ + audit_filter.h \ audit_internal.h \ audit_kevents.h \ audit_record.h \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#3 $ # srcdir = @srcdir@ @@ -168,6 +168,7 @@ openbsmdir = $(includedir)/bsm openbsm_HEADERS = \ audit.h \ + audit_filter.h \ audit_internal.h \ audit_kevents.h \ audit_record.h \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#7 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -187,13 +187,19 @@ /* data-types for the arbitrary token */ #define AUR_BYTE 0 +#define AUR_CHAR AUR_BYTE #define AUR_SHORT 1 -#define AUR_LONG 2 +#define AUR_INT32 2 +#define AUR_INT AUR_INT +#define AUR_INT64 3 /* ... and their sizes */ #define AUR_BYTE_SIZE sizeof(u_char) +#define AUR_CHAR_SIZE AUR_BYTE_SIZE #define AUR_SHORT_SIZE sizeof(uint16_t) -#define AUR_LONG_SIZE sizeof(uint32_t) +#define AUR_INT32_SIZE sizeof(uint32_t) +#define AUR_INT_SIZE AUR_INT32_SIZE +#define AUR_INT64_SIZE sizeof(uint64_t) /* Modifiers for the header token */ #define PAD_NOTATTR 0x4000 /* nonattributable event */ @@ -230,24 +236,18 @@ int au_write(int d, token_t *m); int au_close(int d, int keep, short event); int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen); +int au_close_token(token_t *tok, u_char *buffer, size_t *buflen); -#if defined(KERNEL) || defined(_KERNEL) token_t *au_to_file(char *file, struct timeval tm); -#else -token_t *au_to_file(char *file); -#endif -#if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, +token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); -token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, - struct timeval tm); -#else +#if !defined(KERNEL) && !defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); #endif -token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_me(void); token_t *au_to_arg(char n, char *text, uint32_t v); token_t *au_to_arg32(char n, char *text, uint32_t v); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#10 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#10 $ */ #ifndef _LIBBSM_H_ @@ -695,6 +695,9 @@ typedef struct tokenstr tokenstr_t; +int audit_submit(short au_event, au_id_t auid, + char status, int reterr, const char *fmt, ...); + /* * Functions relating to querying audit class information. */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.guess#3 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#3 (text+ko) ==== @@ -42,9 +42,6 @@ /* Define if ipc_perm.__seq instead of seq */ #undef HAVE_IPC_PERM___SEQ -/* Define to 1 if you have the `bsm' library (-lbsm). */ -#undef HAVE_LIBBSM - /* Define to 1 if you have the header file. */ #undef HAVE_MACHINE_ENDIAN_H ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.sub#3 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/depcomp#3 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/install-sh#3 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#3 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/missing#3 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#3 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#15 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#20 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -19627,16 +19627,13 @@ -# Checks for libraries. -# FIXME: Replace `main' with a function in `-lbsm': - -echo "$as_me:$LINENO: checking for main in -lbsm" >&5 -echo $ECHO_N "checking for main in -lbsm... $ECHO_C" >&6 -if test "${ac_cv_lib_bsm_main+set}" = set; then +echo "$as_me:$LINENO: checking for library containing dlsym" >&5 +echo $ECHO_N "checking for library containing dlsym... $ECHO_C" >&6 +if test "${ac_cv_search_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsm $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_dlsym=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19644,11 +19641,72 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlsym (); +int +main () +{ +dlsym (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' + { (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_search_dlsym="none required" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_dlsym" = no; then + for ac_lib in dl; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Mon Apr 24 20:11:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92F9D16A400 for ; Mon, 24 Apr 2006 20:11:50 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8CFA43D66 for ; Mon, 24 Apr 2006 20:11:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E683346CB9 for ; Mon, 24 Apr 2006 16:11:33 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 42018576D0; Mon, 24 Apr 2006 20:11:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A82B16A407; Mon, 24 Apr 2006 20:11:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17BF516A401 for ; Mon, 24 Apr 2006 20:11:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A73DC43D46 for ; Mon, 24 Apr 2006 20:11: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 k3OKBU2A088755 for ; Mon, 24 Apr 2006 20:11: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 k3OKBUgX088747 for perforce@freebsd.org; Mon, 24 Apr 2006 20:11:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Apr 2006 20:11:30 GMT Message-Id: <200604242011.k3OKBUgX088747@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 96011 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Apr 2006 20:11:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=96011 Change 96011 by rwatson@rwatson_peppercorn on 2006/04/24 20:11:07 Integrate OpenBSM changes from audit3 to audit3/sys. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#26 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#13 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#26 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#25 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#26 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.3 2006/03/04 16:54:21 rwatson Exp $ */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#9 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#8 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#9 $ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.2 2006/03/04 16:54:21 rwatson Exp $ */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#11 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#10 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#11 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -187,13 +187,19 @@ /* data-types for the arbitrary token */ #define AUR_BYTE 0 +#define AUR_CHAR AUR_BYTE #define AUR_SHORT 1 -#define AUR_LONG 2 +#define AUR_INT32 2 +#define AUR_INT AUR_INT +#define AUR_INT64 3 /* ... and their sizes */ #define AUR_BYTE_SIZE sizeof(u_char) +#define AUR_CHAR_SIZE AUR_BYTE_SIZE #define AUR_SHORT_SIZE sizeof(uint16_t) -#define AUR_LONG_SIZE sizeof(uint32_t) +#define AUR_INT32_SIZE sizeof(uint32_t) +#define AUR_INT_SIZE AUR_INT32_SIZE +#define AUR_INT64_SIZE sizeof(uint64_t) /* Modifiers for the header token */ #define PAD_NOTATTR 0x4000 /* nonattributable event */ @@ -230,24 +236,18 @@ int au_write(int d, token_t *m); int au_close(int d, int keep, short event); int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen); +int au_close_token(token_t *tok, u_char *buffer, size_t *buflen); -#if defined(KERNEL) || defined(_KERNEL) token_t *au_to_file(char *file, struct timeval tm); -#else -token_t *au_to_file(char *file); -#endif -#if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, +token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); -token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, - struct timeval tm); -#else +#if !defined(KERNEL) && !defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); #endif -token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_me(void); token_t *au_to_arg(char n, char *text, uint32_t v); token_t *au_to_arg32(char n, char *text, uint32_t v); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#13 (text+ko) ==== @@ -30,12 +30,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#12 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#13 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.2 2006/03/04 17:00:55 rwatson Exp $ */ #include #include +#include #include #include @@ -208,6 +209,7 @@ /* Determine the size of the basic unit. */ switch (unit_type) { case AUR_BYTE: + /* case AUR_CHAR: */ datasize = AUR_BYTE_SIZE; break; @@ -215,8 +217,13 @@ datasize = AUR_SHORT_SIZE; break; - case AUR_LONG: - datasize = AUR_LONG_SIZE; + case AUR_INT32: + /* case AUR_INT: */ + datasize = AUR_INT32_SIZE; + break; + + case AUR_INT64: + datasize = AUR_INT64_SIZE; break; default: @@ -225,7 +232,7 @@ totdata = datasize * unit_count; - GET_TOKEN_AREA(t, dptr, totdata + 4 * sizeof(u_char)); + GET_TOKEN_AREA(t, dptr, 4 * sizeof(u_char) + totdata); ADD_U_CHAR(dptr, AUT_DATA); ADD_U_CHAR(dptr, unit_print); @@ -299,10 +306,10 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(uint32_t)); ADD_U_CHAR(dptr, AUT_IN_ADDR); - ADD_U_INT32(dptr, internet_addr->s_addr); + ADD_MEM(dptr, &internet_addr->s_addr, sizeof(uint32_t)); return (t); } @@ -319,11 +326,11 @@ u_char *dptr = NULL; u_int32_t type = AF_INET6; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 5 * sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 5 * sizeof(uint32_t)); ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); + ADD_MEM(dptr, internet_addr, 5 * sizeof(uint32_t)); return (t); } @@ -463,23 +470,12 @@ * file pathname N bytes + 1 terminating NULL byte */ token_t * -#if defined(KERNEL) || defined(_KERNEL) au_to_file(char *file, struct timeval tm) -#else -au_to_file(char *file) -#endif { token_t *t; u_char *dptr = NULL; u_int16_t filelen; u_int32_t timems; -#if !defined(KERNEL) && !defined(_KERNEL) - struct timeval tm; - struct timezone tzp; - - if (gettimeofday(&tm, &tzp) == -1) - return (NULL); -#endif /* XXXRW: else ...? */ filelen = strlen(file); @@ -578,7 +574,7 @@ ADD_U_INT32(dptr, pid); ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->port); - ADD_U_INT32(dptr, tid->machine); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); return (t); } @@ -822,19 +818,26 @@ { token_t *t; u_char *dptr = NULL; + uint16_t family; - GET_TOKEN_AREA(t, dptr, 3 * sizeof(u_char) + sizeof(u_int16_t) + - sizeof(u_int32_t)); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 2 * sizeof(uint16_t) + + sizeof(uint32_t)); ADD_U_CHAR(dptr, AUT_SOCKINET32); /* - * In Darwin, sin_family is one octet, but BSM defines the token - * to store two. So we copy in a 0 first. + * BSM defines the family field as 16 bits, but many operating + * systems have an 8-bit sin_family field. Extend to 16 bits before + * writing into the token. Assume that both the port and the address + * in the sockaddr_in are already in network byte order, but family + * is in local byte order. + * + * XXXRW: Should a name space conversion be taking place on the value + * of sin_family? */ - ADD_U_CHAR(dptr, 0); - ADD_U_CHAR(dptr, so->sin_family); - ADD_U_INT16(dptr, so->sin_port); - ADD_U_INT32(dptr, so->sin_addr.s_addr); + family = so->sin_family; + ADD_U_INT16(dptr, family); + ADD_MEM(dptr, &so->sin_port, sizeof(uint16_t)); + ADD_MEM(dptr, &so->sin_addr.s_addr, sizeof(uint32_t)); return (t); @@ -858,7 +861,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); + ADD_MEM(dptr, &so->sin6_addr, 4 * sizeof(uint32_t)); return (t); @@ -902,7 +905,7 @@ ADD_U_INT32(dptr, pid); ADD_U_INT32(dptr, sid); ADD_U_INT32(dptr, tid->port); - ADD_U_INT32(dptr, tid->machine); + ADD_MEM(dptr, &tid->machine, sizeof(u_int32_t)); return (t); } @@ -1088,24 +1091,12 @@ * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) */ token_t * -#if defined(KERNEL) || defined(_KERNEL) -au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, +au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm) -#else -au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) -#endif { token_t *t; u_char *dptr = NULL; u_int32_t timems; -#if !defined(KERNEL) && !defined(_KERNEL) - struct timeval tm; - struct timezone tzp; - - if (gettimeofday(&tm, &tzp) == -1) - return (NULL); -#endif - /* XXXRW: else ...? */ GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + sizeof(u_char) + 2 * sizeof(u_int16_t) + 2 * sizeof(u_int32_t)); @@ -1125,6 +1116,14 @@ } token_t * +au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm) +{ + + return (au_to_header32_tm(rec_size, e_type, e_mod, tm)); +} + +token_t * au_to_header64(__unused int rec_size, __unused au_event_t e_type, __unused au_emod_t e_mod) { @@ -1133,20 +1132,12 @@ } token_t * -#if defined(KERNEL) || defined(_KERNEL) au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm) { return (au_to_header32(rec_size, e_type, e_mod, tm)); } -#else -au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod) -{ - - return (au_to_header32(rec_size, e_type, e_mod)); -} -#endif /* * token ID 1 byte From owner-trustedbsd-cvs@FreeBSD.ORG Tue Apr 25 00:48:22 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6EF8416A404 for ; Tue, 25 Apr 2006 00:48:22 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC60443D53 for ; Tue, 25 Apr 2006 00:48:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2BCAC46CC0 for ; Mon, 24 Apr 2006 20:48:21 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DE7FF554AB; Tue, 25 Apr 2006 00:48:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D837F16A405; Tue, 25 Apr 2006 00:48:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9ACFC16A400 for ; Tue, 25 Apr 2006 00:48:19 +0000 (UTC) (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 68FEC43D49 for ; Tue, 25 Apr 2006 00:48:19 +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 k3P0mJ8H056985 for ; Tue, 25 Apr 2006 00:48:19 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3P0mJBT056979 for perforce@freebsd.org; Tue, 25 Apr 2006 00:48:19 GMT (envelope-from csjp@freebsd.org) Date: Tue, 25 Apr 2006 00:48:19 GMT Message-Id: <200604250048.k3P0mJBT056979@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 96043 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2006 00:48:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=96043 Change 96043 by csjp@csjp_xor on 2006/04/25 00:48:02 Hook audit_submit.3 into the build Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#16 edit Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#16 (text+ko) ==== @@ -27,7 +27,7 @@ # # Must use BSM include files from within the contrib area, not the system. # -CFLAGS+= -I${OPENBSMDIR} -I${LIBBSMDIR} -I${.CURDIR}/../../sys +CFLAGS+= -Wall -I${OPENBSMDIR} -I${LIBBSMDIR} -I${.CURDIR}/../../sys INCS= audit_uevents.h libbsm.h INCSDIR= ${INCLUDEDIR}/bsm @@ -40,7 +40,8 @@ au_io.3 \ au_mask.3 \ au_token.3 \ - au_user.3 + au_user.3 \ + audit_submit.3 # # It seems like maybe some of these should be installed separately, since From owner-trustedbsd-cvs@FreeBSD.ORG Tue Apr 25 00:53:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F15916A405 for ; Tue, 25 Apr 2006 00:53:29 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3263C43D49 for ; Tue, 25 Apr 2006 00:53:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7648146CDA for ; Mon, 24 Apr 2006 20:53:27 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A4FAC55EAB; Tue, 25 Apr 2006 00:53:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E31E16A407; Tue, 25 Apr 2006 00:53:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D0EE16A40D for ; Tue, 25 Apr 2006 00:53:26 +0000 (UTC) (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 0B82943D48 for ; Tue, 25 Apr 2006 00:53:26 +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 k3P0rPcS060881 for ; Tue, 25 Apr 2006 00:53:25 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3P0rPXm060878 for perforce@freebsd.org; Tue, 25 Apr 2006 00:53:25 GMT (envelope-from csjp@freebsd.org) Date: Tue, 25 Apr 2006 00:53:25 GMT Message-Id: <200604250053.k3P0rPXm060878@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 96044 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2006 00:53:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=96044 Change 96044 by csjp@csjp_xor on 2006/04/25 00:52:29 Woops, back out a CFLAGS += -WALL that snuck in with my previous submit Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#17 (text+ko) ==== @@ -27,7 +27,7 @@ # # Must use BSM include files from within the contrib area, not the system. # -CFLAGS+= -Wall -I${OPENBSMDIR} -I${LIBBSMDIR} -I${.CURDIR}/../../sys +CFLAGS+= -I${OPENBSMDIR} -I${LIBBSMDIR} -I${.CURDIR}/../../sys INCS= audit_uevents.h libbsm.h INCSDIR= ${INCLUDEDIR}/bsm From owner-trustedbsd-cvs@FreeBSD.ORG Tue Apr 25 01:11:51 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B41D216A40F for ; Tue, 25 Apr 2006 01:11:51 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F0CE43D45 for ; Tue, 25 Apr 2006 01:11:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2290B46D4C for ; Mon, 24 Apr 2006 21:11:36 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C461E5BC22; Tue, 25 Apr 2006 01:10:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ED8616A41F; Tue, 25 Apr 2006 01:10:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A53F16A41A for ; Tue, 25 Apr 2006 01:10:48 +0000 (UTC) (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 BD1B443D48 for ; Tue, 25 Apr 2006 01:10:47 +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 k3P1AlVc070734 for ; Tue, 25 Apr 2006 01:10:47 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3P1AlnH070726 for perforce@freebsd.org; Tue, 25 Apr 2006 01:10:47 GMT (envelope-from csjp@freebsd.org) Date: Tue, 25 Apr 2006 01:10:47 GMT Message-Id: <200604250110.k3P1AlnH070726@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 96045 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2006 01:11:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=96045 Change 96045 by csjp@csjp_xor on 2006/04/25 01:10:40 Switch to use openbsm's audit_submit(3) instead of rolling our own. - Remove enums for audit success and failure - drop audit_su - drop prototype for audit_su Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#14 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#14 (text+ko) ==== @@ -137,7 +137,6 @@ } while (0) enum tristate { UNSET, YES, NO }; -enum auditevents { AUDIT_SU_FAILURE, AUDIT_SU_SUCCESS }; static pam_handle_t *pamh = NULL; static char **environ_pam; @@ -147,9 +146,6 @@ static void usage(void) __dead2; static void export_pam_environment(void); static int ok_to_export(const char *); -#ifdef USE_BSM_AUDIT -static void audit_su(au_id_t, int, const char *, ...); -#endif extern char **environ; @@ -224,7 +220,9 @@ if (strlen(user) > MAXLOGNAME - 1) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE, "username too long"); + if (audit_submit(AUE_su, getuid(), + 1, EPERM, "username too long")) + errx(1, "Permission denied"); #endif errx(1, "username too long"); } @@ -257,8 +255,9 @@ pwd = getpwuid(ruid); if (pwd == NULL) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE, - "unable to determain invoking subject"); + if (audit_submit(AUE_su, getuid(), 1, EPERM, + "unable to determain invoking subject")) + errx(1, "Permission denied"); #endif errx(1, "who are you?"); } @@ -298,15 +297,17 @@ retcode = pam_authenticate(pamh, 0); if (retcode != PAM_SUCCESS) { #ifdef USE_BSM_AUDIT - audit_su(ruid, AUDIT_SU_FAILURE, "bad su %s to %s on %s", - username, user, mytty); + if (audit_submit(AUE_su, ruid, 1, EPERM, "bad su %s to %s on %s", + username, user, mytty)) + errx(1, "Permission denied"); #endif syslog(LOG_AUTH|LOG_WARNING, "BAD SU %s to %s on %s", username, user, mytty); errx(1, "Sorry"); } #ifdef USE_BSM_AUDIT - audit_su(ruid, AUDIT_SU_SUCCESS, "successful authentication"); + if (audit_submit(AUE_su, ruid, 0, 0, "successful authentication")) + errx(1, "Permission denied"); #endif retcode = pam_get_item(pamh, PAM_USER, (const void **)&p); if (retcode == PAM_SUCCESS) @@ -317,8 +318,9 @@ pwd = getpwnam(user); if (pwd == NULL) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE, - "unknown subject: %s", user); + if (audit_submit(AUE_su, getuid(), 1, EPERM, + "unknown subject: %s", user)) + errx(1, "Permission denied"); #endif errx(1, "unknown login: %s", user); } @@ -329,9 +331,10 @@ PAM_CHANGE_EXPIRED_AUTHTOK); if (retcode != PAM_SUCCESS) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE, + if (audit_submit(AUE_su, getuid(), 1, EPERM, "pam_chauthtok: %s", - pam_strerror(pamh, retcode)); + pam_strerror(pamh, retcode))) + errx(1, "Permission denied"); #endif syslog(LOG_ERR, "pam_chauthtok: %s", pam_strerror(pamh, retcode)); @@ -340,8 +343,9 @@ } if (retcode != PAM_SUCCESS) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE, "pam_acct_mgmt: %s", - pam_strerror(pamh, retcode)); + if (audit_submit(AUE_su, getuid(), 1, EPERM, "pam_acct_mgmt: %s", + pam_strerror(pamh, retcode))) + errx(1, "Permission denied"); #endif syslog(LOG_ERR, "pam_acct_mgmt: %s", pam_strerror(pamh, retcode)); @@ -354,8 +358,9 @@ else { if (ruid != 0) { #ifdef USE_BSM_AUDIT - audit_su(getuid(), AUDIT_SU_FAILURE, - "only root may use -c"); + if (audit_submit(AUE_su, getuid(), 1, EPERM, + "only root may use -c")) + errx(1, "Permission denied"); #endif errx(1, "only root may use -c"); } @@ -632,90 +637,3 @@ snprintf(buf, sizeof(buf), " on %s", p); return buf; } - -#ifdef USE_BSM_AUDIT -static void -audit_su(au_id_t au_ctx, int what, const char *fmt, ...) -{ - token_t *token; - long acond; - int afd; - au_tid_t termid; - pid_t pid; - char text[1024]; - va_list ap; - - if (auditon(A_GETCOND, &acond, sizeof(long)) < 0) { - /* - * If auditon(2) returns ENOSYS, then audit has not been - * compiled into the kernel, so just return. - */ - if (errno == ENOSYS) - return; - syslog(LOG_AUTH | LOG_ERR, "audit: auditon failed: %s", - strerror(errno)); - errx(1, "Permission denied"); - } - if (acond == AUC_NOAUDIT) - return; - afd = au_open(); - if (afd < 0) { - syslog(LOG_AUTH | LOG_ERR, "audit: au_open failed: %s", - strerror(errno)); - errx(1, "Permission denied"); - } - /* XXX what should we do for termid? */ - bzero(&termid, sizeof(termid)); - pid = getpid(); - token = au_to_subject32(au_ctx, geteuid(), getegid(), - getuid(), getgid(), pid, pid, &termid); - if (token == NULL) { - syslog(LOG_AUTH | LOG_ERR, - "audit: unable to build subject token"); - errx(1, "Permission denied"); - } - if (au_write(afd, token) < 0) { - syslog(LOG_AUTH | LOG_ERR, - "audit: au_write failed: %s", strerror(errno)); - errx(1, "Permission denied"); - } - if (fmt != NULL) { - va_start(ap, fmt); - (void) vsnprintf(&text[0], sizeof(text) - 1, fmt, ap); - va_end(ap); - token = au_to_text(&text[0]); - if (token == NULL) { - syslog(LOG_AUTH | LOG_ERR, - "audit: failed to generate text token"); - errx(1, "Permission denied"); - } - if (au_write(afd, token) < 0) { - syslog(LOG_AUTH | LOG_ERR, - "audit: au_write failed: %s", strerror(errno)); - errx(1, "Permission denied"); - } - } - switch (what) { - case AUDIT_SU_FAILURE: - token = au_to_return32(1, EPERM); - break; - case AUDIT_SU_SUCCESS: - token = au_to_return32(0, 0); - break; - } - if (token == NULL) { - syslog(LOG_AUTH | LOG_ERR, - "audit: enable to build return token"); - errx(1, "Permission denied"); - } - if (au_write(afd, token) < 0) { - syslog(LOG_AUTH | LOG_ERR, - "audit: au_write failed: %s", strerror(errno)); - errx(1, "Permission denied"); - } - if (au_close(afd, 1, AUE_su) < 0) { - syslog(LOG_AUTH | LOG_ERR, "audit: record not committed"); - errx(1, "Permission denied"); - } -} -#endif From owner-trustedbsd-cvs@FreeBSD.ORG Tue Apr 25 17:48:20 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EF4416A401 for ; Tue, 25 Apr 2006 17:48:20 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E94C843D70 for ; Tue, 25 Apr 2006 17:48:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5473246D23 for ; Tue, 25 Apr 2006 13:48:11 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 929F8558B6; Tue, 25 Apr 2006 17:48:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B8FB16A441; Tue, 25 Apr 2006 17:48:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B8EF16A43D for ; Tue, 25 Apr 2006 17:48:10 +0000 (UTC) (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 2CC1243D68 for ; Tue, 25 Apr 2006 17:48:07 +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 k3PHm7DT058149 for ; Tue, 25 Apr 2006 17:48:07 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3PHm6Bf058143 for perforce@freebsd.org; Tue, 25 Apr 2006 17:48:06 GMT (envelope-from csjp@freebsd.org) Date: Tue, 25 Apr 2006 17:48:06 GMT Message-Id: <200604251748.k3PHm6Bf058143@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 96078 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2006 17:48:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=96078 Change 96078 by csjp@csjp_xor on 2006/04/25 17:47:06 Fix spelling error. Spotted by: wsalamon Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#15 (text+ko) ==== @@ -256,7 +256,7 @@ if (pwd == NULL) { #ifdef USE_BSM_AUDIT if (audit_submit(AUE_su, getuid(), 1, EPERM, - "unable to determain invoking subject")) + "unable to determine invoking subject")) errx(1, "Permission denied"); #endif errx(1, "who are you?"); From owner-trustedbsd-cvs@FreeBSD.ORG Wed Apr 26 15:13:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9CF916A44A for ; Wed, 26 Apr 2006 15:13:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 137F843D45 for ; Wed, 26 Apr 2006 15:13:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 01B5F46D02 for ; Wed, 26 Apr 2006 11:13:12 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C58F5556BA; Wed, 26 Apr 2006 15:13:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BC1F216A40E; Wed, 26 Apr 2006 15:13:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4562516A401 for ; Wed, 26 Apr 2006 15:13:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7EFB43D5E for ; Wed, 26 Apr 2006 15:12:12 +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 k3QFCCFY026506 for ; Wed, 26 Apr 2006 15:12:12 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 k3QFBwoK026173 for perforce@freebsd.org; Wed, 26 Apr 2006 15:11:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 Apr 2006 15:11:58 GMT Message-Id: <200604261511.k3QFBwoK026173@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 96149 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Apr 2006 15:13:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=96149 Change 96149 by rwatson@rwatson_zoo on 2006/04/26 15:11:21 Integrate TrustedBSD base branch from FreeBSD CVS: - share/mk build infrastructure changes, src.conf - ls -U - libreadline update - opiepasswd bugfix - sendmail update - openssh update - ISC resolver update - extended attribute support for tar - fcloseall - malloc_usable_size - minidumps - mutexes re-simplified for user threading - much symbol versioning - libz update - ccd speaks linux raid-0 mirrors - gvinum resetconfig - bce, mfi, acpi_doc, scc drivers - acpi_dock - libmap32.conf - jail support in rc.conf - amd64 fpu state clearing - smaller pvs - kbdmux now the default - yet more arm support - moderate amounts of linux compat cleanup stuff, especially for 64-bit - socket/pcb reference reworking, lots of inpcb changes, netatalk changes, etc. - ddb thread/proc/etc updates - run-time adjustable nmbclusters - aio_fsync - sundry uncountable bug fixes, tweaks, etc. TrustedBSD related: - $FreeBSD$ in /etc/security/audit* - mac_bsdextended enhancements (uid/gid ranges, fsids, etc) - loopback of mac_associate_nfsd_label() - mac_policy.h grows typedefs for MAC Framework entry points. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#36 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#71 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#8 integrate .. //depot/projects/trustedbsd/base/UPDATING#65 integrate .. //depot/projects/trustedbsd/base/bin/ls/cmp.c#10 integrate .. //depot/projects/trustedbsd/base/bin/ls/extern.h#12 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#31 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#28 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.h#11 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#24 integrate .. //depot/projects/trustedbsd/base/bin/ls/util.c#16 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#23 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#17 integrate .. //depot/projects/trustedbsd/base/bin/sh/Makefile#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/TOUR#2 integrate .. //depot/projects/trustedbsd/base/bin/sh/builtins.def#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#15 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.c#14 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.h#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/main.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/mkbuiltins#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/options.c#11 integrate .. //depot/projects/trustedbsd/base/bin/sh/show.c#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/trap.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fixmount/fixmount.8#7 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/config.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/config.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.conf#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/CHANGELOG#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/CHANGES#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/INSTALL#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/MANIFEST#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/NEWS#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/bind.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/callback.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/chardefs.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/complete.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/config.h.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/display.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/readline.3#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/histexamp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlcat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe.c#2 delete .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/ChangeLog#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/README#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/config.h.in#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/configure#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/configure.in#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/extern.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/os.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/pty.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/rlfe.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlfe/screen.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlptytest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rltest.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlversion.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/funmap.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/histexpand.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/history.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/input.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/macro.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/mbutil.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/misc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/readline.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/readline.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rldefs.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlmbutil.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlprivate.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rltty.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/search.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/shell.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/shlib/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/signals.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/config.guess#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/shlib-install#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/shobj-conf#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/wcwidth.c#2 delete .. //depot/projects/trustedbsd/base/contrib/libreadline/terminal.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/text.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/tilde.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/tilde.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/undo.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/util.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/vi_keymap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/vi_mode.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_user#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_warn#2 integrate .. //depot/projects/trustedbsd/base/contrib/opie/opiepasswd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/pf/authpf/authpf.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#19 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/PGPKEYS#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/README#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/Makefile#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/knecht.mc#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/dnsbl.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/enhdnsbl.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/mtamark.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/darwin.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/sendmail.schema#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/dnsblaccess.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/Makefile#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfdef.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/ldap.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/time.h#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/README#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_helo.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/libmilter.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/listener.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/signal.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/smfi.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/b-strcmp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/b-strl.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/clock.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fclose.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fflush.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fopen.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fpos.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fseek.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ldap.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/local.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/memstat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/refill.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/shm.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/signal.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/stdio.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strio.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-event.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-memstat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ungetc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vfprintf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vfscanf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/TRACEFLAGS#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/envelope.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/helpfile#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mime.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/readcf.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/savemail.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/timers.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/udb.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/usersmtp.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/util.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.X#7 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/Makefile.in#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.platform#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.tun#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/acconfig.h#13 delete .. //depot/projects/trustedbsd/base/crypto/openssh/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-options.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-options.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-gss.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buildpkg.sh.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.h#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-aes.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-ctr.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/defines.h#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dns.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dns.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/entropy.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/entropy.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/envpass.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh/gss-genr.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/gss-serv-krb5.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/gss-serv.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/includes.h#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdh.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhs.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexgex.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexgexc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/base64.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/basename.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bindresvport.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-asprintf.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-closefrom.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-snprintf.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/daemon.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/dirname.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getcwd.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getgrouplist.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getopt.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getrrsetbyname.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/glob.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/glob.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_aton.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_ntoa.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_ntop.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/mktemp.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/openbsd-compat.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-tun.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-tun.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/readpassphrase.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/readpassphrase.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/realpath.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/rresvport.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/setenv.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sigact.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sigact.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strlcat.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strlcpy.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strmode.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strsep.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strtoll.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strtonum.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strtoul.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sys-queue.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sys-tree.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/vis.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/vis.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/opensshd.init.in#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/packet.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/progressmeter.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.h#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/README.regress#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent-getpeereid.sh#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/forwarding.sh#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/multiplex.sh#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/reconfigure.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/scp-ssh-wrapper.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/scp.sh#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/test-exec.sh#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/try-ciphers.sh#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/yes-head.sh#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.1#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/serverloop.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#24 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-common.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-server.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.1#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.1#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.1#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.1#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.1#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#19 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect1.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect2.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.8#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#18 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#20 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#17 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/version.h#19 integrate .. //depot/projects/trustedbsd/base/etc/defaults/devfs.rules#4 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#52 integrate .. //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#11 integrate .. //depot/projects/trustedbsd/base/etc/gettytab#6 integrate .. //depot/projects/trustedbsd/base/etc/network.subr#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.bsdextended#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#37 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/SERVERS#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/amd#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ike#5 delete .. //depot/projects/trustedbsd/base/etc/rc.d/jail#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/named#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nsswitch#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ntpd#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/serial#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sshd#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#25 integrate .. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.mc#10 integrate .. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#49 integrate .. //depot/projects/trustedbsd/base/games/random/random.c#9 integrate .. //depot/projects/trustedbsd/base/games/random/randomize_fd.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/config.h#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdbserver/Makefile#4 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdbserver/low-fbsd.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/gdbserver/Makefile#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/gdbserver/fbsd-low.c#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/gdbserver/fbsd-low.h#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/gdbserver/reg-i386.c#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/Makefile#7 integrate .. //depot/projects/trustedbsd/base/include/Makefile#52 integrate .. //depot/projects/trustedbsd/base/include/arpa/inet.h#9 integrate .. //depot/projects/trustedbsd/base/include/arpa/nameser.h#4 integrate .. //depot/projects/trustedbsd/base/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/trustedbsd/base/include/malloc_np.h#1 branch .. //depot/projects/trustedbsd/base/include/netdb.h#12 integrate .. //depot/projects/trustedbsd/base/include/res_update.h#1 branch .. //depot/projects/trustedbsd/base/include/resolv.h#9 integrate .. //depot/projects/trustedbsd/base/include/stdio.h#15 integrate .. //depot/projects/trustedbsd/base/include/time.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#19 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.h#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/tar.5#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#22 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/dbm.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tls.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/vis.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/wordexp.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/isc/eventlib.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/include/namespace.h#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/port_after.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/include/port_before.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/include/resolv_mt.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/include/un-namespace.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/inet/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_addr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_cidr_pton.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_lnaof.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_makeaddr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_net_ntop.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_net_pton.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_neta.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_netof.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_network.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_ntoa.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_ntop.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_pton.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/inet/nsap_addr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/isc/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libc/isc/ev_streams.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/isc/ev_timers.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/isc/eventlib_p.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/utf8.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/nameser/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libc/nameser/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/nameser/ns_name.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/nameser/ns_netint.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/nameser/ns_parse.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/nameser/ns_print.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/nameser/ns_samedomain.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/nameser/ns_ttl.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/Makefile.inc#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#23 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyht.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbynis.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostnamadr.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnameinfo.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetbydns.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetbyht.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetbynis.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetnamadr.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getproto.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getprotoent.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getprotoname.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservbyname.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservbyport.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservent.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/herror.c#5 delete .. //depot/projects/trustedbsd/base/lib/libc/net/inet_addr.c#5 delete .. //depot/projects/trustedbsd/base/lib/libc/net/inet_lnaof.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/net/inet_makeaddr.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/net/inet_net_ntop.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/net/inet_net_pton.c#5 delete .. //depot/projects/trustedbsd/base/lib/libc/net/inet_neta.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/net/inet_netof.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/net/inet_network.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/net/inet_ntoa.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/net/inet_ntop.c#7 delete .. //depot/projects/trustedbsd/base/lib/libc/net/inet_pton.c#7 delete .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#22 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/netdb_private.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/ns_name.c#5 delete .. //depot/projects/trustedbsd/base/lib/libc/net/ns_netint.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/net/ns_parse.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/net/ns_print.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/net/ns_ttl.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/net/nsap_addr.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/net/res_comp.c#5 delete .. //depot/projects/trustedbsd/base/lib/libc/net/res_config.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_data.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/net/res_debug.c#5 delete .. //depot/projects/trustedbsd/base/lib/libc/net/res_init.c#9 delete .. //depot/projects/trustedbsd/base/lib/libc/net/res_mkquery.c#5 delete .. //depot/projects/trustedbsd/base/lib/libc/net/res_mkupdate.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_query.c#12 delete .. //depot/projects/trustedbsd/base/lib/libc/net/res_send.c#9 delete .. //depot/projects/trustedbsd/base/lib/libc/net/res_send_private.h#2 delete .. //depot/projects/trustedbsd/base/lib/libc/net/res_update.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/resolv/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/h_errno.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/herror.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/mtctxres.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_comp.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_data.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_debug.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_debug.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_init.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_mkquery.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_private.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_query.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_send.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_state.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_qp.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fclose.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fcloseall.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/local.h#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#26 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfscanf.c#21 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwprintf.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwscanf.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Makefile.inc#17 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.3#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#25 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getsockopt.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mmap.2#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/write.2#12 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#34 integrate .. //depot/projects/trustedbsd/base/lib/libgpib/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_amd64.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_i386.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_minidump_amd64.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_minidump_i386.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_private.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libpcap/Makefile#11 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmclog.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#15 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_barrier.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_getprio.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#26 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sem.c#8 integrate .. //depot/projects/trustedbsd/base/lib/librt/aio.c#3 integrate .. //depot/projects/trustedbsd/base/lib/librt/sigev_thread.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libsm/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#14 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/amd64/amd64/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/pthread_md.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/include/pthread_md.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/pthread.map#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/Makefile.inc#11 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_attr.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_barrier.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_barrierattr.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_cancel.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_clean.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_concurrency.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_cond.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_condattr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_create.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_detach.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_equal.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_exit.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_getprio.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_getschedparam.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_info.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_join.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_kern.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_kill.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_list.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_main_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_multi_np.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutexattr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#18 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_pspinlock.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_resume_np.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_rtld.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_rwlock.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_self.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sem.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setprio.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setschedparam.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sig.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_single_np.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_spec.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_spinlock.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_stack.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_suspend_np.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_switch_np.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_syscalls.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_yield.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libugidfw/libugidfw.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login.conf.5#12 integrate .. //depot/projects/trustedbsd/base/lib/libutil/pidfile.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libz/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/FAQ#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/README#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/adler32.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/compress.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/crc32.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/deflate.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/deflate.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/example.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/gzio.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libz/infback.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/inffast.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/inflate.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libz/inflate.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libz/inftrees.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libz/inftrees.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/minigzip.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libz/trees.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/zconf.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/zlib.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libz/zlib.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/zutil.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/zutil.h#5 integrate .. //depot/projects/trustedbsd/base/lib/msun/Makefile#17 integrate .. //depot/projects/trustedbsd/base/lib/msun/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/msun/alpha/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/alpha/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/amd64/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/msun/arm/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/arm/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/msun/ia64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/ia64/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/msun/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/powerpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/msun/sparc64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/sparc64/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/libexec/rtld-elf/amd64/reloc.c#6 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/amd64/rtld_machdep.h#5 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/debug.h#3 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/i386/reloc.c#12 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/i386/rtld_machdep.h#6 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.1#13 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#30 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/sparc64/reloc.c#11 integrate .. //depot/projects/trustedbsd/base/release/Makefile#74 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#66 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#99 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#12 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/scripts/kernels-install.sh#2 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#18 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.8#16 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#17 integrate .. //depot/projects/trustedbsd/base/sbin/dump/traverse.c#19 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.h#7 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdbutil.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/gvinum/gvinum.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/gvinum/gvinum.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#38 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/ipf/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#37 integrate .. //depot/projects/trustedbsd/base/sbin/mdconfig/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.c#21 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nullfs/mount_nullfs.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/pfctl/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.8#16 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.c#26 integrate .. //depot/projects/trustedbsd/base/sbin/reboot/boot_i386.8#18 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#26 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#21 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#43 integrate .. //depot/projects/trustedbsd/base/share/examples/mdoc/example.4#5 integrate .. //depot/projects/trustedbsd/base/share/examples/scsi_target/scsi_cmds.c#6 integrate .. //depot/projects/trustedbsd/base/share/examples/scsi_target/scsi_target.c#6 integrate .. //depot/projects/trustedbsd/base/share/man/man3/queue.3#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#65 integrate .. //depot/projects/trustedbsd/base/share/man/man4/amr.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bce.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/bge.4#16 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ccd.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/firewire.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fwohci.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/hifn.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/hwpmc.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipmi.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_asus.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_fujitsu.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_ibm.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_panasonic.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_sony.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_toshiba.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/padlock.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mfi.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/miibus.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_fec.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/polling.4#17 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sab.4#3 delete .. //depot/projects/trustedbsd/base/share/man/man4/safe.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/scc.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/snd_via8233.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/syncache.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uart.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ubsec.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uscanner.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/watchdog.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#22 integrate .. //depot/projects/trustedbsd/base/share/man/man5/libmap.conf.5#9 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#40 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#57 integrate .. //depot/projects/trustedbsd/base/share/man/man5/src.conf.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man7/hier.7#26 integrate .. //depot/projects/trustedbsd/base/share/man/man8/rc.subr.8#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#49 integrate .. //depot/projects/trustedbsd/base/share/man/man9/SYSCALL_MODULE.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/bus_space.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/crypto.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/pmap_remove.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/rwlock.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sleep.9#14 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sx.9#13 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#29 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#13 integrate .. //depot/projects/trustedbsd/base/share/timedef/sv_SE.UTF-8.src#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/clock.c#16 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#47 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#40 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/cpu.h#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/kdb.h#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/isa/isa.c#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_dummy.c#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_proto.h#18 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_syscall.h#17 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysent.c#17 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/syscalls.master#17 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/apecs_pci.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/lca_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/pci/pcibus.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/acpica/madt.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/dump_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/fpu.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/gdb_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/identcpu.c#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/io_apic.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#19 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/nexus.c#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#27 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#21 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/gdb_machdep.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/kdb.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/md_var.h#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/minidump.h#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/include/pmap.h#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/nexus.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#13 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/swtch.S#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#13 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/undefined.c#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/files.at91#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/asmacros.h#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/atomic.h#11 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_timer.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq80321.c#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/obio.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/trustedbsd/base/sys/boot/forth/beastie.4th#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/boot1.S#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/cdboot/cdboot.s#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/Makefile#14 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/biosacpi.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/gatea20.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/libi386.h#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/pxeldr/pxeldr.S#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/gatea20.c#4 delete .. //depot/projects/trustedbsd/base/sys/cam/cam.c#6 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#28 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#54 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#39 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_socket.c#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#25 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_stream.c#22 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.arm#9 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#70 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#99 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.alpha#29 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#27 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#61 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#35 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#52 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#21 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#70 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.alpha#12 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.amd64#13 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#34 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.ia64#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#35 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#17 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_norm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_command.c#21 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_ps.c#25 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_thread.c#4 integrate .. //depot/projects/trustedbsd/base/sys/ddb/ddb.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdHardware.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdSchedule.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#47 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_cmbat.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_dock.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_powerres.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/aha/aha_isa.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/aha/aha_mca.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_linux.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_pci.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amrvar.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#52 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-queue.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bce.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bcefw.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bcereg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfe.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#52 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drmP.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_mem.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/mga_drv.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_cp.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drm.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drv.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_state.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/savage_state.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/sis_ds.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/sis_ds.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/sis_mm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/LICENSE#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/README#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#51 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/fatm/if_fatm.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#51 integrate .. //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_piv.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_x86.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/if_ic.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/iic.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/iicbb.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/iicbus.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/iicsmb.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#31 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Thu Apr 27 16:08:04 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 43D3E16A405 for ; Thu, 27 Apr 2006 16:08:04 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB27843D46 for ; Thu, 27 Apr 2006 16:08:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5904F46D87 for ; Thu, 27 Apr 2006 12:08:01 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AFECA557A2; Thu, 27 Apr 2006 16:07:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A89FD16A406; Thu, 27 Apr 2006 16:07:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D4DB16A403 for ; Thu, 27 Apr 2006 16:07:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F20343D46 for ; Thu, 27 Apr 2006 16:07: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 k3RG7vAb008776 for ; Thu, 27 Apr 2006 16:07: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 k3RG7jE3008772 for perforce@freebsd.org; Thu, 27 Apr 2006 16:07:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 27 Apr 2006 16:07:45 GMT Message-Id: <200604271607.k3RG7jE3008772@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 96215 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Apr 2006 16:08:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=96215 Change 96215 by rwatson@rwatson_zoo on 2006/04/27 16:07:17 Integrate TrustedBSD MAC branch from TrustedBSD base branch to merge recent FreeBSD CVS changes. See change set 96149 for a complete list; TrustedBSD-related changes include: - $FreeBSD$ in /etc/security/audit* - mac_bsdextended enhancements (uid/gid ranges, fsids, etc) - loopback of mac_associate_nfsd_label() - mac_policy.h grows typedefs for MAC Framework entry points. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#32 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#65 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#6 integrate .. //depot/projects/trustedbsd/mac/UPDATING#55 integrate .. //depot/projects/trustedbsd/mac/bin/ls/cmp.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/ls/extern.h#12 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#31 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#35 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.h#12 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#26 integrate .. //depot/projects/trustedbsd/mac/bin/ls/util.c#17 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#25 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.c#17 integrate .. //depot/projects/trustedbsd/mac/bin/sh/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/bin/sh/TOUR#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/builtins.def#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/sh/exec.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/sh/exec.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/main.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mkbuiltins#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/options.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/sh/show.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/sh/trap.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fixmount/fixmount.8#8 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/config.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/config.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.conf#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGELOG#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGES#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/INSTALL#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/MANIFEST#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/NEWS#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/aclocal.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/bind.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/callback.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/chardefs.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/complete.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/config.h.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/display.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/readline.3#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/histexamp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rl.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlcat.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/ChangeLog#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/config.h.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/configure#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/configure.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/extern.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/os.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/pty.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/rlfe.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlfe/screen.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlptytest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rltest.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlversion.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/funmap.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/histexpand.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/history.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/input.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/isearch.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/macro.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/mbutil.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/misc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rldefs.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlmbutil.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlprivate.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rltty.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/search.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/shell.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/shlib/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/signals.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/config.guess#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/shlib-install#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/shobj-conf#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/wcwidth.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/libreadline/terminal.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/text.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/tilde.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/tilde.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/undo.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/util.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/vi_keymap.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/vi_mode.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_user#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_warn#2 integrate .. //depot/projects/trustedbsd/mac/contrib/opie/opiepasswd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/authpf/authpf.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#18 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/PGPKEYS#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/README#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/knecht.mc#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/dnsbl.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/enhdnsbl.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/mtamark.m4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/darwin.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/sendmail.schema#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/dnsblaccess.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/mfdef.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/ldap.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/time.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/README#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_helo.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/libmilter.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/listener.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/signal.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/smfi.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/b-strcmp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/b-strl.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/clock.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fclose.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fflush.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fopen.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fpos.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fseek.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ldap.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/local.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/memstat.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/refill.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/shm.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/signal.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/stdio.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strio.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-event.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-memstat.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ungetc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vfprintf.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vfscanf.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/TRACEFLAGS#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#20 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/envelope.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/helpfile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mime.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/readcf.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/savemail.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/timers.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/tls.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/udb.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/usersmtp.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/util.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#16 integrate .. //depot/projects/trustedbsd/mac/contrib/top/top.X#7 integrate .. //depot/projects/trustedbsd/mac/contrib/top/top.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.platform#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.tun#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/acconfig.h#12 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb5.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-options.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-options.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-gss.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#15 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/bufaux.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/buildpkg.sh.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/canohost.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#15 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.h#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-aes.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-ctr.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/defines.h#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/dns.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/dns.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/entropy.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/entropy.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/envpass.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/gss-genr.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv-krb5.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/hostfile.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/includes.h#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kex.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kex.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexdh.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhs.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexgex.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexgexc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/misc.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/Makefile.in#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/base64.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/basename.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bindresvport.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-asprintf.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-closefrom.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-snprintf.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/daemon.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/dirname.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getcwd.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getgrouplist.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getopt.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getrrsetbyname.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/glob.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/glob.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_aton.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_ntoa.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_ntop.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/mktemp.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/openbsd-compat.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-tun.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-tun.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/readpassphrase.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/readpassphrase.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/realpath.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/rresvport.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/setenv.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sigact.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sigact.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strlcat.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strlcpy.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strmode.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strsep.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strtoll.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strtonum.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strtoul.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sys-queue.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sys-tree.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/vis.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/vis.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/opensshd.init.in#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/packet.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/progressmeter.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.h#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/README.regress#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/agent-getpeereid.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/forwarding.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/multiplex.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/reconfigure.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/scp-ssh-wrapper.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/scp.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/test-exec.sh#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/try-ciphers.sh#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/yes-head.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scp.1#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scp.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#15 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.h#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/serverloop.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#24 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-common.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-server.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.1#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.1#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#15 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.1#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.1#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keysign.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.1#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#18 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect1.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect2.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.8#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#17 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#19 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#16 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#18 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/devfs.rules#3 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#46 integrate .. //depot/projects/trustedbsd/mac/etc/etc.sparc64/ttys#11 integrate .. //depot/projects/trustedbsd/mac/etc/gettytab#6 integrate .. //depot/projects/trustedbsd/mac/etc/network.subr#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.bsdextended#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#32 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/SERVERS#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/amd#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ike#5 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/jail#13 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/named#14 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/nsswitch#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ntpd#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/serial#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/sshd#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#23 integrate .. //depot/projects/trustedbsd/mac/etc/sendmail/freebsd.mc#10 integrate .. //depot/projects/trustedbsd/mac/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#41 integrate .. //depot/projects/trustedbsd/mac/games/random/random.c#9 integrate .. //depot/projects/trustedbsd/mac/games/random/randomize_fd.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/config.h#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdbserver/Makefile#4 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdbserver/low-fbsd.c#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdbserver/Makefile#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdbserver/fbsd-low.c#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdbserver/fbsd-low.h#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdbserver/reg-i386.c#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#54 integrate .. //depot/projects/trustedbsd/mac/include/arpa/inet.h#9 integrate .. //depot/projects/trustedbsd/mac/include/arpa/nameser.h#4 integrate .. //depot/projects/trustedbsd/mac/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/trustedbsd/mac/include/malloc_np.h#1 branch .. //depot/projects/trustedbsd/mac/include/netdb.h#12 integrate .. //depot/projects/trustedbsd/mac/include/res_update.h#1 branch .. //depot/projects/trustedbsd/mac/include/resolv.h#9 integrate .. //depot/projects/trustedbsd/mac/include/stdio.h#15 integrate .. //depot/projects/trustedbsd/mac/include/time.h#10 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive.h.in#9 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.h#8 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_extract.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_cpio.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/tar.5#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/Makefile#22 integrate .. //depot/projects/trustedbsd/mac/lib/libc/db/man/dbm.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/tls.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/vis.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/wordexp.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/isc/eventlib.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/include/namespace.h#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/port_after.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/include/port_before.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/include/resolv_mt.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/include/un-namespace.h#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/inet/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_addr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_cidr_pton.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_lnaof.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_makeaddr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_net_ntop.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_net_pton.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_neta.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_netof.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_network.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_ntoa.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_ntop.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/inet_pton.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/inet/nsap_addr.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/isc/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/isc/ev_streams.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/isc/ev_timers.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/isc/eventlib_p.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/Symbol.map#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/utf8.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/nameser/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/nameser/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/nameser/ns_name.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/nameser/ns_netint.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/nameser/ns_parse.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/nameser/ns_print.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/nameser/ns_samedomain.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/nameser/ns_ttl.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/Makefile.inc#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#22 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbydns.c#15 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbyht.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbynis.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostnamadr.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnameinfo.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnetbydns.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnetbyht.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnetbynis.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnetnamadr.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getproto.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getprotoent.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getprotoname.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservbyname.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservbyport.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservent.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/herror.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_addr.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_lnaof.c#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_makeaddr.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_net_ntop.c#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_net_pton.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_neta.c#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_netof.c#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_network.c#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_ntoa.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_ntop.c#7 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_pton.c#7 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/name6.c#20 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/netdb_private.h#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/ns_name.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/ns_netint.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/ns_parse.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/ns_print.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/ns_ttl.c#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/nsap_addr.c#4 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/res_comp.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/res_config.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_data.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/res_debug.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/res_init.c#9 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/res_mkquery.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/res_mkupdate.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_query.c#11 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/res_send.c#9 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/res_send_private.h#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/res_update.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/resolv/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/h_errno.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/herror.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/mtctxres.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_comp.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_data.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_debug.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_debug.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_init.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_mkquery.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_private.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_query.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_send.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_state.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/Symbol.map#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu_qp.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/Symbol.map#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fclose.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fcloseall.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/local.h#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#23 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfscanf.c#20 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfwprintf.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfwscanf.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/xprintf.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/Makefile.inc#16 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/Symbol.map#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.3#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#23 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/getsockopt.2#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mmap.2#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/write.2#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#34 integrate .. //depot/projects/trustedbsd/mac/lib/libgpib/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_amd64.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_i386.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_minidump_amd64.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_minidump_i386.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_private.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpcap/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/pmclog.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_barrier.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cond.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_getprio.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex.c#16 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#22 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sem.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/librt/aio.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/librt/sigev_thread.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libsm/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/amd64/amd64/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/i386/pthread_md.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/include/pthread_md.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/pthread.map#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_attr.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_barrier.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_barrierattr.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_cancel.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_clean.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_concurrency.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_cond.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_condattr.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_create.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_detach.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_equal.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_exit.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_getprio.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_getschedparam.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_info.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_init.c#15 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_join.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_kern.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_kill.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_list.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_main_np.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_multi_np.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutexattr.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_private.h#15 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_pspinlock.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_resume_np.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_rtld.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_rwlock.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_self.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_sem.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_setprio.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_setschedparam.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_sig.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_single_np.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_spec.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_spinlock.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_stack.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_suspend_np.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_switch_np.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_syscalls.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_umtx.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_yield.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libugidfw/libugidfw.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#16 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#8 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login.conf.5#11 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/pidfile.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libz/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/FAQ#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/README#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/adler32.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/compress.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/crc32.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/deflate.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/deflate.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/example.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/gzio.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libz/infback.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libz/inffast.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/inflate.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/inflate.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libz/inftrees.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libz/inftrees.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/minigzip.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libz/trees.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/zconf.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/zlib.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libz/zlib.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/zutil.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/zutil.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/msun/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/lib/msun/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/alpha/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/alpha/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/amd64/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/arm/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/arm/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/i387/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/ia64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/ia64/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/powerpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/msun/sparc64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/sparc64/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/amd64/reloc.c#6 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/amd64/rtld_machdep.h#5 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/debug.h#3 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/i386/reloc.c#12 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/i386/rtld_machdep.h#6 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.1#12 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#26 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/sparc64/reloc.c#11 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#69 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#57 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#85 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#10 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#7 integrate .. //depot/projects/trustedbsd/mac/release/scripts/kernels-install.sh#2 integrate .. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/sbin/ccdconfig/ccdconfig.8#15 integrate .. //depot/projects/trustedbsd/mac/sbin/ccdconfig/ccdconfig.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/devd.cc#13 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/traverse.c#17 integrate .. //depot/projects/trustedbsd/mac/sbin/fsdb/fsdb.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/fsdb/fsdb.h#7 integrate .. //depot/projects/trustedbsd/mac/sbin/fsdb/fsdbutil.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/core/geom.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/gvinum/gvinum.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/gvinum/gvinum.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#34 integrate .. //depot/projects/trustedbsd/mac/sbin/ipf/ipf/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#32 integrate .. //depot/projects/trustedbsd/mac/sbin/mdconfig/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.c#20 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.c#13 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nullfs/mount_nullfs.8#12 integrate .. //depot/projects/trustedbsd/mac/sbin/pfctl/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ping/ping.8#15 integrate .. //depot/projects/trustedbsd/mac/sbin/ping/ping.c#24 integrate .. //depot/projects/trustedbsd/mac/sbin/reboot/boot_i386.8#15 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#25 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#20 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#39 integrate .. //depot/projects/trustedbsd/mac/share/examples/mdoc/example.4#5 integrate .. //depot/projects/trustedbsd/mac/share/examples/scsi_target/scsi_cmds.c#6 integrate .. //depot/projects/trustedbsd/mac/share/examples/scsi_target/scsi_target.c#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/queue.3#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#59 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/amr.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/bce.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/bge.4#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ccd.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/firewire.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fwohci.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/hifn.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/hwpmc.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ipmi.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_asus.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_fujitsu.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_ibm.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_panasonic.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_sony.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_toshiba.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/padlock.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mfi.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/miibus.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_fec.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/polling.4#16 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sab.4#3 delete .. //depot/projects/trustedbsd/mac/share/man/man4/safe.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/scc.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/snd_via8233.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/syncache.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uart.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ubsec.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uscanner.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/watchdog.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/Makefile#19 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/libmap.conf.5#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#37 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#46 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/src.conf.5#1 branch .. //depot/projects/trustedbsd/mac/share/man/man7/hier.7#22 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/rc.subr.8#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/Makefile#45 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/SYSCALL_MODULE.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/bus_space.9#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/crypto.9#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/pmap_remove.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/rwlock.9#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/sleep.9#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/sx.9#13 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.lib.mk#25 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.own.mk#13 integrate .. //depot/projects/trustedbsd/mac/share/timedef/sv_SE.UTF-8.src#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/clock.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#38 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/cpu.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/kdb.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/isa/isa.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_dummy.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_proto.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_syscall.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysent.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/syscalls.master#15 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/apecs_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/lca_pci.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/pci/pcibus.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/acpica/madt.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/dump_machdep.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/fpu.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/gdb_machdep.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/identcpu.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/io_apic.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/local_apic.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/nexus.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/pmap.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/gdb_machdep.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/kdb.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/md_var.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/minidump.h#1 branch .. //depot/projects/trustedbsd/mac/sys/amd64/include/pmap.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/nexus.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/undefined.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/files.at91#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/asmacros.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/atomic.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/pmap.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/arm/sa11x0/sa11x0.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/i80321_pci.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/i80321_timer.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/iq80321.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/obio.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/forth/beastie.4th#9 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot2/boot1.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/cdboot/cdboot.s#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/biosacpi.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/gatea20.c#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/libi386.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/gatea20.c#4 delete .. //depot/projects/trustedbsd/mac/sys/cam/cam.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_cd.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_misc.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_proto.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscall.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscalls.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/syscalls.master#15 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_socket.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_stream.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.arm#8 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#72 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#127 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.alpha#28 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.amd64#23 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#53 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.ia64#33 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#44 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.powerpc#20 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#82 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.alpha#12 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.amd64#13 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.arm#6 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.i386#32 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.ia64#14 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.pc98#32 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/fil.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf_norm.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_command.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_ps.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_thread.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/ddb.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdHardware.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdSchedule.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_cmbat.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_dock.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_powerres.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aha/aha_isa.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aha/aha_mca.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amr.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amr_linux.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amr_pci.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amrvar.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#45 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-disk.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-queue.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cam.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-fd.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_ath.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bce/if_bce.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/bce/if_bcefw.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/bce/if_bcereg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#45 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ciss/ciss.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drmP.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/i915_mem.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/mga_drv.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_cp.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drm.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drv.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_state.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/savage_bci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/savage_state.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/sis_ds.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/sis_ds.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/sis_mm.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/LICENSE#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/README#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_hw.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_hw.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/en/midway.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fatm/if_fatm.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hme/if_hme.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_mod.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_piv.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_x86.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iicbus/if_ic.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iicbus/iic.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iicbus/iicbb.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iicbus/iicbus.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iicbus/iicsmb.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_ioctl.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_pci.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_sbus.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_target.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_target.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_tpublic.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispmbox.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ispfw/asm_2300.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mfi/mfi.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mfi/mfi_disk.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mfi/mfi_ioctl.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mfi/mfi_pci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mfi/mfireg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mfi/mfivar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mii/brgphy.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mii/miidevs#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_debug.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_pci.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_reg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/patm/if_patm_attach.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbbreg.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci_pci.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/lpt.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppc/ppc.c#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Fri Apr 28 13:06:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5662B16A405 for ; Fri, 28 Apr 2006 13:06:06 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C4B543D46 for ; Fri, 28 Apr 2006 13:06:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1434B46D6A for ; Fri, 28 Apr 2006 09:06:05 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id EF80657092; Fri, 28 Apr 2006 13:03:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E73AB16A401; Fri, 28 Apr 2006 13:03:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9BF1A16A402 for ; Fri, 28 Apr 2006 13:03:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A73543D4C for ; Fri, 28 Apr 2006 13:03:51 +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 k3SD3pft099940 for ; Fri, 28 Apr 2006 13:03:51 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 k3SD3ohp099899 for perforce@freebsd.org; Fri, 28 Apr 2006 13:03:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 28 Apr 2006 13:03:50 GMT Message-Id: <200604281303.k3SD3ohp099899@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 96306 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Apr 2006 13:06:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=96306 Change 96306 by rwatson@rwatson_zoo on 2006/04/28 13:03:38 Correct merge error in return type: associate_nfsd does not have a return value since it must succeed. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#243 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#243 (text+ko) ==== @@ -597,7 +597,7 @@ typedef int (*mpo_check_vnode_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); -typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); +typedef void (*mpo_associate_nfsd_label_t)(struct ucred *cred); struct mac_policy_ops { /* From owner-trustedbsd-cvs@FreeBSD.ORG Fri Apr 28 13:18:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3571416A40A for ; Fri, 28 Apr 2006 13:18:07 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7A1343D45 for ; Fri, 28 Apr 2006 13:18:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3994646C9B for ; Fri, 28 Apr 2006 09:18:06 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 116CDD0760; Fri, 28 Apr 2006 13:13:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 09ECF16A405; Fri, 28 Apr 2006 13:13:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2BF416A400 for ; Fri, 28 Apr 2006 13:13:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B1BF43D45 for ; Fri, 28 Apr 2006 13:13:48 +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 k3SDDmYq007281 for ; Fri, 28 Apr 2006 13:13:48 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 k3SDDmYi007275 for perforce@freebsd.org; Fri, 28 Apr 2006 13:13:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 28 Apr 2006 13:13:48 GMT Message-Id: <200604281313.k3SDDmYi007275@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 96309 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Apr 2006 13:18:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=96309 Change 96309 by rwatson@rwatson_zoo on 2006/04/28 13:12:48 Fix mac_update_mbuf_from_cipso() mismerge. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#244 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#244 (text+ko) ==== @@ -322,7 +322,7 @@ typedef void (*mpo_update_ipq_t)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); - int (*mpo_update_mbuf_from_cipso)(struct mbuf *m, +typedef int (*mpo_update_mbuf_from_cipso)(struct mbuf *m, struct label *mlabel, struct ifnet *ifnet, struct label *ifnetlabel, char *cp, int *code); typedef void (*mpo_inpcb_sosetlabel_t)(struct socket *so, @@ -746,6 +746,7 @@ mpo_reflect_mbuf_tcp_t mpo_reflect_mbuf_tcp; mpo_relabel_ifnet_t mpo_relabel_ifnet; mpo_update_ipq_t mpo_update_ipq; + mpo_update_mbuf_from_cipso_t mpo_update_mbuf_from_cipso; mpo_inpcb_sosetlabel_t mpo_inpcb_sosetlabel; /* From owner-trustedbsd-cvs@FreeBSD.ORG Fri Apr 28 13:31:31 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFF9416A401 for ; Fri, 28 Apr 2006 13:31:31 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3366F43D46 for ; Fri, 28 Apr 2006 13:31:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A4A7E46C72 for ; Fri, 28 Apr 2006 09:31:30 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 456C657F6B; Fri, 28 Apr 2006 13:28:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3290F16A403; Fri, 28 Apr 2006 13:28:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA81D16A400 for ; Fri, 28 Apr 2006 13:28:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D206C43D7C for ; Fri, 28 Apr 2006 13:28:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3SDS7aO015970 for ; Fri, 28 Apr 2006 13:28:08 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 k3SDS7Y9015943 for perforce@freebsd.org; Fri, 28 Apr 2006 13:28:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 28 Apr 2006 13:28:07 GMT Message-Id: <200604281328.k3SDS7Y9015943@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 96310 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Apr 2006 13:31:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=96310 Change 96310 by rwatson@rwatson_zoo on 2006/04/28 13:27:56 Remove unused variables. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#16 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#16 (text+ko) ==== @@ -231,8 +231,6 @@ { token_t *tok; int aufd; - au_mask_t aumask; - auditinfo_t auinfo; uid_t uid = pwd->pw_uid; gid_t gid = pwd->pw_gid; pid_t pid = getpid(); From owner-trustedbsd-cvs@FreeBSD.ORG Fri Apr 28 14:32:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51ABF16A403 for ; Fri, 28 Apr 2006 14:32:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4EE143D46 for ; Fri, 28 Apr 2006 14:32:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 567CF46D52 for ; Fri, 28 Apr 2006 10:32:35 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 149FD5540E; Fri, 28 Apr 2006 14:32:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C10D16A404; Fri, 28 Apr 2006 14:32:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCC3616A401 for ; Fri, 28 Apr 2006 14:32:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8449C43D46 for ; Fri, 28 Apr 2006 14:32:32 +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 k3SEWWI6051371 for ; Fri, 28 Apr 2006 14:32:32 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 k3SEWVZB051358 for perforce@freebsd.org; Fri, 28 Apr 2006 14:32:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 28 Apr 2006 14:32:31 GMT Message-Id: <200604281432.k3SEWVZB051358@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 96311 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Apr 2006 14:32:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=96311 Change 96311 by rwatson@rwatson_zoo on 2006/04/28 14:30:05 Fix two more merge nits relating to entry points only in the MAC branch and not CVS. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#245 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#245 (text+ko) ==== @@ -322,7 +322,7 @@ typedef void (*mpo_update_ipq_t)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); -typedef int (*mpo_update_mbuf_from_cipso)(struct mbuf *m, +typedef int (*mpo_update_mbuf_from_cipso_t)(struct mbuf *m, struct label *mlabel, struct ifnet *ifnet, struct label *ifnetlabel, char *cp, int *code); typedef void (*mpo_inpcb_sosetlabel_t)(struct socket *so, @@ -852,8 +852,8 @@ mpo_check_system_swapon_t mpo_check_system_swapon; mpo_check_system_swapoff_t mpo_check_system_swapoff; mpo_check_system_sysctl_t mpo_check_system_sysctl; - mpo_thread_syscall_enter_t mpo_check_syscall_enter; - mpo_thread_syscall_exit_t mpo_check_syscall_exit; + mpo_thread_syscall_enter_t mpo_thread_syscall_enter; + mpo_thread_syscall_exit_t mpo_thread_syscall_exit; mpo_check_vnode_access_t mpo_check_vnode_access; mpo_check_vnode_chdir_t mpo_check_vnode_chdir; mpo_check_vnode_chroot_t mpo_check_vnode_chroot; From owner-trustedbsd-cvs@FreeBSD.ORG Sat Apr 29 13:41:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EDDC816A41A for ; Sat, 29 Apr 2006 13:41:28 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1F9C43D6A for ; Sat, 29 Apr 2006 13:41:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 384F646C6A for ; Sat, 29 Apr 2006 09:41:14 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8F7D658815; Sat, 29 Apr 2006 13:38:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8906D16A405; Sat, 29 Apr 2006 13:38:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D8EC16A401 for ; Sat, 29 Apr 2006 13:38:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E88F43D6E for ; Sat, 29 Apr 2006 13:38:39 +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 k3TDcdFB055018 for ; Sat, 29 Apr 2006 13:38:39 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 k3TDcdLg055015 for perforce@freebsd.org; Sat, 29 Apr 2006 13:38:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 29 Apr 2006 13:38:39 GMT Message-Id: <200604291338.k3TDcdLg055015@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 96361 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Apr 2006 13:41:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=96361 Change 96361 by rwatson@rwatson_peppercorn on 2006/04/29 13:38:28 Use au_to_header32_tm(), a kernel interface to create a header with a specific timeval, rather than the user API. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#12 (text+ko) ==== @@ -122,7 +122,7 @@ /* Create the header token */ tm.tv_usec = ctime->tv_nsec / 1000; tm.tv_sec = ctime->tv_sec; - hdr = au_to_header32(tot_rec_size, event, 0, tm); + hdr = au_to_header32_tm(tot_rec_size, event, 0, tm); TAILQ_INSERT_HEAD(&rec->token_q, hdr, tokens); trail = au_to_trailer(tot_rec_size); From owner-trustedbsd-cvs@FreeBSD.ORG Sat Apr 29 13:41:39 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A49316A40E for ; Sat, 29 Apr 2006 13:41:39 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7255143D69 for ; Sat, 29 Apr 2006 13:41:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0424446D5B for ; Sat, 29 Apr 2006 09:41:30 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4DBD655951; Sat, 29 Apr 2006 13:39:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 482D416A40F; Sat, 29 Apr 2006 13:39:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 204D316A40D for ; Sat, 29 Apr 2006 13:39:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C3F843D6D for ; Sat, 29 Apr 2006 13:39:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3TDdfGt055118 for ; Sat, 29 Apr 2006 13:39:41 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 k3TDdevK055115 for perforce@freebsd.org; Sat, 29 Apr 2006 13:39:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 29 Apr 2006 13:39:40 GMT Message-Id: <200604291339.k3TDdevK055115@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 96362 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Apr 2006 13:41:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=96362 Change 96362 by rwatson@rwatson_peppercorn on 2006/04/29 13:38:48 Remove user space only header creation APIS. Reported by: wsalamon Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#14 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#13 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#14 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.2 2006/03/04 17:00:55 rwatson Exp $ */ @@ -1115,30 +1115,6 @@ return (t); } -token_t * -au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, - struct timeval tm) -{ - - return (au_to_header32_tm(rec_size, e_type, e_mod, tm)); -} - -token_t * -au_to_header64(__unused int rec_size, __unused au_event_t e_type, - __unused au_emod_t e_mod) -{ - - return (NULL); -} - -token_t * -au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, - struct timeval tm) -{ - - return (au_to_header32(rec_size, e_type, e_mod, tm)); -} - /* * token ID 1 byte * trailer magic number 2 bytes From owner-trustedbsd-cvs@FreeBSD.ORG Mon May 1 22:01:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 263FE16A419 for ; Mon, 1 May 2006 22:01:24 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9973743D67 for ; Mon, 1 May 2006 22:01:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CE86C46BF9 for ; Mon, 1 May 2006 18:01:15 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 11306743F5; Mon, 1 May 2006 21:55:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 04C9B16A42C; Mon, 1 May 2006 21:55:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96FC916A405 for ; Mon, 1 May 2006 21:55:30 +0000 (UTC) (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 5DA1543D45 for ; Mon, 1 May 2006 21:55:30 +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 k41LtUk2078218 for ; Mon, 1 May 2006 21:55:30 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k41LtU2g078215 for perforce@freebsd.org; Mon, 1 May 2006 21:55:30 GMT (envelope-from wsalamon@computer.org) Date: Mon, 1 May 2006 21:55:30 GMT Message-Id: <200605012155.k41LtU2g078215@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 96523 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 May 2006 22:01:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=96523 Change 96523 by wsalamon@gretsch on 2006/05/01 21:54:35 Correct the command name in the SYNOPSIS section. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/auditctl.2#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/auditctl.2#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditctl.2#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditctl.2#5 $ .\" .Dd April 19, 2005 .Dt AUDITCTL 2 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In bsm/audit.h .Ft int -.Fn auditon "const char *path" +.Fn auditctl "const char *path" .Sh DESCRIPTION The .Fn auditctl From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 2 22:03:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E54316A408 for ; Tue, 2 May 2006 22:03:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCA7643D45 for ; Tue, 2 May 2006 22:03:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EEF9846CE5 for ; Tue, 2 May 2006 18:03:23 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5D861556D9; Tue, 2 May 2006 22:03:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5881316A407; Tue, 2 May 2006 22:03:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16E1416A403 for ; Tue, 2 May 2006 22:03:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0E9F43D45 for ; Tue, 2 May 2006 22:03:22 +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 k42M3Mi4038420 for ; Tue, 2 May 2006 22:03:22 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 k42M3M4b038414 for perforce@freebsd.org; Tue, 2 May 2006 22:03:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 2 May 2006 22:03:22 GMT Message-Id: <200605022203.k42M3M4b038414@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 96570 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 22:03:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=96570 Change 96570 by rwatson@rwatson_peppercorn on 2006/05/02 22:03:11 Early pass at per-pipe preselection: - Add new fields to struct audit_pipe to describe the preselection preferences for the pipe. Currently, this consists of two masks, flags and naflags, with similar meanings to those used for trails. In addition, a linked list of audit_pipe_preselect structures provides similar functionality to audit_user, assigning masks to specific auids. The details here need refinement. - Add two new functions, audit_pipe_preselect_check(), which checks whether a record with the passed {auid, event, class, sorf} is matched, and audit_pipe_preselect(), which iterates over available pipes. This will be called by the system preselection mechanisms to poll the audit pipe subsystem for interest in a particular record. - Modify audit_pipe_submit() to accept additional fields auid, class, sorf for a BSM record, so that preselection can be performed when delivering to pipes. The old preselection-free audit_pipe_submit() continues to exist, for now, as audit_pipe_submit_user(), to be called on user records since we don't currently extract sufficient information from user submitted records to perform full preselection. - Modify audit worker code to pass additional record properties into audit_pipe_submit(). This almost certainly doesn't work yet. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#14 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#25 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#14 (text+ko) ==== @@ -82,6 +82,19 @@ }; /* + * Audit pipes allow processes to express "interest" in the set of records + * that are delivered via the pipe. They do this in a similar manner to the + * mechanism for audit trail configuration, by expressing two global masks, + * and optionally expressing per-auid masks. The following data structures + * define by the global masks for each pipe, and a list of per-auid masks. + */ +struct audit_pipe_preselect { + au_id_t app_auid; + au_mask_t app_mask; + TAILQ_ENTRY(audit_pipe_preselect) app_list; +}; + +/* * Description of an individual audit_pipe. Consists largely of a bounded * length queue. */ @@ -102,8 +115,24 @@ u_int64_t ap_drops; /* Records dropped. */ u_int64_t ap_truncates; /* Records too long. */ + + /* + * Fields relating to pipe interest: global masks for unmatched + * processes (attributable, non-attributable), and a list of specific + * interest specifications by auid. + */ + au_mask_t ap_preselect_flags; + au_mask_t ap_preselect_naflags; + TAILQ_HEAD(, audit_pipe_preselect) ap_preselect_list; + + /* + * Record list. + */ TAILQ_HEAD(, audit_pipe_entry) ap_queue; + /* + * Global pipe list. + */ TAILQ_ENTRY(audit_pipe) ap_list; }; @@ -167,6 +196,49 @@ } /* + * Determine whether a specific audit pipe matches a record with these + * properties. + */ +static int +audit_pipe_preselect_check(struct audit_pipe *ap, au_id_t auid, + au_event_t event, au_class_t class, int sorf) +{ + struct audit_pipe_preselect *app; + + TAILQ_FOREACH(app, &ap->ap_preselect_list, app_list) { + if (app->app_auid == auid) + break; + } + if (app == NULL) { + if (auid == AU_DEFAUDITID) + return (au_preselect(event, &ap->ap_preselect_naflags, + sorf)); + else + return (au_preselect(event, &ap->ap_preselect_flags, + sorf)); + } else + return (au_preselect(event, &app->app_mask, sorf)); + return (0); +} + +/* + * Determine whether there exists a pipe interested in a record with these + * properties. + */ +int +audit_pipe_preselect(au_id_t auid, au_event_t event, au_class_t class, + int sorf) +{ + struct audit_pipe *ap; + + TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { + if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) + return (1); + } + return (0); +} + +/* * Apparent individual record to a queue -- allocate queue-local buffer, and * add to the queue. We try to drop from the head of the queue so that more * recent events take precedence over older ones, but if allocation fails we @@ -219,7 +291,37 @@ * interface, which arranges for them to be delivered to pipe queues. */ void -audit_pipe_submit(void *record, u_int record_len) +audit_pipe_submit(au_id_t auid, au_event_t event, au_class_t class, int sorf, + void *record, u_int record_len) +{ + struct audit_pipe *ap; + + /* + * Lockless read to avoid mutex overhead if pipes are not in use. + */ + if (TAILQ_FIRST(&audit_pipe_list) == NULL) + return; + + mtx_lock(&audit_pipe_mtx); + TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { + if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) + audit_pipe_append(ap, record, record_len); + } + audit_pipe_records++; + mtx_unlock(&audit_pipe_mtx); + cv_signal(&audit_pipe_cv); +} + +/* + * audit_pipe_submit_user(): the same as audit_pipe_submit(), except that + * since we don't currently have selection information available, it is + * delivered to the pipe unconditionally. + * + * XXXRW: This is a bug. The BSM check routine for submitting a user record + * should parse that information and return it. + */ +void +audit_pipe_submit_user(void *record, u_int record_len) { struct audit_pipe *ap; @@ -237,6 +339,7 @@ cv_signal(&audit_pipe_cv); } + /* * Read the next record off of an audit pipe. */ @@ -273,9 +376,14 @@ return (NULL); ap->ap_qlimit = AUDIT_PIPE_QLIMIT_DEFAULT; TAILQ_INIT(&ap->ap_queue); + bzero(&ap->ap_preselect_flags, sizeof(ap->ap_preselect_flags)); + bzero(&ap->ap_preselect_naflags, sizeof(ap->ap_preselect_naflags)); + TAILQ_INIT(&ap->ap_preselect_list); + TAILQ_INSERT_HEAD(&audit_pipe_list, ap, ap_list); audit_pipe_count++; audit_pipe_ever++; + return (ap); } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#25 (text+ko) ==== @@ -337,6 +337,10 @@ /* * Audit pipe functions. */ -void audit_pipe_submit(void *record, u_int record_len); +int audit_pipe_preselect(au_id_t auid, au_event_t event, + au_class_t class, int sorf); +void audit_pipe_submit(au_id_t auid, au_event_t event, au_class_t class, + int sorf, void *record, u_int record_len); +void audit_pipe_submit_user(void *record, u_int record_len); #endif /* ! _SECURITY_AUDIT_PRIVATE_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#9 (text+ko) ==== @@ -315,7 +315,11 @@ struct thread *audit_td, struct kaudit_record *ar) { struct au_record *bsm; + au_class_t class; + au_event_t event; int error, ret; + au_id_t auid; + int sorf; if (ar->k_ar_commit & AR_COMMIT_USER) { error = audit_record_write(audit_vp, audit_cred, audit_td, @@ -324,10 +328,18 @@ panic("audit_worker: write error %d\n", error); else if (error) printf("audit_worker: write error %d\n", error); - audit_pipe_submit(ar->k_udata, ar->k_ulen); + audit_pipe_submit_user(ar->k_udata, ar->k_ulen); } if (ar->k_ar_commit & AR_COMMIT_KERNEL) { + auid = ar->k_ar.ar_subj_auid; + event = ar->k_ar.ar_event; + class = au_event_class(event); + if (ar->k_ar.ar_errno == 0) + sorf = AU_PRS_SUCCESS; + else + sorf = AU_PRS_FAILURE; + ret = kaudit_to_bsm(ar, &bsm); switch (ret) { case BSM_NOAUDIT: @@ -346,7 +358,8 @@ else if (error) printf("audit_worker: write error %d\n", error); - audit_pipe_submit(bsm->data, bsm->len); + audit_pipe_submit(auid, event, class, sorf, + bsm->data, bsm->len); kau_free(bsm); break; From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 3 15:08:33 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDA8016A41F for ; Wed, 3 May 2006 15:08:33 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE1C843D5F for ; Wed, 3 May 2006 15:08:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6A43146C0D for ; Wed, 3 May 2006 11:08:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D1032556C8; Wed, 3 May 2006 15:08:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BB3E116A403; Wed, 3 May 2006 15:08:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 48CCD16A400 for ; Wed, 3 May 2006 15:08:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AA0643D55 for ; Wed, 3 May 2006 15:08:22 +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 k43F8MOq037291 for ; Wed, 3 May 2006 15:08:22 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 k43F8M0c037288 for perforce@freebsd.org; Wed, 3 May 2006 15:08:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 May 2006 15:08:22 GMT Message-Id: <200605031508.k43F8M0c037288@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 96592 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 15:08:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=96592 Change 96592 by rwatson@rwatson_zoo on 2006/05/03 15:07:21 Define ioctls for getting and setting per-pipe preselection properties. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#5 (text+ko) ==== @@ -34,6 +34,16 @@ #define AUDITPIPE_IOBASE 'A' /* + * Data structures used for complex ioctl arguments. Do not change existing + * structures, add new revised ones to be used by new ioctls, and keep the + * old structures and ioctls for backwards compatibility. + */ +struct auditpipe_preselect { + au_id_t ap_auid; + au_mask_t ap_mask; +}; + +/* * Ioctls to read and control the behavior of individual audit pipe devices. */ #define AUDITPIPE_GET_QLEN _IOR(AUDITPIPE_IOBASE, 1, u_int) @@ -41,6 +51,15 @@ #define AUDITPIPE_SET_QLIMIT _IOW(AUDITPIPE_IOBASE, 3, u_int) #define AUDITPIPE_GET_QLIMIT_MIN _IOR(AUDITPIPE_IOBASE, 4, u_int) #define AUDITPIPE_GET_QLIMIT_MAX _IOR(AUDITPIPE_IOBASE, 5, u_int) +#define AUDITPIPE_GET_FLAGS _IOR(AUDITPIPE_IOBASE, 6, au_mask_t) +#define AUDITPIPE_SET_FLAGS _IOW(AUDITPIPE_IOBASE, 7, au_mask_t) +#define AUDITPIPE_GET_NAFLAGS _IOR(AUDITPIPE_IOBASE, 8, au_mask_t) +#define AUDITPIPE_SET_NAFLAGS _IOW(AUDITPIPE_IOBASE, 9, au_mask_t) +#define AUDITPIPE_GET_PRESELECT _IOR(AUDITPIPE_IOBASE, 10, \ + struct auditpipe_preselect) +#define AUDITPIPE_SET_PRESELECT _IOW(AUDITPIPE_IOBASE, 11, \ + struct auditpipe_preselect) +#define AUDITPIPE_FLUSH_PRESELECT _IO(AUDITPIPE_IOBASE, 11) /* * Ioctls to retrieve audit pipe statistics. From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 3 15:23:45 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A1C916A416 for ; Wed, 3 May 2006 15:23:45 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8830543D48 for ; Wed, 3 May 2006 15:23:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F0DD746CE0 for ; Wed, 3 May 2006 11:23:43 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 65E165541F; Wed, 3 May 2006 15:23:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EB5B16A404; Wed, 3 May 2006 15:23:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0490016A402 for ; Wed, 3 May 2006 15:23:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDD9543D48 for ; Wed, 3 May 2006 15:23:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k43FNfnj047961 for ; Wed, 3 May 2006 15:23:41 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 k43FNfaf047958 for perforce@freebsd.org; Wed, 3 May 2006 15:23:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 May 2006 15:23:41 GMT Message-Id: <200605031523.k43FNfaf047958@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 96593 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 15:23:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=96593 Change 96593 by rwatson@rwatson_zoo on 2006/05/03 15:23:36 Rename pipe preselect ioctls to all include the word 'PRESELECT'. Implement simple pipe preselect audit ioctls, but not per-auid ioctls yet. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#6 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#6 (text+ko) ==== @@ -51,15 +51,15 @@ #define AUDITPIPE_SET_QLIMIT _IOW(AUDITPIPE_IOBASE, 3, u_int) #define AUDITPIPE_GET_QLIMIT_MIN _IOR(AUDITPIPE_IOBASE, 4, u_int) #define AUDITPIPE_GET_QLIMIT_MAX _IOR(AUDITPIPE_IOBASE, 5, u_int) -#define AUDITPIPE_GET_FLAGS _IOR(AUDITPIPE_IOBASE, 6, au_mask_t) -#define AUDITPIPE_SET_FLAGS _IOW(AUDITPIPE_IOBASE, 7, au_mask_t) -#define AUDITPIPE_GET_NAFLAGS _IOR(AUDITPIPE_IOBASE, 8, au_mask_t) -#define AUDITPIPE_SET_NAFLAGS _IOW(AUDITPIPE_IOBASE, 9, au_mask_t) -#define AUDITPIPE_GET_PRESELECT _IOR(AUDITPIPE_IOBASE, 10, \ +#define AUDITPIPE_GET_PRESELECT_FLAGS _IOR(AUDITPIPE_IOBASE, 6, au_mask_t) +#define AUDITPIPE_SET_PRESELECT_FLAGS _IOW(AUDITPIPE_IOBASE, 7, au_mask_t) +#define AUDITPIPE_GET_PRESELECT_NAFLAGS _IOR(AUDITPIPE_IOBASE, 8, au_mask_t) +#define AUDITPIPE_SET_PRESELECT_NAFLAGS _IOW(AUDITPIPE_IOBASE, 9, au_mask_t) +#define AUDITPIPE_GET_PRESELECT_AUID _IOR(AUDITPIPE_IOBASE, 10, \ struct auditpipe_preselect) -#define AUDITPIPE_SET_PRESELECT _IOW(AUDITPIPE_IOBASE, 11, \ +#define AUDITPIPE_SET_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 11, \ struct auditpipe_preselect) -#define AUDITPIPE_FLUSH_PRESELECT _IO(AUDITPIPE_IOBASE, 11) +#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 11) /* * Ioctls to retrieve audit pipe statistics. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#15 (text+ko) ==== @@ -499,11 +499,19 @@ audit_pipe_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) { + struct auditpipe_preselect *aps; struct audit_pipe *ap; + au_mask_t *maskp; int error; ap = dev->si_drv1; KASSERT(ap != NULL, ("audit_pipe_ioctl: ap == NULL")); + + /* + * Audit pipe ioctls: first come standard device node ioctls, then + * manipulation of pipe settings, and finally, statistics query + * ioctls. + */ switch (cmd) { case FIONBIO: mtx_lock(&audit_pipe_mtx); @@ -575,6 +583,44 @@ error = 0; break; + case AUDITPIPE_GET_PRESELECT_FLAGS: + maskp = (au_mask_t *)data; + *maskp = ap->ap_preselect_flags; + error = 0; + break; + + case AUDITPIPE_SET_PRESELECT_FLAGS: + maskp = (au_mask_t *)data; + ap->ap_preselect_flags = *maskp; + error = 0; + break; + + case AUDITPIPE_GET_PRESELECT_NAFLAGS: + maskp = (au_mask_t *)data; + *maskp = ap->ap_preselect_naflags; + error = 0; + break; + + case AUDITPIPE_SET_PRESELECT_NAFLAGS: + maskp = (au_mask_t *)data; + ap->ap_preselect_naflags = *maskp; + error = 0; + break; + + case AUDITPIPE_GET_PRESELECT_AUID: + aps = (struct auditpipe_preselect *)data; + error = EOPNOTSUPP; + break; + + case AUDITPIPE_SET_PRESELECT_AUID: + aps = (struct auditpipe_preselect *)data; + error = EOPNOTSUPP; + break; + + case AUDITPIPE_FLUSH_PRESELECT_AUID: + error = EOPNOTSUPP; + break; + case AUDITPIPE_GET_INSERTS: *(u_int *)data = ap->ap_inserts; error = 0; From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 3 15:44:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E02A416A407 for ; Wed, 3 May 2006 15:44:17 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B30B243D7F for ; Wed, 3 May 2006 15:44:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0013D46C39 for ; Wed, 3 May 2006 11:44:04 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3379664A28; Wed, 3 May 2006 15:43:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DDDED16A411; Wed, 3 May 2006 15:43:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B05C416A406 for ; Wed, 3 May 2006 15:43:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 728E843D62 for ; Wed, 3 May 2006 15:43:47 +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 k43FhltB058529 for ; Wed, 3 May 2006 15:43:47 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 k43FhlXH058526 for perforce@freebsd.org; Wed, 3 May 2006 15:43:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 May 2006 15:43:47 GMT Message-Id: <200605031543.k43FhlXH058526@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 96595 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 15:44:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=96595 Change 96595 by rwatson@rwatson_zoo on 2006/05/03 15:43:11 Default pre-selection masks for pipes to be full tracking, so that praudit on /dev/auditpipe will "just work". Add a flush ioctl that applications can use to empty a pipe of records that may not interest them, but were queued before they set up preselection. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#7 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#16 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#7 (text+ko) ==== @@ -59,7 +59,8 @@ struct auditpipe_preselect) #define AUDITPIPE_SET_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 11, \ struct auditpipe_preselect) -#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 11) +#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 12) +#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 13) /* * Ioctls to retrieve audit pipe statistics. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#16 (text+ko) ==== @@ -377,7 +377,11 @@ ap->ap_qlimit = AUDIT_PIPE_QLIMIT_DEFAULT; TAILQ_INIT(&ap->ap_queue); bzero(&ap->ap_preselect_flags, sizeof(ap->ap_preselect_flags)); + ap->ap_preselect_flags.am_success = 0xffffffff; + ap->ap_preselect_flags.am_failure = 0xffffffff; bzero(&ap->ap_preselect_naflags, sizeof(ap->ap_preselect_naflags)); + ap->ap_preselect_naflags.am_success = 0xffffffff; + ap->ap_preselect_naflags.am_failure = 0xffffffff; TAILQ_INIT(&ap->ap_preselect_list); TAILQ_INSERT_HEAD(&audit_pipe_list, ap, ap_list); @@ -388,11 +392,10 @@ } /* - * Free an audit pipe. Assumes mutex is held, audit_pipe is still on the - * global list. Frees any audit pipe entries in the queue. + * Flush all records from an audit pipe; assume mutex is held. */ static void -audit_pipe_free(struct audit_pipe *ap) +audit_pipe_flush(struct audit_pipe *ap) { struct audit_pipe_entry *ape; @@ -405,6 +408,17 @@ ap->ap_qlen--; } KASSERT(ap->ap_qlen == 0, ("audit_pipe_free: ap_qlen")); +} + +/* + * Free an audit pipe. Assumes mutex is held, audit_pipe is still on the + * global list. Frees any audit pipe entries in the queue. + */ +static void +audit_pipe_free(struct audit_pipe *ap) +{ + + audit_pipe_flush(ap); free(ap, M_AUDIT_PIPE); audit_pipe_count--; } @@ -621,6 +635,11 @@ error = EOPNOTSUPP; break; + case AUDITPIPE_FLUSH: + audit_pipe_flush(ap); + error = 0; + break; + case AUDITPIPE_GET_INSERTS: *(u_int *)data = ap->ap_inserts; error = 0; From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 3 16:03:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED62716A422 for ; Wed, 3 May 2006 16:03:43 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15D4543D7F for ; Wed, 3 May 2006 16:03:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 38CCA46C05 for ; Wed, 3 May 2006 12:03:31 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1E7A492141; Wed, 3 May 2006 16:03:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1449D16A416; Wed, 3 May 2006 16:03:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C72CB16A40B for ; Wed, 3 May 2006 16:03:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E39B43D46 for ; Wed, 3 May 2006 16:03:09 +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 k43G39YI069549 for ; Wed, 3 May 2006 16:03:09 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 k43G39ga069544 for perforce@freebsd.org; Wed, 3 May 2006 16:03:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 May 2006 16:03:09 GMT Message-Id: <200605031603.k43G39ga069544@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 96597 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2006 16:03:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=96597 Change 96597 by rwatson@rwatson_zoo on 2006/05/03 16:02:56 Comment on preselection at top. Add memory type for per-auid preselection structures. Assert mutex when checking for interest. Acquire mutex in external API for preselection. Comment on why we initialize preselection masks for pipes the way we do. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#17 (text+ko) ==== @@ -55,7 +55,8 @@ * Implementation of a clonable special device providing a live stream of BSM * audit data. This is a "tee" of the data going to the file. It provides * unreliable but timely access to audit events. Consumers of this interface - * should be very careful to avoid introducing event cycles. + * should be very careful to avoid introducing event cycles. Consumers may + * express interest via a set of preselection ioctls. */ /* @@ -64,6 +65,8 @@ static MALLOC_DEFINE(M_AUDIT_PIPE, "audit_pipe", "Audit pipes"); static MALLOC_DEFINE(M_AUDIT_PIPE_ENTRY, "audit_pipeent", "Audit pipe entries and buffers"); +static MALLOC_DEFINE(M_AUDIT_PIPE_PRESELECT, "audit_pipe_preselect", + "Audit pipe preselection structure"); /* * Audit pipe buffer parameters. @@ -205,6 +208,8 @@ { struct audit_pipe_preselect *app; + mtx_assert(&audit_pipe_mtx, MA_OWNED); + TAILQ_FOREACH(app, &ap->ap_preselect_list, app_list) { if (app->app_auid == auid) break; @@ -231,10 +236,14 @@ { struct audit_pipe *ap; + mtx_lock(&audit_pipe_mtx); TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { - if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) + if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) { + mtx_lock(&audit_pipe_mtx); return (1); + } } + mtx_unlock(&audit_pipe_mtx); return (0); } @@ -376,6 +385,16 @@ return (NULL); ap->ap_qlimit = AUDIT_PIPE_QLIMIT_DEFAULT; TAILQ_INIT(&ap->ap_queue); + + /* + * Initialize pre-selection state to match all events by default, and + * have no particular auid-specific entries. This allows praudit(1) + * to be run directly on an audit pipe without any configuration or + * special handling. However, it also requires that applications + * flush the pipe after specifying preselection prequirements so that + * they don't see events captured before they completed + * configuration. + */ bzero(&ap->ap_preselect_flags, sizeof(ap->ap_preselect_flags)); ap->ap_preselect_flags.am_success = 0xffffffff; ap->ap_preselect_flags.am_failure = 0xffffffff; From owner-trustedbsd-cvs@FreeBSD.ORG Thu May 4 12:16:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CEE3716A400 for ; Thu, 4 May 2006 12:16:37 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BA0A43D49 for ; Thu, 4 May 2006 12:16:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7936746B2D for ; Thu, 4 May 2006 08:16:36 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9CA7955885; Thu, 4 May 2006 12:16:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9774716A403; Thu, 4 May 2006 12:16:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E3AB16A401 for ; Thu, 4 May 2006 12:16:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27FC643D53 for ; Thu, 4 May 2006 12:16:35 +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 k44CGYhh090594 for ; Thu, 4 May 2006 12:16:35 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 k44CGY9g090588 for perforce@freebsd.org; Thu, 4 May 2006 12:16:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 4 May 2006 12:16:34 GMT Message-Id: <200605041216.k44CGY9g090588@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 96652 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 12:16:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=96652 Change 96652 by rwatson@rwatson_zoo on 2006/05/04 12:16:22 Consistently use audit_free() to free records, rather than directly invoking uma_zfree(). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#26 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#26 (text+ko) ==== @@ -390,7 +390,7 @@ mtx_lock(&audit_mtx); audit_pre_q_len--; mtx_unlock(&audit_mtx); - uma_zfree(audit_record_zone, ar); + audit_free(ar); return; } @@ -416,7 +416,7 @@ if (audit_suspended || !audit_enabled) { audit_pre_q_len--; mtx_unlock(&audit_mtx); - uma_zfree(audit_record_zone, ar); + audit_free(ar); return; } From owner-trustedbsd-cvs@FreeBSD.ORG Thu May 4 13:59:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C12BB16A488 for ; Thu, 4 May 2006 13:59:05 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08EBD43D55 for ; Thu, 4 May 2006 13:59:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BD62646D41 for ; Thu, 4 May 2006 09:59:00 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3544673B8D; Thu, 4 May 2006 13:58:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3066E16A433; Thu, 4 May 2006 13:58:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E7F8216A42C for ; Thu, 4 May 2006 13:58:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2678C43D5C for ; Thu, 4 May 2006 13:58: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 k44Dwtbb056428 for ; Thu, 4 May 2006 13:58: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 k44DwtGf056422 for perforce@freebsd.org; Thu, 4 May 2006 13:58:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 4 May 2006 13:58:55 GMT Message-Id: <200605041358.k44DwtGf056422@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 96655 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2006 13:59:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=96655 Change 96655 by rwatson@rwatson_zoo on 2006/05/04 13:57:56 A variety of changes in support of preselection for audit pipes: - Add two new preselection flags for queued audit records: AR_PRESELECT_TRAIL and AR_PRESELECT_PIPE, which are used to track whether a particular queued record was requested by the global trail configuration, or if some or another pipe has requested it. This flag is now set during record commit preselection to be used by the audit worker in deciding where to send the record. - au_preselect() now accepts a class argument so that the caller can look up the class once for all trail/pipe preselection and avoid repeated class lookups for an event type. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#27 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#6 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#18 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#26 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#13 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#27 (text+ko) ==== @@ -334,6 +334,9 @@ void audit_commit(struct kaudit_record *ar, int error, int retval) { + au_event_t event; + au_class_t class; + au_id_t auid; int sorf; struct au_mask *aumask; @@ -379,14 +382,17 @@ break; } - if (au_preselect(ar->k_ar.ar_event, aumask, sorf) != 0) - ar->k_ar_commit |= AR_COMMIT_KERNEL; + auid = ar->k_ar.ar_subj_auid; + event = ar->k_ar.ar_event; + class = au_event_class(event); - /* - * XXXRW: Why is this necessary? Should we ever accept a record that - * we're not willing to commit? - */ - if ((ar->k_ar_commit & (AR_COMMIT_USER | AR_COMMIT_KERNEL)) == 0) { + ar->k_ar_commit |= AR_COMMIT_KERNEL; + if (au_preselect(event, class, aumask, sorf) != 0) + ar->k_ar_commit |= AR_PRESELECT_TRAIL; + if (audit_pipe_preselect(auid, event, class, sorf) != 0) + ar->k_ar_commit |= AR_PRESELECT_PIPE; + if ((ar->k_ar_commit & (AR_PRESELECT_TRAIL | AR_PRESELECT_PIPE)) == + 0) { mtx_lock(&audit_mtx); audit_pre_q_len--; mtx_unlock(&audit_mtx); @@ -448,8 +454,10 @@ void audit_syscall_enter(unsigned short code, struct thread *td) { - int audit_event; struct au_mask *aumask; + au_class_t class; + au_event_t event; + au_id_t auid; KASSERT(td->td_ar == NULL, ("audit_syscall_enter: td->td_ar != NULL")); @@ -466,15 +474,16 @@ if (code >= td->td_proc->p_sysent->sv_size) return; - audit_event = td->td_proc->p_sysent->sv_table[code].sy_auevent; - if (audit_event == AUE_NULL) + event = td->td_proc->p_sysent->sv_table[code].sy_auevent; + if (event == AUE_NULL) return; /* * 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) + auid = td->td_proc->p_au->ai_auid; + if (auid == AU_DEFAUDITID) aumask = &audit_nae_mask; else aumask = &td->td_proc->p_au->ai_mask; @@ -483,8 +492,8 @@ * Allocate an audit record, if preselection allows it, and store * in the thread for later use. */ - if (au_preselect(audit_event, aumask, - AU_PRS_FAILURE | AU_PRS_SUCCESS)) { + class = au_event_class(event); + if (au_preselect(event, class, aumask, AU_PRS_BOTH)) { /* * If we're out of space and need to suspend unprivileged * processes, do that here rather than trying to allocate @@ -501,8 +510,10 @@ cv_wait(&audit_fail_cv, &audit_mtx); panic("audit_failing_stop: thread continued"); } - td->td_ar = audit_new(audit_event, td); - } else + td->td_ar = audit_new(event, td); + } else if (audit_pipe_preselect(auid, event, class, AU_PRS_BOTH)) + td->td_ar = audit_new(event, td); + else td->td_ar = NULL; } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#6 (text+ko) ==== @@ -155,24 +155,21 @@ * event is part of against the given mask. */ int -au_preselect(au_event_t event, au_mask_t *mask_p, int sorf) +au_preselect(au_event_t event, au_class_t class, au_mask_t *mask_p, int sorf) { au_class_t effmask = 0; - au_class_t ae_class; if (mask_p == NULL) return (-1); - ae_class = au_event_class(event); - /* * Perform the actual check of the masks against the event. */ if (sorf & AU_PRS_SUCCESS) - effmask |= (mask_p->am_success & ae_class); + effmask |= (mask_p->am_success & class); if (sorf & AU_PRS_FAILURE) - effmask |= (mask_p->am_failure & ae_class); + effmask |= (mask_p->am_failure & class); if (effmask) return (1); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#18 (text+ko) ==== @@ -216,13 +216,13 @@ } if (app == NULL) { if (auid == AU_DEFAUDITID) - return (au_preselect(event, &ap->ap_preselect_naflags, - sorf)); + return (au_preselect(event, class, + &ap->ap_preselect_naflags, sorf)); else - return (au_preselect(event, &ap->ap_preselect_flags, - sorf)); + return (au_preselect(event, class, + &ap->ap_preselect_flags, sorf)); } else - return (au_preselect(event, &app->app_mask, sorf)); + return (au_preselect(event, class, &app->app_mask, sorf)); return (0); } @@ -239,7 +239,7 @@ mtx_lock(&audit_pipe_mtx); TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) { - mtx_lock(&audit_pipe_mtx); + mtx_unlock(&audit_pipe_mtx); return (1); } } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#26 (text+ko) ==== @@ -84,11 +84,16 @@ #define BSM_NOAUDIT 2 /* - * Defines for the kernel audit record k_ar_commit field. + * Defines for the kernel audit record k_ar_commit field. Flags are set to + * indicate what sort of record it is, and which preselection mechanism + * selected it. */ #define AR_COMMIT_KERNEL 0x00000001U #define AR_COMMIT_USER 0x00000010U +#define AR_PRESELECT_TRAIL 0x00001000U +#define AR_PRESELECT_PIPE 0x00002000U + /* * Audit data is generated as a stream of struct audit_record structures, * linked by struct kaudit_record, and contain storage for possible audit so @@ -305,7 +310,8 @@ /* * audit_klib prototypes */ -int au_preselect(au_event_t event, au_mask_t *mask_p, int sorf); +int au_preselect(au_event_t event, au_class_t class, + au_mask_t *mask_p, int sorf); au_event_t flags_and_error_to_openevent(int oflags, int error); void au_evclassmap_init(void); void au_evclassmap_insert(au_event_t event, au_class_t class); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#13 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#10 (text+ko) ==== @@ -321,52 +321,60 @@ au_id_t auid; int sorf; - if (ar->k_ar_commit & AR_COMMIT_USER) { + if ((ar->k_ar_commit & AR_COMMIT_USER) && + (ar->k_ar_commit & AR_PRESELECT_TRAIL)) { error = audit_record_write(audit_vp, audit_cred, audit_td, ar->k_udata, ar->k_ulen); if (error && audit_panic_on_write_fail) panic("audit_worker: write error %d\n", error); else if (error) printf("audit_worker: write error %d\n", error); + } + if ((ar->k_ar_commit & AR_COMMIT_USER) && + (ar->k_ar_commit & AR_PRESELECT_PIPE)) audit_pipe_submit_user(ar->k_udata, ar->k_ulen); - } + + if (!(ar->k_ar_commit & AR_COMMIT_KERNEL)) + return; + + auid = ar->k_ar.ar_subj_auid; + event = ar->k_ar.ar_event; + class = au_event_class(event); + if (ar->k_ar.ar_errno == 0) + sorf = AU_PRS_SUCCESS; + else + sorf = AU_PRS_FAILURE; - if (ar->k_ar_commit & AR_COMMIT_KERNEL) { - auid = ar->k_ar.ar_subj_auid; - event = ar->k_ar.ar_event; - class = au_event_class(event); - if (ar->k_ar.ar_errno == 0) - sorf = AU_PRS_SUCCESS; - else - sorf = AU_PRS_FAILURE; + ret = kaudit_to_bsm(ar, &bsm); + switch (ret) { + case BSM_NOAUDIT: + return; - ret = kaudit_to_bsm(ar, &bsm); - switch (ret) { - case BSM_NOAUDIT: - break; + case BSM_FAILURE: + printf("audit_worker_process_record: BSM_FAILURE\n"); + return; - case BSM_FAILURE: - printf("audit_worker_process_record: BSM_FAILURE\n"); - break; + case BSM_SUCCESS: + break; - case BSM_SUCCESS: - error = audit_record_write(audit_vp, audit_cred, - audit_td, bsm->data, bsm->len); - if (error && audit_panic_on_write_fail) - panic("audit_worker: write error %d\n", - error); - else if (error) - printf("audit_worker: write error %d\n", - error); - audit_pipe_submit(auid, event, class, sorf, - bsm->data, bsm->len); - kau_free(bsm); - break; + default: + panic("kaudit_to_bsm returned %d", ret); + } - default: - panic("kaudit_to_bsm returned %d", ret); - } + if (ar->k_ar_commit & AR_PRESELECT_TRAIL) { + error = audit_record_write(audit_vp, audit_cred, + audit_td, bsm->data, bsm->len); + if (error && audit_panic_on_write_fail) + panic("audit_worker: write error %d\n", + error); + else if (error) + printf("audit_worker: write error %d\n", + error); } + if (ar->k_ar_commit & AR_PRESELECT_PIPE) + audit_pipe_submit(auid, event, class, sorf, + bsm->data, bsm->len); + kau_free(bsm); } /* From owner-trustedbsd-cvs@FreeBSD.ORG Fri May 5 13:36:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A80BA16A401 for ; Fri, 5 May 2006 13:36:38 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21A7843D46 for ; Fri, 5 May 2006 13:36:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B288A46CE2 for ; Fri, 5 May 2006 09:36:37 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2616E5548E; Fri, 5 May 2006 13:34:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F85616A403; Fri, 5 May 2006 13:34:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D547D16A401 for ; Fri, 5 May 2006 13:34:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8898C43D4C for ; Fri, 5 May 2006 13:34:51 +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 k45DYpYg042084 for ; Fri, 5 May 2006 13:34:51 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 k45DYo17042063 for perforce@freebsd.org; Fri, 5 May 2006 13:34:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 May 2006 13:34:50 GMT Message-Id: <200605051334.k45DYo17042063@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 96699 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 13:36:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=96699 Change 96699 by rwatson@rwatson_zoo on 2006/05/05 13:34:02 Integrate audit.4 to auditpipe.4; audit pipes are now complicated enough that they require their own man page. Affected files ... .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#1 branch Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Fri May 5 13:36:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B19A16A400 for ; Fri, 5 May 2006 13:36:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0826E43D46 for ; Fri, 5 May 2006 13:36:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5A13046C80 for ; Fri, 5 May 2006 09:36:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D97F7631B9; Fri, 5 May 2006 13:34:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BCE3C16A46A; Fri, 5 May 2006 13:34:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A99816A468 for ; Fri, 5 May 2006 13:34:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F5B043D4C for ; Fri, 5 May 2006 13:34:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k45DYq0M042103 for ; Fri, 5 May 2006 13:34:52 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 k45DYpog042093 for perforce@freebsd.org; Fri, 5 May 2006 13:34:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 May 2006 13:34:51 GMT Message-Id: <200605051334.k45DYpog042093@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 96700 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 13:36:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=96700 Change 96700 by rwatson@rwatson_zoo on 2006/05/05 13:34:03 Add three new ioctls to audit pipes: AUDITPIPE_DELETE_AUID, which will delete the preselection state for a particular auid on the pipe, and AUDITPIPE_{GET/SET}_PRESELECT_TRAIL, which set the AUDIT_PIPE_TRAIL flag on the pipe, which indicates that the pipe will follow the trail preselection model, rather than using its own preselection settings. This is now the default, restoring the behavior of praudit(1) on /dev/auditpipe to its default prior to adding preselection magic. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#28 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#8 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#19 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#27 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#28 (text+ko) ==== @@ -389,7 +389,8 @@ ar->k_ar_commit |= AR_COMMIT_KERNEL; if (au_preselect(event, class, aumask, sorf) != 0) ar->k_ar_commit |= AR_PRESELECT_TRAIL; - if (audit_pipe_preselect(auid, event, class, sorf) != 0) + if (audit_pipe_preselect(auid, event, class, sorf, + ar->k_ar_commit & AR_PRESELECT_TRAIL) != 0) ar->k_ar_commit |= AR_PRESELECT_PIPE; if ((ar->k_ar_commit & (AR_PRESELECT_TRAIL | AR_PRESELECT_PIPE)) == 0) { @@ -511,7 +512,7 @@ panic("audit_failing_stop: thread continued"); } td->td_ar = audit_new(event, td); - } else if (audit_pipe_preselect(auid, event, class, AU_PRS_BOTH)) + } else if (audit_pipe_preselect(auid, event, class, AU_PRS_BOTH, 0)) td->td_ar = audit_new(event, td); else td->td_ar = NULL; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#8 (text+ko) ==== @@ -59,8 +59,11 @@ struct auditpipe_preselect) #define AUDITPIPE_SET_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 11, \ struct auditpipe_preselect) -#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 12) -#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 13) +#define AUDITPIPE_DELETE_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 12, au_id_t) +#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 13) +#define AUDITPIPE_GET_PRESELECT_TRAIL _IOR(AUDITPIPE_IOBASE, 14, int) +#define AUDITPIPE_SET_PRESELECT_TRAIL _IOW(AUDITPIPE_IOBASE, 14, int) +#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 15) /* * Ioctls to retrieve audit pipe statistics. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#19 (text+ko) ==== @@ -103,6 +103,7 @@ */ #define AUDIT_PIPE_ASYNC 0x00000001 #define AUDIT_PIPE_NBIO 0x00000002 +#define AUDIT_PIPE_TRAIL 0x00000004 /* Use trail preselection. */ struct audit_pipe { int ap_open; /* Device open? */ u_int ap_flags; @@ -200,16 +201,25 @@ /* * Determine whether a specific audit pipe matches a record with these - * properties. + * properties. Algorithm is as follows: + * + * - If the pipe is configured to track the default trail configuration, then + * use that. + * - If not, search for a specifically configured auid entry matching the + * event. If it is found, use that. + * - Otherwise, use the default flags or naflags configured for the pipe. */ static int audit_pipe_preselect_check(struct audit_pipe *ap, au_id_t auid, - au_event_t event, au_class_t class, int sorf) + au_event_t event, au_class_t class, int sorf, int trail_preselect) { struct audit_pipe_preselect *app; mtx_assert(&audit_pipe_mtx, MA_OWNED); + if ((ap->ap_flags & AUDIT_PIPE_TRAIL) && trail_preselect) + return (1); + TAILQ_FOREACH(app, &ap->ap_preselect_list, app_list) { if (app->app_auid == auid) break; @@ -232,13 +242,14 @@ */ int audit_pipe_preselect(au_id_t auid, au_event_t event, au_class_t class, - int sorf) + int sorf, int trail_preselect) { struct audit_pipe *ap; mtx_lock(&audit_pipe_mtx); TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { - if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) { + if (audit_pipe_preselect_check(ap, auid, event, class, sorf, + trail_preselect)) { mtx_unlock(&audit_pipe_mtx); return (1); } @@ -301,7 +312,7 @@ */ void audit_pipe_submit(au_id_t auid, au_event_t event, au_class_t class, int sorf, - void *record, u_int record_len) + int trail_select, void *record, u_int record_len) { struct audit_pipe *ap; @@ -313,7 +324,8 @@ mtx_lock(&audit_pipe_mtx); TAILQ_FOREACH(ap, &audit_pipe_list, ap_list) { - if (audit_pipe_preselect_check(ap, auid, event, class, sorf)) + if (audit_pipe_preselect_check(ap, auid, event, class, sorf, + trail_select)) audit_pipe_append(ap, record, record_len); } audit_pipe_records++; @@ -387,20 +399,15 @@ TAILQ_INIT(&ap->ap_queue); /* - * Initialize pre-selection state to match all events by default, and - * have no particular auid-specific entries. This allows praudit(1) - * to be run directly on an audit pipe without any configuration or - * special handling. However, it also requires that applications - * flush the pipe after specifying preselection prequirements so that - * they don't see events captured before they completed - * configuration. + * Default flags, naflags, and auid-specific preselection settings to + * 0. Initialize the AUDIT_PIPE_TRAIL flag so that if praudit(1) is + * run on /dev/auditpipe, it sees events associated with the default + * trail. Pipe-aware application can clear the flag, set custom + * masks, and flush the pipe as needed. */ bzero(&ap->ap_preselect_flags, sizeof(ap->ap_preselect_flags)); - ap->ap_preselect_flags.am_success = 0xffffffff; - ap->ap_preselect_flags.am_failure = 0xffffffff; bzero(&ap->ap_preselect_naflags, sizeof(ap->ap_preselect_naflags)); - ap->ap_preselect_naflags.am_success = 0xffffffff; - ap->ap_preselect_naflags.am_failure = 0xffffffff; + ap->ap_flags |= AUDIT_PIPE_TRAIL; TAILQ_INIT(&ap->ap_preselect_list); TAILQ_INSERT_HEAD(&audit_pipe_list, ap, ap_list); @@ -535,6 +542,7 @@ struct auditpipe_preselect *aps; struct audit_pipe *ap; au_mask_t *maskp; + au_id_t auid; int error; ap = dev->si_drv1; @@ -650,10 +658,28 @@ error = EOPNOTSUPP; break; + case AUDITPIPE_DELETE_PRESELECT_AUID: + auid = *(au_id_t *)data; + error = EOPNOTSUPP; + break; + case AUDITPIPE_FLUSH_PRESELECT_AUID: error = EOPNOTSUPP; break; + case AUDITPIPE_GET_PRESELECT_TRAIL: + *(int *)data = (ap->ap_flags & AUDIT_PIPE_TRAIL) ? 1 : 0; + error = 0; + break; + + case AUDITPIPE_SET_PRESELECT_TRAIL: + if (*(int *)data) + ap->ap_flags |= AUDIT_PIPE_TRAIL; + else + ap->ap_flags &= ~AUDIT_PIPE_TRAIL; + error = 0; + break; + case AUDITPIPE_FLUSH: audit_pipe_flush(ap); error = 0; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#27 (text+ko) ==== @@ -344,9 +344,9 @@ * Audit pipe functions. */ int audit_pipe_preselect(au_id_t auid, au_event_t event, - au_class_t class, int sorf); + au_class_t class, int sorf, int trail_select); void audit_pipe_submit(au_id_t auid, au_event_t event, au_class_t class, - int sorf, void *record, u_int record_len); + int sorf, int trail_select, void *record, u_int record_len); void audit_pipe_submit_user(void *record, u_int record_len); #endif /* ! _SECURITY_AUDIT_PRIVATE_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#11 (text+ko) ==== @@ -373,7 +373,8 @@ } if (ar->k_ar_commit & AR_PRESELECT_PIPE) audit_pipe_submit(auid, event, class, sorf, - bsm->data, bsm->len); + ar->k_ar_commit & AR_PRESELECT_TRAIL, bsm->data, + bsm->len); kau_free(bsm); } From owner-trustedbsd-cvs@FreeBSD.ORG Fri May 5 14:00:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C3EE116A40D for ; Fri, 5 May 2006 14:00:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 268C643D64 for ; Fri, 5 May 2006 14:00:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 91F8646C48 for ; Fri, 5 May 2006 09:59:53 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1B1F55BC61; Fri, 5 May 2006 13:59:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 12C3816A419; Fri, 5 May 2006 13:59:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 919D416A400 for ; Fri, 5 May 2006 13:59:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A8F943DA8 for ; Fri, 5 May 2006 13:59: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 k45DxQ8M058232 for ; Fri, 5 May 2006 13:59: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 k45DxQ6k058220 for perforce@freebsd.org; Fri, 5 May 2006 13:59:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 May 2006 13:59:26 GMT Message-Id: <200605051359.k45DxQ6k058220@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 96701 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 14:00:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=96701 Change 96701 by rwatson@rwatson_zoo on 2006/05/05 13:58:05 Create more detailed auditpipe(4) page by removing audit(4) information from auditpipe(4) and vice versa; add a long and possibly accurate section on the auditpipe ioctls used to configure audit pipes. Affected files ... .. //depot/projects/trustedbsd/audit3/share/man/man4/audit.4#2 edit .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/share/man/man4/audit.4#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" .\" $FreeBSD: src/share/man/man4/audit.4,v 1.6 2006/02/06 20:27:00 rwatson Exp $ .\" -.Dd February 6, 2006 +.Dd May 5, 2006 .Os .Dt AUDIT 4 .Sh NAME @@ -62,37 +62,11 @@ space conditions, and requests to terminate auditing. This device is not intended for use by applications. .Ss Audit Pipe Special Devices -While audit trail files maintained by -.Xr auditd 8 -provide a reliable long-term store for audit log information, current log -files are owned by the audit daemon until terminated making them somewhat -unwieldy for live montoring applications such as host-based intrusion -detection. -For example, the log may be cycled and new records written to a new file -without notice to applications that may be accessing the file. -.Pp -The audit facility provides an audit pipe facility for applications requiring -direct access to live BSM audit data for the purposes of real-time -monitoring. -Audit pipes are available via a clonable special device, -.Pa /dev/auditpipe , -subject to the permissions on the device node, and provide a -.Qq tee -of the audit event stream. -As the device is clonable, more than one instance of the device may be opened -at a time; each device instance will provide access to all records. -.Pp -The audit pipe device provides discreet BSM audit records; if the read buffer -passed by the application is too small to hold the next record in the -sequence, it will be dropped. -Unlike audit data written to the audit trail, the reliability of record -delivery is not guaranteed. -In particular, when an audit pipe queue fills, records will be dropped. -Audit pipe devices are blocking by default, but support non-blocking I/O, -asynchronous I/O using SIGIO, and support for polled operation via -.Xr select 2 -and -.Xr poll 2 . +Audit pipe special devices, discussed in +.Xr auditpipe 4 , +provide a configurable live tracking mechanism to allow applications to +tee the audit trail, as well as to configure custom preselection paramaters +to track users and events in a fine-grained manner. .Sh SEE ALSO .Xr auditreduce 1 , .Xr praudit 1 , @@ -106,6 +80,7 @@ .Xr setaudit 2 , .Xr setauid 2 , .Xr libbsm 3 , +.Xr auditpipe 4 , .Xr audit.log 5 , .Xr audit_class 5 , .Xr audit_control 5 , ==== //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#2 (text+ko) ==== @@ -22,48 +22,22 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/audit.4,v 1.6 2006/02/06 20:27:00 rwatson Exp $ +.\" $FreeBSD$ .\" -.Dd February 6, 2006 +.Dd May 5, 2006 .Os -.Dt AUDIT 4 +.Vt AUDITPIPE 4 .Sh NAME -.Nm audit -.Nd Security Event Audit +.Nm auditpipe +.Nd Pseudo-device for live audit event tracking .Sh SYNOPSIS .Cd "options AUDIT" .Sh DESCRIPTION -Security Event Audit is a facility to provide fine-grained, configurable -logging of security-relevant events, and is intended to meet the requirements -of the Common Criteria (CC) Common Access Protection Profile (CAPP) -evaluation. -The -.Fx -audit facility implements the de facto industry standard BSM API, file -formats, and command line interface, first found in the Solaris operating -system. -Information on the user space implementation can be found in -.Xr libbsm 3 . -.Pp -Audit support is enabled at boot, if present in the kernel, using an -.Xr rc.conf 5 -flag. -The audit daemon, -.Xr auditd 8 , -is responsible for configuring the kernel to perform audit, pushing -configuration data from the various audit configuration files into the -kernel. -.Ss Audit Special Device -The kernel audit facility provides a special device, -.Pa /dev/audit , -which is used by +While audit trail files +generated with +.Xr audit 4 +and maintained by .Xr auditd 8 -to monitor for audit events, such as requests to cycle the log, low disk -space conditions, and requests to terminate auditing. -This device is not intended for use by applications. -.Ss Audit Pipe Special Devices -While audit trail files maintained by -.Xr auditd 8 provide a reliable long-term store for audit log information, current log files are owned by the audit daemon until terminated making them somewhat unwieldy for live montoring applications such as host-based intrusion @@ -93,38 +67,128 @@ .Xr select 2 and .Xr poll 2 . +.Ss Preselection +By default, the audit pipe facility configures pipes to present records +matched by the system-wide audit trail, configured by +.Xr auditd 8 . +However, the preselection mechanism for audit pipes can be configured using +alternative criteria, including pipe-local flags and naflags settings, as +well as auid-specific selection masks. +.Ss Ioctls +These properties are configured using ioctls on the open audit pipe device. +.Bl -tag -width AUDITPIPE_DELETE_PRESELECT_AUID +.It AUDITPIPE_GET_QLEN +Query the current number of records available for reading on the pipe. +.It AUDITPIPE_GET_QLIMIT +Retrieve the current maximum number of records that may be queued for reading +on the pipe. +.It AUDITPIPE_SET_QLIMIT +Set the current maximum number of records that may be queued for reading on +the pipe. +The new limit must fall between the queue limit minimum and queue limit +maximum queryable using the following two ioctls. +.It AUDITPIPE_GET_QLIMIT_MIN +Query the lowest possible maximum number of records that may be queued for +reading on the pipe. +.It AUDITPIPE_GET_QLIMIT_MAX +Query the highest possible maximum number of records that may be queued for +reading on the pipe. +.It AUDITPIPE_GET_PRESELECT_FLAGS +Retrieve the current default preselection flags for attributable events on +the pipe. +These flags correspond to the +.Dv flags +field in +.Xr audit_control 5 . +The ioctl argument should be of type +.Vt u_int. +.It AUDITPIPE_SET_PRESELECT_FLAGS +Set the current default preselection flags for attributable events on the +pipe. +These flags correspond to the +.Dv flags +field in +.Xr audit_control 5 . +The ioctl argument should be of type +.Vt u_int. +.It AUDITPIPE_GET_PRESELECT_NAFLAGS +Retrieve the current default preselection flags for non-attributable events +on the pipe. +These flags correspond to the +.Dv naflags +field in +.Xr audit_control 5 . +The ioctl argument should be of type +.Vt u_int. +.It AUDITPIPE_SET_PRESELECT_NAFLAGS +Set the current default preselection flags for non-attributable events on the +pipe. +These flags correspond to the +.Dv naflags +field in +.Xr audit_control 5 . +The ioctl argument should be of type +.Vt u_int. +.It AUDITPIPE_GET_PRESELECT_AUID +Query the current preselection masks for a specific auid on the pipe. +The ioctl argument should be of type +.Vt struct auditpipe_preselect . +The auid to query is specified via the +.Va ap_auid +field; the mask will be returned via +.Va ap_mask +of type +.Vt au_mask_t . +.It AUDITPIPE_SET_PRESELECT_AUID +Set the current preselection masks for a specific auid on the pipe. +Arguments are identical to +.Dv AUDITPIPE_GET_PRESELECT_AUID, +except that the caller should properly initialize the +.Va ap_mask +field to hold the desired preselection mask. +.It AUDITPIPE_DELETE_PRESELECT_AUID +Delete the current preselection mask for a specific auid on the pipe. +Once called, events associated with the specified auid will use the default +flags mask. +.It AUDITPIPE_FLUSH_PRESELECT_AUID +Delete all auid specific preselection specifications. +.It AUDITPIPE_GET_PRESELECT_TRAIL +Return the current value of the preselection trail flag on the audit pipe; +this flag indicates that the system audit trail preselection masks are to be +used in selecting which events can be read from the audit pipe. +If the value is 1, the trail masks are used; if the value is 0, then the +pipe preselection masks will be used. +The ioctl argument should be of type +.Vt int . +.It AUDITPIPE_SET_PRESELECT_TRAIL +Set the current value of the preselection trail flag on the audit pipe, with +values as described for +.Dv AUDITPIPE_GET_PRESELECT_TRAIL. +The ioctl argument should be of type +.Vt int . +.It AUDITPIPE_FLUSH +Flush all outstanding records on the audit pipe; useful after setting initial +preselection properties to delete records queued during the configuration +process which may not match the interests of the user process. +.El +.Sh EXAMPLES +.Xr praudit 1 +may be directly executed on +.Pa /dev/auditpipe +to review the default audit trail. .Sh SEE ALSO -.Xr auditreduce 1 , -.Xr praudit 1 , -.Xr audit 2 , -.Xr auditctl 2 , -.Xr auditon 2 , -.Xr getaudit 2 , -.Xr getauid 2 , .Xr poll 2 , .Xr select 2 , -.Xr setaudit 2 , -.Xr setauid 2 , -.Xr libbsm 3 , -.Xr audit.log 5 , -.Xr audit_class 5 , +.Xr audit 4 , .Xr audit_control 5 , -.Xr audit_event 5 , -.Xr audit_user 5 , -.Xr audit_warn 5 , -.Xr rc.conf 5 , .Xr audit 8 , .Xr auditd 8 .Sh AUTHORS -This software was created by McAfee Research, the security research division -of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +The audit pipe facility was created by +.An Robert Watson Aq rwatson@FreeBSD.org . .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Pp -This manual page was written by -.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. @@ -132,23 +196,8 @@ the OpenBSM distribution. .Pp Support for kernel audit first appeared in -.Fx 6.1 . +.Fx 6.2 . .Sh BUGS -The audit facility in -.Fx -is considered experimental, and production deployment should occur only after -careful consideration of the risks of deploying experimental software. -.Pp -The -.Fx -kernel does not fully validate that audit records submitted by user -applications are syntactically valid BSM; as submission of records is limited -to privileged processes, this is not a critical bug. -.Pp -Instrumentation of auditable events in the kernel is not complete, as some -system calls do not generate audit records, or generate audit records with -incomplete argument information. -.Pp -Mandatory Access Control (MAC) labels, as provided by the -.Xr mac 4 -facility, are not audited as part of records involving MAC decisions. +See the +.Xr audit 4 +man page for information on audit-related bugs and limitations. From owner-trustedbsd-cvs@FreeBSD.ORG Fri May 5 14:00:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA93216A491 for ; Fri, 5 May 2006 14:00:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4ECA543D70 for ; Fri, 5 May 2006 14:00:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EB9ED46C80 for ; Fri, 5 May 2006 10:00:50 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CA7765BE70; Fri, 5 May 2006 14:00:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C428F16A411; Fri, 5 May 2006 14:00:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9EF2B16A40F for ; Fri, 5 May 2006 14:00:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6316743D67 for ; Fri, 5 May 2006 14:00:46 +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 k45E0kji059112 for ; Fri, 5 May 2006 14:00:46 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 k45E0kES059109 for perforce@freebsd.org; Fri, 5 May 2006 14:00:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 May 2006 14:00:46 GMT Message-Id: <200605051400.k45E0kES059109@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 96702 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 14:00:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=96702 Change 96702 by rwatson@rwatson_zoo on 2006/05/05 13:59:44 Correct copy/paste-o: use different ioctl numbers for different ioctls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#9 (text+ko) ==== @@ -62,8 +62,8 @@ #define AUDITPIPE_DELETE_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 12, au_id_t) #define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 13) #define AUDITPIPE_GET_PRESELECT_TRAIL _IOR(AUDITPIPE_IOBASE, 14, int) -#define AUDITPIPE_SET_PRESELECT_TRAIL _IOW(AUDITPIPE_IOBASE, 14, int) -#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 15) +#define AUDITPIPE_SET_PRESELECT_TRAIL _IOW(AUDITPIPE_IOBASE, 15, int) +#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 16) /* * Ioctls to retrieve audit pipe statistics. From owner-trustedbsd-cvs@FreeBSD.ORG Fri May 5 16:17:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E125616A403 for ; Fri, 5 May 2006 16:17:43 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E305F43D4C for ; Fri, 5 May 2006 16:17:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F11C746B7E for ; Fri, 5 May 2006 12:17:41 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 83A2D14C6F6; Fri, 5 May 2006 16:11:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B36516A402; Fri, 5 May 2006 16:11:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5075416A400 for ; Fri, 5 May 2006 16:11:28 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D87E43D55 for ; Fri, 5 May 2006 16:11:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k45GBPfT030766 for ; Fri, 5 May 2006 16:11:25 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 k45GBPFX030758 for perforce@freebsd.org; Fri, 5 May 2006 16:11:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 May 2006 16:11:25 GMT Message-Id: <200605051611.k45GBPFX030758@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 96706 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 May 2006 16:17:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=96706 Change 96706 by rwatson@rwatson_zoo on 2006/05/05 16:11:23 First pass implementations of get / set / delete / flush auid preselection rules. Not tested. Rename auditpipe_preselect to auditpipe_ioctl_preselect as an ioctl argument to prevent excessively similar name to audit_pipe_preselect. It's still not a very good structure name, as the string 'auid' should probably appear in it. Add better locking for various ioctls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#10 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#20 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#10 (text+ko) ==== @@ -38,9 +38,9 @@ * structures, add new revised ones to be used by new ioctls, and keep the * old structures and ioctls for backwards compatibility. */ -struct auditpipe_preselect { - au_id_t ap_auid; - au_mask_t ap_mask; +struct auditpipe_ioctl_preselect { + au_id_t aip_auid; + au_mask_t aip_mask; }; /* @@ -56,9 +56,9 @@ #define AUDITPIPE_GET_PRESELECT_NAFLAGS _IOR(AUDITPIPE_IOBASE, 8, au_mask_t) #define AUDITPIPE_SET_PRESELECT_NAFLAGS _IOW(AUDITPIPE_IOBASE, 9, au_mask_t) #define AUDITPIPE_GET_PRESELECT_AUID _IOR(AUDITPIPE_IOBASE, 10, \ - struct auditpipe_preselect) + struct auditpipe_ioctl_preselect) #define AUDITPIPE_SET_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 11, \ - struct auditpipe_preselect) + struct auditpipe_ioctl_preselect) #define AUDITPIPE_DELETE_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 12, au_id_t) #define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 13) #define AUDITPIPE_GET_PRESELECT_TRAIL _IOR(AUDITPIPE_IOBASE, 14, int) ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#20 (text+ko) ==== @@ -200,6 +200,97 @@ } /* + * Find an audit pipe preselection specification for an auid, if any. + */ +static struct audit_pipe_preselect * +audit_pipe_preselect_find(struct audit_pipe *ap, au_id_t auid) +{ + struct audit_pipe_preselect *app; + + mtx_assert(&audit_pipe_mtx, MA_OWNED); + + TAILQ_FOREACH(app, &ap->ap_preselect_list, app_list) { + if (app->app_auid == auid) + return (app); + } + return (NULL); +} + +static int +audit_pipe_preselect_get(struct audit_pipe *ap, au_id_t auid, + au_mask_t *maskp) +{ + struct audit_pipe_preselect *app; + int error; + + mtx_lock(&audit_pipe_mtx); + app = audit_pipe_preselect_find(ap, auid); + if (app != NULL) { + *maskp = app->app_mask; + error = 0; + } else + error = ENOENT; + mtx_unlock(&audit_pipe_mtx); + return (error); +} + +static void +audit_pipe_preselect_set(struct audit_pipe *ap, au_id_t auid, au_mask_t mask) +{ + struct audit_pipe_preselect *app, *app_new; + + /* + * Pessimistically assume that the auid doesn't already have a mask + * set, and allocate. We will free it if it is unneeded. + */ + app_new = malloc(sizeof(*app_new), M_AUDIT_PIPE_PRESELECT, M_WAITOK); + mtx_lock(&audit_pipe_mtx); + app = audit_pipe_preselect_find(ap, auid); + if (app == NULL) { + app = app_new; + app_new = NULL; + app->app_auid = auid; + TAILQ_INSERT_TAIL(&ap->ap_preselect_list, app, app_list); + } + app->app_mask = mask; + mtx_unlock(&audit_pipe_mtx); + if (app_new != NULL) + free(app_new, M_AUDIT_PIPE_PRESELECT); +} + +static int +audit_pipe_preselect_delete(struct audit_pipe *ap, au_id_t auid) +{ + struct audit_pipe_preselect *app; + int error; + + mtx_lock(&audit_pipe_mtx); + app = audit_pipe_preselect_find(ap, auid); + if (app != NULL) { + TAILQ_REMOVE(&ap->ap_preselect_list, app, app_list); + error = 0; + } else + error = ENOENT; + mtx_unlock(&audit_pipe_mtx); + if (app != NULL) + free(app, M_AUDIT_PIPE_PRESELECT); + return (error); +} + +static void +audit_pipe_preselect_flush(struct audit_pipe *ap) +{ + struct audit_pipe_preselect *app; + + mtx_lock(&audit_pipe_mtx); + while ((app = TAILQ_FIRST(&ap->ap_preselect_list)) != NULL) { + TAILQ_REMOVE(&ap->ap_preselect_list, app, app_list); + free(app, M_AUDIT_PIPE_PRESELECT); + } + mtx_unlock(&audit_pipe_mtx); +} + +/* * Determine whether a specific audit pipe matches a record with these * properties. Algorithm is as follows: * @@ -220,10 +311,7 @@ if ((ap->ap_flags & AUDIT_PIPE_TRAIL) && trail_preselect) return (1); - TAILQ_FOREACH(app, &ap->ap_preselect_list, app_list) { - if (app->app_auid == auid) - break; - } + app = audit_pipe_preselect_find(ap, auid); if (app == NULL) { if (auid == AU_DEFAUDITID) return (au_preselect(event, class, @@ -539,7 +627,7 @@ audit_pipe_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) { - struct auditpipe_preselect *aps; + struct auditpipe_ioctl_preselect *aip; struct audit_pipe *ap; au_mask_t *maskp; au_id_t auid; @@ -625,63 +713,80 @@ break; case AUDITPIPE_GET_PRESELECT_FLAGS: + mtx_lock(&audit_pipe_mtx); maskp = (au_mask_t *)data; *maskp = ap->ap_preselect_flags; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_SET_PRESELECT_FLAGS: + mtx_lock(&audit_pipe_mtx); maskp = (au_mask_t *)data; ap->ap_preselect_flags = *maskp; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_GET_PRESELECT_NAFLAGS: + mtx_lock(&audit_pipe_mtx); maskp = (au_mask_t *)data; *maskp = ap->ap_preselect_naflags; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_SET_PRESELECT_NAFLAGS: + mtx_lock(&audit_pipe_mtx); maskp = (au_mask_t *)data; ap->ap_preselect_naflags = *maskp; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_GET_PRESELECT_AUID: - aps = (struct auditpipe_preselect *)data; - error = EOPNOTSUPP; + aip = (struct auditpipe_ioctl_preselect *)data; + error = audit_pipe_preselect_get(ap, aip->aip_auid, + &aip->aip_mask); break; case AUDITPIPE_SET_PRESELECT_AUID: - aps = (struct auditpipe_preselect *)data; - error = EOPNOTSUPP; + aip = (struct auditpipe_ioctl_preselect *)data; + audit_pipe_preselect_set(ap, aip->aip_auid, aip->aip_mask); + error = 0; break; case AUDITPIPE_DELETE_PRESELECT_AUID: auid = *(au_id_t *)data; - error = EOPNOTSUPP; + error = audit_pipe_preselect_delete(ap, auid); break; case AUDITPIPE_FLUSH_PRESELECT_AUID: - error = EOPNOTSUPP; + audit_pipe_preselect_flush(ap); + error = 0; break; case AUDITPIPE_GET_PRESELECT_TRAIL: + mtx_lock(&audit_pipe_mtx); *(int *)data = (ap->ap_flags & AUDIT_PIPE_TRAIL) ? 1 : 0; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_SET_PRESELECT_TRAIL: + mtx_lock(&audit_pipe_mtx); if (*(int *)data) ap->ap_flags |= AUDIT_PIPE_TRAIL; else ap->ap_flags &= ~AUDIT_PIPE_TRAIL; + mtx_unlock(&audit_pipe_mtx); error = 0; break; case AUDITPIPE_FLUSH: + mtx_lock(&audit_pipe_mtx); audit_pipe_flush(ap); + mtx_unlock(&audit_pipe_mtx); error = 0; break; From owner-trustedbsd-cvs@FreeBSD.ORG Sat May 6 07:43:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 10E8C16A400 for ; Sat, 6 May 2006 07:43:37 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03A8743D55 for ; Sat, 6 May 2006 07:43:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id ED3A346C6E for ; Sat, 6 May 2006 03:43:34 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 40EC5559CB; Sat, 6 May 2006 07:43:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3937B16A402; Sat, 6 May 2006 07:43:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF35B16A401 for ; Sat, 6 May 2006 07:43:33 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98B7343D48 for ; Sat, 6 May 2006 07:43:33 +0000 (GMT) (envelope-from brueffer@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 k467hWFs075171 for ; Sat, 6 May 2006 07:43:33 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k467hWNr075144 for perforce@freebsd.org; Sat, 6 May 2006 07:43:32 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 6 May 2006 07:43:32 GMT Message-Id: <200605060743.k467hWNr075144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 96730 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 07:43:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=96730 Change 96730 by brueffer@brueffer_haakonia on 2006/05/06 07:42:31 Some cleanup. Committed from: FreeBSD booth at Linuxtag 2006 Affected files ... .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#3 (text+ko) ==== @@ -101,7 +101,7 @@ field in .Xr audit_control 5 . The ioctl argument should be of type -.Vt u_int. +.Vt u_int . .It AUDITPIPE_SET_PRESELECT_FLAGS Set the current default preselection flags for attributable events on the pipe. @@ -110,7 +110,7 @@ field in .Xr audit_control 5 . The ioctl argument should be of type -.Vt u_int. +.Vt u_int . .It AUDITPIPE_GET_PRESELECT_NAFLAGS Retrieve the current default preselection flags for non-attributable events on the pipe. @@ -119,7 +119,7 @@ field in .Xr audit_control 5 . The ioctl argument should be of type -.Vt u_int. +.Vt u_int . .It AUDITPIPE_SET_PRESELECT_NAFLAGS Set the current default preselection flags for non-attributable events on the pipe. @@ -128,7 +128,7 @@ field in .Xr audit_control 5 . The ioctl argument should be of type -.Vt u_int. +.Vt u_int . .It AUDITPIPE_GET_PRESELECT_AUID Query the current preselection masks for a specific auid on the pipe. The ioctl argument should be of type @@ -200,4 +200,4 @@ .Sh BUGS See the .Xr audit 4 -man page for information on audit-related bugs and limitations. +manual page for information on audit-related bugs and limitations. From owner-trustedbsd-cvs@FreeBSD.ORG Sat May 6 18:39:49 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36F0016A402 for ; Sat, 6 May 2006 18:39:49 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE05643D46 for ; Sat, 6 May 2006 18:39:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7A56B46CC5 for ; Sat, 6 May 2006 14:39:47 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B3597568F5; Sat, 6 May 2006 18:39:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AEFB316A404; Sat, 6 May 2006 18:39:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 716F216A401 for ; Sat, 6 May 2006 18:39:46 +0000 (UTC) (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 3D5B443D46 for ; Sat, 6 May 2006 18:39:46 +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 k46IdkH6074791 for ; Sat, 6 May 2006 18:39:46 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k46Idjhq074785 for perforce@freebsd.org; Sat, 6 May 2006 18:39:45 GMT (envelope-from csjp@freebsd.org) Date: Sat, 6 May 2006 18:39:45 GMT Message-Id: <200605061839.k46Idjhq074785@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 96744 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 May 2006 18:39:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=96744 Change 96744 by csjp@csjp_xor on 2006/05/06 18:39:24 Since pam_strerror(3) is capable of returning NULL, check the return value and if it's NULL set a generic error message, instead of passing it along in the audit record. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#16 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#16 (text+ko) ==== @@ -170,6 +170,9 @@ const char *p, *user, *shell, *mytty, **nargv; struct sigaction sa, sa_int, sa_quit, sa_pipe; int temp, fds[2]; +#ifdef USE_BSM_AUDIT + const char *aerr; +#endif shell = class = cleanenv = NULL; asme = asthem = fastlogin = statusp = 0; @@ -331,9 +334,11 @@ PAM_CHANGE_EXPIRED_AUTHTOK); if (retcode != PAM_SUCCESS) { #ifdef USE_BSM_AUDIT + aerr = pam_strerror(pamh, retcode); + if (aerr == NULL) + aerr = "Unknown PAM error"; if (audit_submit(AUE_su, getuid(), 1, EPERM, - "pam_chauthtok: %s", - pam_strerror(pamh, retcode))) + "pam_chauthtok: %s", aerr)) errx(1, "Permission denied"); #endif syslog(LOG_ERR, "pam_chauthtok: %s", From owner-trustedbsd-cvs@FreeBSD.ORG Sat May 13 03:33:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6CC0916A400 for ; Sat, 13 May 2006 03:33:07 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB08243D45 for ; Sat, 13 May 2006 03:33:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BD6F846C55 for ; Fri, 12 May 2006 23:33:05 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DA2DD56D07; Sat, 13 May 2006 03:31:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D27CF16A404; Sat, 13 May 2006 03:31:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 06D1F16A40F for ; Sat, 13 May 2006 03:31:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5DCD43D48 for ; Sat, 13 May 2006 03:31:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4D3Vjdl033327 for ; Sat, 13 May 2006 03:31:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4D3VjXL033324 for perforce@freebsd.org; Sat, 13 May 2006 03:31:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 13 May 2006 03:31:45 GMT Message-Id: <200605130331.k4D3VjXL033324@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 97056 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 May 2006 03:33:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=97056 Change 97056 by rwatson@rwatson_sesame on 2006/05/13 03:30:56 White space. Or maybe whitespace. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#21 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#21 (text+ko) ==== @@ -119,7 +119,6 @@ u_int64_t ap_drops; /* Records dropped. */ u_int64_t ap_truncates; /* Records too long. */ - /* * Fields relating to pipe interest: global masks for unmatched * processes (attributable, non-attributable), and a list of specific From owner-trustedbsd-cvs@FreeBSD.ORG Sat May 13 04:34:26 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01C2116A401 for ; Sat, 13 May 2006 04:34:26 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7305243D46 for ; Sat, 13 May 2006 04:34:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5E4BF46C78 for ; Sat, 13 May 2006 00:34:24 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A884E73960; Sat, 13 May 2006 04:28:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CB9316A41B; Sat, 13 May 2006 04:28:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29F4116A419 for ; Sat, 13 May 2006 04:28:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E521E43D45 for ; Sat, 13 May 2006 04:28:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4D4SsLC044269 for ; Sat, 13 May 2006 04:28:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4D4SsOY044266 for perforce@freebsd.org; Sat, 13 May 2006 04:28:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 13 May 2006 04:28:54 GMT Message-Id: <200605130428.k4D4SsOY044266@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 97068 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 May 2006 04:34:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=97068 Change 97068 by rwatson@rwatson_fledge on 2006/05/13 04:27:53 Remove use of Giant around vn_open() in audit code. Submitted by: jhb Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#14 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#14 (text+ko) ==== @@ -525,7 +525,7 @@ struct ucred *cred; struct vnode *vp; int error = 0; - int flags; + int flags, vfslocked; error = suser(td); if (error) @@ -544,25 +544,21 @@ 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); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE, UIO_USERSPACE, + uap->path, td); flags = AUDIT_OPEN_FLAGS; error = vn_open(&nd, &flags, 0, -1); - if (error) { - mtx_unlock(&Giant); - goto err_out; - } + if (error) + return (error); + vfslocked = NDHASGIANT(&nd); VOP_UNLOCK(nd.ni_vp, 0, td); vp = nd.ni_vp; if (vp->v_type != VREG) { vn_close(vp, AUDIT_CLOSE_FLAGS, td->td_ucred, td); - mtx_unlock(&Giant); - error = EINVAL; - goto err_out; + VFS_UNLOCK_GIANT(vfslocked); + return (EINVAL); } + VFS_UNLOCK_GIANT(vfslocked); cred = td->td_ucred; crhold(cred); @@ -572,10 +568,8 @@ */ audit_suspended = 0; - mtx_unlock(&Giant); audit_rotate_vnode(cred, vp); -err_out: return (error); } From owner-trustedbsd-cvs@FreeBSD.ORG Mon May 15 17:57:01 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D7C816AC87 for ; Mon, 15 May 2006 17:57:01 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AA6E43D48 for ; Mon, 15 May 2006 17:57:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id AD30D46B0F for ; Mon, 15 May 2006 13:56:58 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E0BF062E9C; Mon, 15 May 2006 17:53:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D92F716B112; Mon, 15 May 2006 17:53:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98B2A16B0F9 for ; Mon, 15 May 2006 17:53:40 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C54E43D64 for ; Mon, 15 May 2006 17:53:34 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4FHrMbf015888 for ; Mon, 15 May 2006 17:53:22 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4FHrMtY015877 for perforce@freebsd.org; Mon, 15 May 2006 17:53:22 GMT (envelope-from deker@FreeBSD.org) Date: Mon, 15 May 2006 17:53:22 GMT Message-Id: <200605151753.k4FHrMtY015877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 97201 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 May 2006 17:57:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=97201 Change 97201 by deker@sebsd_build on 2006/05/15 17:53:06 Initial check-in of SELinux Reference Policy port. Note: This will not yet boot SEBSD in enforcing mode, and should be considered as a "first step" in the porting process. It should also be noted that the new reference policy build tools rely on some applications not installed by default on FreeBSD. Most notably python, gmake, and gawk need to be installed. The major changes so far are: - Addition of an SEBSD "distro" to segregate SEBSD specific configuration - Makefile changes to work around SEBSD-specific changes, slightly modify usage of some parsing tools to be more portable, etc. - Several changes to various file context settings to support proper labeling - Addition of labeling of some devices properly since FreeBSD uses devfs - Addition of base policies for devd and usbd Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/COPYING#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/Changelog#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/INSTALL#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/README#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/Rules.modular#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/Rules.monolithic#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/VERSION#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/build.conf#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mcs/dbus_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mcs/default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mcs/default_type#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mcs/failsafe_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mcs/initrc_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mcs/media#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mcs/removable_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mcs/root_default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mcs/seusers#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mcs/userhelper_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mls/dbus_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mls/default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mls/default_type#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mls/failsafe_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mls/initrc_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mls/media#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mls/removable_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mls/root_default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mls/seusers#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict-mls/userhelper_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict/dbus_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict/default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict/default_type#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict/failsafe_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict/initrc_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict/media#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict/removable_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict/root_default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict/seusers#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-strict/userhelper_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mcs/dbus_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mcs/default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mcs/default_type#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mcs/failsafe_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mcs/initrc_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mcs/media#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mcs/removable_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mcs/root_default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mcs/seusers#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mcs/userhelper_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mls/dbus_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mls/default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mls/default_type#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mls/failsafe_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mls/initrc_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mls/media#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mls/removable_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mls/root_default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mls/seusers#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted-mls/userhelper_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted/dbus_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted/default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted/default_type#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted/failsafe_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted/initrc_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted/media#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted/removable_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted/root_default_contexts#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted/seusers#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/appconfig-targeted/userhelper_context#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/config/local.users#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/Makefile.example#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/example.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/example.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/example.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/global_booleans.xml#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/global_tunables.xml#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/policy.dtd#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/policy.xml#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/templates/global_bool_list.html#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/templates/global_tun_list.html#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/templates/header.html#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/templates/int_list.html#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/templates/interface.html#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/templates/menu.html#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/templates/module.html#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/templates/module_list.html#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/templates/style.css#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/templates/temp_list.html#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/doc/templates/template.html#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/man/man8/ftpd_selinux.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/man/man8/httpd_selinux.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/man/man8/kerberos_selinux.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/man/man8/named_selinux.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/man/man8/nfs_selinux.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/man/man8/nis_selinux.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/man/man8/rsync_selinux.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/man/man8/samba_selinux.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/man/man8/ypbind_selinux.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/booleans.conf#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/constraints#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/access_vectors#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/access_vectors.sebsd#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/initial_sids#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/initial_sids.sebsd#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/mkaccess_vector.sh#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/mkflask.sh#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/security_classes#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/security_classes.sebsd#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/global_booleans#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/global_tunables#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/mcs#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/mls#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules.conf#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/acct.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/acct.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/acct.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/alsa.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/alsa.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/alsa.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/amanda.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/amanda.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/amanda.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/anaconda.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/anaconda.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/anaconda.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/bootloader.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/bootloader.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/bootloader.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/certwatch.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/certwatch.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/certwatch.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/consoletype.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/consoletype.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/consoletype.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/ddcprobe.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/ddcprobe.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/ddcprobe.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/dmesg.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/dmesg.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/dmesg.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/dmidecode.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/dmidecode.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/dmidecode.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/firstboot.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/firstboot.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/firstboot.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/kudzu.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/kudzu.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/kudzu.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/logrotate.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/logrotate.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/logrotate.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/logwatch.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/logwatch.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/logwatch.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/metadata.xml#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/mrtg.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/mrtg.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/mrtg.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/netutils.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/netutils.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/netutils.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/portage.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/portage.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/portage.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/prelink.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/prelink.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/prelink.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/quota.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/quota.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/quota.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/readahead.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/readahead.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/readahead.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/rpm.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/rpm.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/rpm.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/su.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/su.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/su.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/sudo.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/sudo.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/sudo.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/tmpreaper.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/tmpreaper.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/tmpreaper.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/updfstab.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/updfstab.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/updfstab.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/usbmodules.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/usbmodules.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/usbmodules.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/usermanage.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/usermanage.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/usermanage.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/vbetool.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/vbetool.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/vbetool.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/vpn.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/vpn.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/admin/vpn.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/cdrecord.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/cdrecord.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/cdrecord.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/gpg.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/gpg.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/gpg.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/irc.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/irc.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/irc.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/java.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/java.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/java.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/loadkeys.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/loadkeys.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/loadkeys.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/lockdev.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/lockdev.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/lockdev.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/metadata.xml#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/mono.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/mono.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/mono.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/screen.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/screen.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/screen.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/slocate.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/slocate.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/slocate.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/tvtime.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/tvtime.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/tvtime.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/uml.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/uml.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/uml.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/userhelper.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/userhelper.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/userhelper.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/usernetctl.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/usernetctl.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/usernetctl.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/webalizer.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/webalizer.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/webalizer.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/wine.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/wine.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/apps/wine.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/corecommands.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/corecommands.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/corecommands.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/corenetwork.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/corenetwork.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/corenetwork.if.in#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/corenetwork.if.m4#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/corenetwork.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/corenetwork.te.in#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/corenetwork.te.m4#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/devices.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/devices.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/devices.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/domain.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/domain.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/domain.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/files.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/files.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/files.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/filesystem.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/filesystem.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/filesystem.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/kernel.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/kernel.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/kernel.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/mcs.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/mcs.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/mcs.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/metadata.xml#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/mls.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/mls.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/mls.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/selinux.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/selinux.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/selinux.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/storage.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/storage.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/storage.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/terminal.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/terminal.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/kernel/terminal.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/apache.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/apache.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/apache.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/apm.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/apm.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/apm.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/arpwatch.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/arpwatch.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/arpwatch.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/automount.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/automount.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/automount.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/avahi.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/avahi.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/avahi.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/bind.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/bind.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/bind.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/bluetooth.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/bluetooth.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/bluetooth.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/canna.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/canna.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/canna.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/comsat.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/comsat.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/comsat.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cpucontrol.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cpucontrol.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cpucontrol.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cron.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cron.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cron.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cups.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cups.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cups.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cvs.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cvs.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cvs.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cyrus.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cyrus.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/cyrus.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dbskk.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dbskk.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dbskk.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dbus.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dbus.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dbus.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/devd.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/devd.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/devd.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dhcp.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dhcp.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dhcp.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dictd.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dictd.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dictd.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/distcc.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/distcc.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/distcc.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/djbdns.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/djbdns.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/djbdns.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dovecot.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dovecot.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/dovecot.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/fetchmail.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/fetchmail.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/fetchmail.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/finger.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/finger.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/finger.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ftp.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ftp.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ftp.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/gpm.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/gpm.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/gpm.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/hal.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/hal.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/hal.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/howl.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/howl.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/howl.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/i18n_input.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/i18n_input.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/i18n_input.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/inetd.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/inetd.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/inetd.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/inn.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/inn.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/inn.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/irqbalance.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/irqbalance.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/irqbalance.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/kerberos.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/kerberos.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/kerberos.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ktalk.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ktalk.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ktalk.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ldap.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ldap.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ldap.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/lpd.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/lpd.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/lpd.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/mailman.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/mailman.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/mailman.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/metadata.xml#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/mta.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/mta.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/mta.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/mysql.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/mysql.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/mysql.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/networkmanager.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/networkmanager.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/networkmanager.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/nis.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/nis.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/nis.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/nscd.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/nscd.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/nscd.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ntp.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ntp.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ntp.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/openct.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/openct.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/openct.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/pegasus.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/pegasus.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/pegasus.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/portmap.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/portmap.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/portmap.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/postfix.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/postfix.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/postfix.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/postgresql.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/postgresql.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/postgresql.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ppp.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ppp.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ppp.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/privoxy.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/privoxy.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/privoxy.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/procmail.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/procmail.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/procmail.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/publicfile.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/publicfile.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/publicfile.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/radius.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/radius.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/radius.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/radvd.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/radvd.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/radvd.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rdisc.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rdisc.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rdisc.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/remotelogin.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/remotelogin.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/remotelogin.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rlogin.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rlogin.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rlogin.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/roundup.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/roundup.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/roundup.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rpc.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rpc.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rpc.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rshd.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rshd.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rshd.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rsync.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rsync.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/rsync.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/samba.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/samba.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/samba.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/sasl.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/sasl.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/sasl.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/sendmail.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/sendmail.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/sendmail.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/slrnpull.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/slrnpull.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/slrnpull.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/smartmon.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/smartmon.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/smartmon.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/snmp.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/snmp.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/snmp.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/spamassassin.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/spamassassin.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/spamassassin.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/squid.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/squid.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/squid.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ssh.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ssh.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ssh.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/stunnel.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/stunnel.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/stunnel.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/sysstat.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/sysstat.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/sysstat.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/tcpd.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/tcpd.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/tcpd.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/telnet.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/telnet.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/telnet.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/tftp.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/tftp.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/tftp.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/timidity.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/timidity.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/timidity.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ucspitcp.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ucspitcp.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/ucspitcp.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/usbd.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/usbd.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/usbd.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/uucp.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/uucp.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/uucp.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/xfs.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/xfs.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/xfs.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/xserver.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/xserver.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/xserver.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/zebra.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/zebra.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/services/zebra.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/authlogin.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/authlogin.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/authlogin.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/clock.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/clock.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/clock.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/daemontools.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/daemontools.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/daemontools.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/fstools.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/fstools.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/fstools.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/getty.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/getty.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/getty.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/hostname.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/hostname.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/hostname.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/hotplug.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/hotplug.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/hotplug.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/init.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/init.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/init.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/ipsec.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/ipsec.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/ipsec.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/iptables.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/iptables.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/iptables.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/libraries.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/libraries.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/libraries.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/locallogin.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/locallogin.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/locallogin.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/logging.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/logging.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/logging.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/lvm.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/lvm.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/lvm.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/metadata.xml#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/miscfiles.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/miscfiles.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/miscfiles.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/modutils.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/modutils.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/modutils.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/mount.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/mount.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/mount.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/pcmcia.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/pcmcia.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/pcmcia.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/raid.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/raid.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/raid.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/selinuxutil.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/selinuxutil.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/selinuxutil.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/sysnetwork.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/sysnetwork.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/sysnetwork.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/udev.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/udev.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/udev.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/unconfined.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/unconfined.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/unconfined.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/userdomain.fc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/userdomain.if#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/modules/system/userdomain.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/rolemap#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/support/loadable_module.spt#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/support/misc_macros.spt#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/support/obj_perm_sets.spt#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/users#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/support/Makefile.devel#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/support/fc_sort.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/support/genclassperms.py#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/support/pyplate.py#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/support/pyplate.pyc#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/support/sedoctool.py#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/support/segenxml.py#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/support/selinux-policy-refpolicy.spec#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/support/selinux-refpolicy-sources.spec.skel#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/support/set_bools_tuns.awk#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 18:13:32 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B36516B04F for ; Tue, 16 May 2006 18:13:32 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 456EC43D64 for ; Tue, 16 May 2006 18:13:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C331346C2A for ; Tue, 16 May 2006 14:13:13 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5EE66559C3; Tue, 16 May 2006 18:08:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5214516AF68; Tue, 16 May 2006 18:08:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86D0316AF5C for ; Tue, 16 May 2006 18:08:05 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFB4443D6A for ; Tue, 16 May 2006 18:07:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GI7fkx071048 for ; Tue, 16 May 2006 18:07:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GI7eHL071045 for perforce@freebsd.org; Tue, 16 May 2006 18:07:40 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 18:07:40 GMT Message-Id: <200605161807.k4GI7eHL071045@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97271 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 18:13:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=97271 Change 97271 by millert@millert_p4 on 2006/05/16 18:07:21 Update flask components based on the version of selinux in the linux 2.6.16 kernel. Flask headers have been generated based on the refernce policy. Since FreeBSD doesn't have rcu style locking, we use rwlocks (one per avc "slot") instead. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/subr_witness.c#18 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_inherit.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_perm_to_string.h#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_permissions.h#9 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc-selinux.c#3 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.h#9 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc_ss.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/class_to_string.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/common_perm_to_string.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/initial_sid_to_string.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask_types.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/linux-compat.h#4 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#42 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_labels.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#9 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscalls.h#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_sysctl.c#11 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/avtab.c#9 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/avtab.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/conditional.c#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/conditional.h#3 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/constraint.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/context.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/ebitmap.c#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/ebitmap.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.h#3 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/global.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/hashtab.c#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/hashtab.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/init.c#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/mls.c#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/mls.h#4 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/mls_types.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/policydb.c#7 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/policydb.h#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/queue.c#4 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/queue.h#3 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/security.h#10 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/services.c#13 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/services.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.h#6 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/symtab.c#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/symtab.h#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/subr_witness.c#18 (text+ko) ==== @@ -291,7 +291,7 @@ { "uidinfo struct", &lock_class_mtx_sleep }, { "allprison", &lock_class_mtx_sleep }, - { "SEBSD AVC", &lock_class_mtx_sleep }, + { "SEBSD AVC", &lock_class_rw }, { "SEBSD message lock", &lock_class_mtx_sleep }, { "SEBSD policy lock", &lock_class_rw }, ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_inherit.h#5 (text+ko) ==== @@ -1,37 +1,31 @@ /* This file is automatically generated. Do not edit. */ -/* FLASK */ - -typedef struct -{ - security_class_t tclass; - char **common_pts; - access_vector_t common_base; -} av_inherit_t; - -static av_inherit_t av_inherit[] = { - { SECCLASS_DIR, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_LNK_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_CHR_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_BLK_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_SOCK_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_FIFO_FILE, common_file_perm_to_string, 0x0000000000100000UL }, - { SECCLASS_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_TCP_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_UDP_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_RAWIP_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_NETLINK_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_PACKET_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_KEY_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_UNIX_STREAM_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_UNIX_DGRAM_SOCKET, common_socket_perm_to_string, 0x0000000001000000UL }, - { SECCLASS_IPC, common_ipc_perm_to_string, 0x0000000000000200UL }, - { SECCLASS_SEM, common_ipc_perm_to_string, 0x0000000000000200UL }, - { SECCLASS_MSGQ, common_ipc_perm_to_string, 0x0000000000000200UL }, - { SECCLASS_SHM, common_ipc_perm_to_string, 0x0000000000000200UL }, -}; - -#define AV_INHERIT_SIZE (sizeof(av_inherit)/sizeof(av_inherit_t)) - - -/* FLASK */ + S_(SECCLASS_DIR, file, 0x00100000UL) + S_(SECCLASS_FILE, file, 0x00100000UL) + S_(SECCLASS_LNK_FILE, file, 0x00100000UL) + S_(SECCLASS_CHR_FILE, file, 0x00100000UL) + S_(SECCLASS_BLK_FILE, file, 0x00100000UL) + S_(SECCLASS_SOCK_FILE, file, 0x00100000UL) + S_(SECCLASS_FIFO_FILE, file, 0x00100000UL) + S_(SECCLASS_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_TCP_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_UDP_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_RAWIP_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_PACKET_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_KEY_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_UNIX_STREAM_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_UNIX_DGRAM_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_IPC, ipc, 0x00000200UL) + S_(SECCLASS_SEM, ipc, 0x00000200UL) + S_(SECCLASS_MSGQ, ipc, 0x00000200UL) + S_(SECCLASS_SHM, ipc, 0x00000200UL) + S_(SECCLASS_NETLINK_ROUTE_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_FIREWALL_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_TCPDIAG_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_NFLOG_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_XFRM_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_SELINUX_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_AUDIT_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_IP6FW_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_DNRT_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_KOBJECT_UEVENT_SOCKET, socket, 0x00400000UL) ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_perm_to_string.h#8 (text+ko) ==== @@ -1,142 +1,248 @@ /* This file is automatically generated. Do not edit. */ -/* FLASK */ - -typedef struct -{ - security_class_t tclass; - access_vector_t value; - char *name; -} av_perm_to_string_t; - -static av_perm_to_string_t av_perm_to_string[] = { - { SECCLASS_FILESYSTEM, FILESYSTEM__MOUNT, "mount" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__REMOUNT, "remount" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__UNMOUNT, "unmount" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__GETATTR, "getattr" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__RELABELFROM, "relabelfrom" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__RELABELTO, "relabelto" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__TRANSITION, "transition" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, "associate" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__QUOTAMOD, "quotamod" }, - { SECCLASS_FILESYSTEM, FILESYSTEM__QUOTAGET, "quotaget" }, - { SECCLASS_DIR, DIR__ADD_NAME, "add_name" }, - { SECCLASS_DIR, DIR__REMOVE_NAME, "remove_name" }, - { SECCLASS_DIR, DIR__REPARENT, "reparent" }, - { SECCLASS_DIR, DIR__SEARCH, "search" }, - { SECCLASS_DIR, DIR__RMDIR, "rmdir" }, - { SECCLASS_FILE, FILE__EXECUTE_NO_TRANS, "execute_no_trans" }, - { SECCLASS_FILE, FILE__ENTRYPOINT, "entrypoint" }, - { SECCLASS_FD, FD__CREATE, "create" }, - { SECCLASS_FD, FD__USE, "use" }, - { SECCLASS_TCP_SOCKET, TCP_SOCKET__CONNECTTO, "connectto" }, - { SECCLASS_TCP_SOCKET, TCP_SOCKET__NEWCONN, "newconn" }, - { SECCLASS_TCP_SOCKET, TCP_SOCKET__ACCEPTFROM, "acceptfrom" }, - { SECCLASS_TCP_SOCKET, TCP_SOCKET__NODE_BIND, "node_bind" }, - { SECCLASS_UDP_SOCKET, UDP_SOCKET__NODE_BIND, "node_bind" }, - { SECCLASS_RAWIP_SOCKET, RAWIP_SOCKET__NODE_BIND, "node_bind" }, - { SECCLASS_NODE, NODE__TCP_RECV, "tcp_recv" }, - { SECCLASS_NODE, NODE__TCP_SEND, "tcp_send" }, - { SECCLASS_NODE, NODE__UDP_RECV, "udp_recv" }, - { SECCLASS_NODE, NODE__UDP_SEND, "udp_send" }, - { SECCLASS_NODE, NODE__RAWIP_RECV, "rawip_recv" }, - { SECCLASS_NODE, NODE__RAWIP_SEND, "rawip_send" }, - { SECCLASS_NODE, NODE__ENFORCE_DEST, "enforce_dest" }, - { SECCLASS_NETIF, NETIF__GETATTR, "getattr" }, - { SECCLASS_NETIF, NETIF__SETATTR, "setattr" }, - { SECCLASS_NETIF, NETIF__TCP_RECV, "tcp_recv" }, - { SECCLASS_NETIF, NETIF__TCP_SEND, "tcp_send" }, - { SECCLASS_NETIF, NETIF__UDP_RECV, "udp_recv" }, - { SECCLASS_NETIF, NETIF__UDP_SEND, "udp_send" }, - { SECCLASS_NETIF, NETIF__RAWIP_RECV, "rawip_recv" }, - { SECCLASS_NETIF, NETIF__RAWIP_SEND, "rawip_send" }, - { SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__CONNECTTO, "connectto" }, - { SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__NEWCONN, "newconn" }, - { SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__ACCEPTFROM, "acceptfrom" }, - { SECCLASS_PROCESS, PROCESS__FORK, "fork" }, - { SECCLASS_PROCESS, PROCESS__TRANSITION, "transition" }, - { SECCLASS_PROCESS, PROCESS__SIGCHLD, "sigchld" }, - { SECCLASS_PROCESS, PROCESS__SIGKILL, "sigkill" }, - { SECCLASS_PROCESS, PROCESS__SIGSTOP, "sigstop" }, - { SECCLASS_PROCESS, PROCESS__SIGNULL, "signull" }, - { SECCLASS_PROCESS, PROCESS__SIGNAL, "signal" }, - { SECCLASS_PROCESS, PROCESS__PTRACE, "ptrace" }, - { SECCLASS_PROCESS, PROCESS__GETSCHED, "getsched" }, - { SECCLASS_PROCESS, PROCESS__SETSCHED, "setsched" }, - { SECCLASS_PROCESS, PROCESS__GETSESSION, "getsession" }, - { SECCLASS_PROCESS, PROCESS__GETPGID, "getpgid" }, - { SECCLASS_PROCESS, PROCESS__SETPGID, "setpgid" }, - { SECCLASS_PROCESS, PROCESS__GETCAP, "getcap" }, - { SECCLASS_PROCESS, PROCESS__SETCAP, "setcap" }, - { SECCLASS_PROCESS, PROCESS__SHARE, "share" }, - { SECCLASS_PROCESS, PROCESS__GETATTR, "getattr" }, - { SECCLASS_PROCESS, PROCESS__SETEXEC, "setexec" }, - { SECCLASS_PROCESS, PROCESS__SETFSCREATE, "setfscreate" }, - { SECCLASS_PROCESS, PROCESS__NOATSECURE, "noatsecure" }, - { SECCLASS_PROCESS, PROCESS__SIGINH, "siginh" }, - { SECCLASS_PROCESS, PROCESS__SETRLIMIT, "setrlimit" }, - { SECCLASS_PROCESS, PROCESS__RLIMITINH, "rlimitinh" }, - { SECCLASS_MSGQ, MSGQ__ENQUEUE, "enqueue" }, - { SECCLASS_MSG, MSG__SEND, "send" }, - { SECCLASS_MSG, MSG__RECEIVE, "receive" }, - { SECCLASS_MSG, MSG__DESTROY, "destroy" }, - { SECCLASS_SHM, SHM__LOCK, "lock" }, - { SECCLASS_POSIX_SEM, POSIX_SEM__ASSOCIATE, "associate" }, - { SECCLASS_POSIX_SEM, POSIX_SEM__DISASSOCIATE, "disassociate" }, - { SECCLASS_POSIX_SEM, POSIX_SEM__DESTROY, "destroy" }, - { SECCLASS_POSIX_SEM, POSIX_SEM__WRITE, "write" }, - { SECCLASS_POSIX_SEM, POSIX_SEM__READ, "read" }, - { SECCLASS_SECURITY, SECURITY__COMPUTE_AV, "compute_av" }, - { SECCLASS_SECURITY, SECURITY__COMPUTE_CREATE, "compute_create" }, - { SECCLASS_SECURITY, SECURITY__COMPUTE_MEMBER, "compute_member" }, - { SECCLASS_SECURITY, SECURITY__CHECK_CONTEXT, "check_context" }, - { SECCLASS_SECURITY, SECURITY__LOAD_POLICY, "load_policy" }, - { SECCLASS_SECURITY, SECURITY__COMPUTE_RELABEL, "compute_relabel" }, - { SECCLASS_SECURITY, SECURITY__COMPUTE_USER, "compute_user" }, - { SECCLASS_SECURITY, SECURITY__SETENFORCE, "setenforce" }, - { SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool" }, - { SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info" }, - { SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read" }, - { SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod" }, - { SECCLASS_SYSTEM, SYSTEM__SYSLOG_CONSOLE, "syslog_console" }, - { SECCLASS_CAPABILITY, CAPABILITY__CHOWN, "chown" }, - { SECCLASS_CAPABILITY, CAPABILITY__DAC_EXECUTE, "dac_execute" }, - { SECCLASS_CAPABILITY, CAPABILITY__DAC_WRITE, "dac_write" }, - { SECCLASS_CAPABILITY, CAPABILITY__DAC_READ_SEARCH, "dac_read_search" }, - { SECCLASS_CAPABILITY, CAPABILITY__FOWNER, "fowner" }, - { SECCLASS_CAPABILITY, CAPABILITY__FSETID, "fsetid" }, - { SECCLASS_CAPABILITY, CAPABILITY__KILL, "kill" }, - { SECCLASS_CAPABILITY, CAPABILITY__SETFCAP, "setfcap" }, - { SECCLASS_CAPABILITY, CAPABILITY__SETGID, "setgid" }, - { SECCLASS_CAPABILITY, CAPABILITY__SETUID, "setuid" }, - { SECCLASS_CAPABILITY, CAPABILITY__AUDIT_CONTROL, "audit_control" }, - { SECCLASS_CAPABILITY, CAPABILITY__AUDIT_WRITE, "audit_write" }, - { SECCLASS_CAPABILITY, CAPABILITY__LINUX_IMMUTABLE, "linux_immutable" }, - { SECCLASS_CAPABILITY, CAPABILITY__NET_BIND_SERVICE, "net_bind_service" }, - { SECCLASS_CAPABILITY, CAPABILITY__NET_BROADCAST, "net_broadcast" }, - { SECCLASS_CAPABILITY, CAPABILITY__NET_ADMIN, "net_admin" }, - { SECCLASS_CAPABILITY, CAPABILITY__NET_RAW, "net_raw" }, - { SECCLASS_CAPABILITY, CAPABILITY__IPC_LOCK, "ipc_lock" }, - { SECCLASS_CAPABILITY, CAPABILITY__IPC_OWNER, "ipc_owner" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_MODULE, "sys_module" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_RAWIO, "sys_rawio" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_CHROOT, "sys_chroot" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_PTRACE, "sys_ptrace" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_PACCT, "sys_pacct" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_ADMIN, "sys_admin" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_BOOT, "sys_boot" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_NICE, "sys_nice" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_RESOURCE, "sys_resource" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_TIME, "sys_time" }, - { SECCLASS_CAPABILITY, CAPABILITY__SYS_TTY_CONFIG, "sys_tty_config" }, - { SECCLASS_CAPABILITY, CAPABILITY__MKNOD, "mknod" }, - { SECCLASS_PASSWD, PASSWD__PASSWD, "passwd" }, - { SECCLASS_PASSWD, PASSWD__CHFN, "chfn" }, - { SECCLASS_PASSWD, PASSWD__CHSH, "chsh" }, - { SECCLASS_PASSWD, PASSWD__ROOTOK, "rootok" }, - { SECCLASS_PASSWD, PASSWD__CRONTAB, "crontab" }, -}; - -#define AV_PERM_TO_STRING_SIZE (sizeof(av_perm_to_string)/sizeof(av_perm_to_string_t)) - - -/* FLASK */ + S_(SECCLASS_FILESYSTEM, FILESYSTEM__MOUNT, "mount") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__REMOUNT, "remount") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__UNMOUNT, "unmount") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__GETATTR, "getattr") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__RELABELFROM, "relabelfrom") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__RELABELTO, "relabelto") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__TRANSITION, "transition") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, "associate") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__QUOTAMOD, "quotamod") + S_(SECCLASS_FILESYSTEM, FILESYSTEM__QUOTAGET, "quotaget") + S_(SECCLASS_DIR, DIR__ADD_NAME, "add_name") + S_(SECCLASS_DIR, DIR__REMOVE_NAME, "remove_name") + S_(SECCLASS_DIR, DIR__REPARENT, "reparent") + S_(SECCLASS_DIR, DIR__SEARCH, "search") + S_(SECCLASS_DIR, DIR__RMDIR, "rmdir") + S_(SECCLASS_FILE, FILE__EXECUTE_NO_TRANS, "execute_no_trans") + S_(SECCLASS_FILE, FILE__ENTRYPOINT, "entrypoint") + S_(SECCLASS_FILE, FILE__EXECMOD, "execmod") + S_(SECCLASS_CHR_FILE, CHR_FILE__EXECUTE_NO_TRANS, "execute_no_trans") + S_(SECCLASS_CHR_FILE, CHR_FILE__ENTRYPOINT, "entrypoint") + S_(SECCLASS_CHR_FILE, CHR_FILE__EXECMOD, "execmod") + S_(SECCLASS_FD, FD__CREATE, "create") + S_(SECCLASS_FD, FD__USE, "use") + S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__CONNECTTO, "connectto") + S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NEWCONN, "newconn") + S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__ACCEPTFROM, "acceptfrom") + S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NODE_BIND, "node_bind") + S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NAME_CONNECT, "name_connect") + S_(SECCLASS_UDP_SOCKET, UDP_SOCKET__NODE_BIND, "node_bind") + S_(SECCLASS_RAWIP_SOCKET, RAWIP_SOCKET__NODE_BIND, "node_bind") + S_(SECCLASS_NODE, NODE__TCP_RECV, "tcp_recv") + S_(SECCLASS_NODE, NODE__TCP_SEND, "tcp_send") + S_(SECCLASS_NODE, NODE__UDP_RECV, "udp_recv") + S_(SECCLASS_NODE, NODE__UDP_SEND, "udp_send") + S_(SECCLASS_NODE, NODE__RAWIP_RECV, "rawip_recv") + S_(SECCLASS_NODE, NODE__RAWIP_SEND, "rawip_send") + S_(SECCLASS_NODE, NODE__ENFORCE_DEST, "enforce_dest") + S_(SECCLASS_NETIF, NETIF__TCP_RECV, "tcp_recv") + S_(SECCLASS_NETIF, NETIF__TCP_SEND, "tcp_send") + S_(SECCLASS_NETIF, NETIF__UDP_RECV, "udp_recv") + S_(SECCLASS_NETIF, NETIF__UDP_SEND, "udp_send") + S_(SECCLASS_NETIF, NETIF__RAWIP_RECV, "rawip_recv") + S_(SECCLASS_NETIF, NETIF__RAWIP_SEND, "rawip_send") + S_(SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__CONNECTTO, "connectto") + S_(SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__NEWCONN, "newconn") + S_(SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__ACCEPTFROM, "acceptfrom") + S_(SECCLASS_PROCESS, PROCESS__FORK, "fork") + S_(SECCLASS_PROCESS, PROCESS__TRANSITION, "transition") + S_(SECCLASS_PROCESS, PROCESS__SIGCHLD, "sigchld") + S_(SECCLASS_PROCESS, PROCESS__SIGKILL, "sigkill") + S_(SECCLASS_PROCESS, PROCESS__SIGSTOP, "sigstop") + S_(SECCLASS_PROCESS, PROCESS__SIGNULL, "signull") + S_(SECCLASS_PROCESS, PROCESS__SIGNAL, "signal") + S_(SECCLASS_PROCESS, PROCESS__PTRACE, "ptrace") + S_(SECCLASS_PROCESS, PROCESS__GETSCHED, "getsched") + S_(SECCLASS_PROCESS, PROCESS__SETSCHED, "setsched") + S_(SECCLASS_PROCESS, PROCESS__GETSESSION, "getsession") + S_(SECCLASS_PROCESS, PROCESS__GETPGID, "getpgid") + S_(SECCLASS_PROCESS, PROCESS__SETPGID, "setpgid") + S_(SECCLASS_PROCESS, PROCESS__GETCAP, "getcap") + S_(SECCLASS_PROCESS, PROCESS__SETCAP, "setcap") + S_(SECCLASS_PROCESS, PROCESS__SHARE, "share") + S_(SECCLASS_PROCESS, PROCESS__GETATTR, "getattr") + S_(SECCLASS_PROCESS, PROCESS__SETEXEC, "setexec") + S_(SECCLASS_PROCESS, PROCESS__SETFSCREATE, "setfscreate") + S_(SECCLASS_PROCESS, PROCESS__NOATSECURE, "noatsecure") + S_(SECCLASS_PROCESS, PROCESS__SIGINH, "siginh") + S_(SECCLASS_PROCESS, PROCESS__SETRLIMIT, "setrlimit") + S_(SECCLASS_PROCESS, PROCESS__RLIMITINH, "rlimitinh") + S_(SECCLASS_PROCESS, PROCESS__DYNTRANSITION, "dyntransition") + S_(SECCLASS_PROCESS, PROCESS__SETCURRENT, "setcurrent") + S_(SECCLASS_PROCESS, PROCESS__EXECMEM, "execmem") + S_(SECCLASS_PROCESS, PROCESS__EXECSTACK, "execstack") + S_(SECCLASS_PROCESS, PROCESS__EXECHEAP, "execheap") + S_(SECCLASS_MSGQ, MSGQ__ENQUEUE, "enqueue") + S_(SECCLASS_MSG, MSG__SEND, "send") + S_(SECCLASS_MSG, MSG__RECEIVE, "receive") + S_(SECCLASS_MSG, MSG__DESTROY, "destroy") + S_(SECCLASS_SHM, SHM__LOCK, "lock") + S_(SECCLASS_POSIX_SEM, POSIX_SEM__ASSOCIATE, "associate") + S_(SECCLASS_POSIX_SEM, POSIX_SEM__DISASSOCIATE, "disassociate") + S_(SECCLASS_POSIX_SEM, POSIX_SEM__DESTROY, "destroy") + S_(SECCLASS_POSIX_SEM, POSIX_SEM__WRITE, "write") + S_(SECCLASS_POSIX_SEM, POSIX_SEM__READ, "read") + S_(SECCLASS_SECURITY, SECURITY__COMPUTE_AV, "compute_av") + S_(SECCLASS_SECURITY, SECURITY__COMPUTE_CREATE, "compute_create") + S_(SECCLASS_SECURITY, SECURITY__COMPUTE_MEMBER, "compute_member") + S_(SECCLASS_SECURITY, SECURITY__CHECK_CONTEXT, "check_context") + S_(SECCLASS_SECURITY, SECURITY__LOAD_POLICY, "load_policy") + S_(SECCLASS_SECURITY, SECURITY__COMPUTE_RELABEL, "compute_relabel") + S_(SECCLASS_SECURITY, SECURITY__COMPUTE_USER, "compute_user") + S_(SECCLASS_SECURITY, SECURITY__SETENFORCE, "setenforce") + S_(SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool") + S_(SECCLASS_SECURITY, SECURITY__SETSECPARAM, "setsecparam") + S_(SECCLASS_SECURITY, SECURITY__SETCHECKREQPROT, "setcheckreqprot") + S_(SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info") + S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read") + S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod") + S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_CONSOLE, "syslog_console") + S_(SECCLASS_CAPABILITY, CAPABILITY__CHOWN, "chown") + S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_OVERRIDE, "dac_override") + S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_READ_SEARCH, "dac_read_search") + S_(SECCLASS_CAPABILITY, CAPABILITY__FOWNER, "fowner") + S_(SECCLASS_CAPABILITY, CAPABILITY__FSETID, "fsetid") + S_(SECCLASS_CAPABILITY, CAPABILITY__KILL, "kill") + S_(SECCLASS_CAPABILITY, CAPABILITY__SETGID, "setgid") + S_(SECCLASS_CAPABILITY, CAPABILITY__SETUID, "setuid") + S_(SECCLASS_CAPABILITY, CAPABILITY__SETPCAP, "setpcap") + S_(SECCLASS_CAPABILITY, CAPABILITY__LINUX_IMMUTABLE, "linux_immutable") + S_(SECCLASS_CAPABILITY, CAPABILITY__NET_BIND_SERVICE, "net_bind_service") + S_(SECCLASS_CAPABILITY, CAPABILITY__NET_BROADCAST, "net_broadcast") + S_(SECCLASS_CAPABILITY, CAPABILITY__NET_ADMIN, "net_admin") + S_(SECCLASS_CAPABILITY, CAPABILITY__NET_RAW, "net_raw") + S_(SECCLASS_CAPABILITY, CAPABILITY__IPC_LOCK, "ipc_lock") + S_(SECCLASS_CAPABILITY, CAPABILITY__IPC_OWNER, "ipc_owner") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_MODULE, "sys_module") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_RAWIO, "sys_rawio") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_CHROOT, "sys_chroot") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_PTRACE, "sys_ptrace") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_PACCT, "sys_pacct") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_ADMIN, "sys_admin") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_BOOT, "sys_boot") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_NICE, "sys_nice") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_RESOURCE, "sys_resource") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_TIME, "sys_time") + S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_TTY_CONFIG, "sys_tty_config") + S_(SECCLASS_CAPABILITY, CAPABILITY__MKNOD, "mknod") + S_(SECCLASS_CAPABILITY, CAPABILITY__LEASE, "lease") + S_(SECCLASS_CAPABILITY, CAPABILITY__AUDIT_WRITE, "audit_write") + S_(SECCLASS_CAPABILITY, CAPABILITY__AUDIT_CONTROL, "audit_control") + S_(SECCLASS_PASSWD, PASSWD__PASSWD, "passwd") + S_(SECCLASS_PASSWD, PASSWD__CHFN, "chfn") + S_(SECCLASS_PASSWD, PASSWD__CHSH, "chsh") + S_(SECCLASS_PASSWD, PASSWD__ROOTOK, "rootok") + S_(SECCLASS_PASSWD, PASSWD__CRONTAB, "crontab") + S_(SECCLASS_DRAWABLE, DRAWABLE__CREATE, "create") + S_(SECCLASS_DRAWABLE, DRAWABLE__DESTROY, "destroy") + S_(SECCLASS_DRAWABLE, DRAWABLE__DRAW, "draw") + S_(SECCLASS_DRAWABLE, DRAWABLE__COPY, "copy") + S_(SECCLASS_DRAWABLE, DRAWABLE__GETATTR, "getattr") + S_(SECCLASS_GC, GC__CREATE, "create") + S_(SECCLASS_GC, GC__FREE, "free") + S_(SECCLASS_GC, GC__GETATTR, "getattr") + S_(SECCLASS_GC, GC__SETATTR, "setattr") + S_(SECCLASS_WINDOW, WINDOW__ADDCHILD, "addchild") + S_(SECCLASS_WINDOW, WINDOW__CREATE, "create") + S_(SECCLASS_WINDOW, WINDOW__DESTROY, "destroy") + S_(SECCLASS_WINDOW, WINDOW__MAP, "map") + S_(SECCLASS_WINDOW, WINDOW__UNMAP, "unmap") + S_(SECCLASS_WINDOW, WINDOW__CHSTACK, "chstack") + S_(SECCLASS_WINDOW, WINDOW__CHPROPLIST, "chproplist") + S_(SECCLASS_WINDOW, WINDOW__CHPROP, "chprop") + S_(SECCLASS_WINDOW, WINDOW__LISTPROP, "listprop") + S_(SECCLASS_WINDOW, WINDOW__GETATTR, "getattr") + S_(SECCLASS_WINDOW, WINDOW__SETATTR, "setattr") + S_(SECCLASS_WINDOW, WINDOW__SETFOCUS, "setfocus") + S_(SECCLASS_WINDOW, WINDOW__MOVE, "move") + S_(SECCLASS_WINDOW, WINDOW__CHSELECTION, "chselection") + S_(SECCLASS_WINDOW, WINDOW__CHPARENT, "chparent") + S_(SECCLASS_WINDOW, WINDOW__CTRLLIFE, "ctrllife") + S_(SECCLASS_WINDOW, WINDOW__ENUMERATE, "enumerate") + S_(SECCLASS_WINDOW, WINDOW__TRANSPARENT, "transparent") + S_(SECCLASS_WINDOW, WINDOW__MOUSEMOTION, "mousemotion") + S_(SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT, "clientcomevent") + S_(SECCLASS_WINDOW, WINDOW__INPUTEVENT, "inputevent") + S_(SECCLASS_WINDOW, WINDOW__DRAWEVENT, "drawevent") + S_(SECCLASS_WINDOW, WINDOW__WINDOWCHANGEEVENT, "windowchangeevent") + S_(SECCLASS_WINDOW, WINDOW__WINDOWCHANGEREQUEST, "windowchangerequest") + S_(SECCLASS_WINDOW, WINDOW__SERVERCHANGEEVENT, "serverchangeevent") + S_(SECCLASS_WINDOW, WINDOW__EXTENSIONEVENT, "extensionevent") + S_(SECCLASS_FONT, FONT__LOAD, "load") + S_(SECCLASS_FONT, FONT__FREE, "free") + S_(SECCLASS_FONT, FONT__GETATTR, "getattr") + S_(SECCLASS_FONT, FONT__USE, "use") + S_(SECCLASS_COLORMAP, COLORMAP__CREATE, "create") + S_(SECCLASS_COLORMAP, COLORMAP__FREE, "free") + S_(SECCLASS_COLORMAP, COLORMAP__INSTALL, "install") + S_(SECCLASS_COLORMAP, COLORMAP__UNINSTALL, "uninstall") + S_(SECCLASS_COLORMAP, COLORMAP__LIST, "list") + S_(SECCLASS_COLORMAP, COLORMAP__READ, "read") + S_(SECCLASS_COLORMAP, COLORMAP__STORE, "store") + S_(SECCLASS_COLORMAP, COLORMAP__GETATTR, "getattr") + S_(SECCLASS_COLORMAP, COLORMAP__SETATTR, "setattr") + S_(SECCLASS_PROPERTY, PROPERTY__CREATE, "create") + S_(SECCLASS_PROPERTY, PROPERTY__FREE, "free") + S_(SECCLASS_PROPERTY, PROPERTY__READ, "read") + S_(SECCLASS_PROPERTY, PROPERTY__WRITE, "write") + S_(SECCLASS_CURSOR, CURSOR__CREATE, "create") + S_(SECCLASS_CURSOR, CURSOR__CREATEGLYPH, "createglyph") + S_(SECCLASS_CURSOR, CURSOR__FREE, "free") + S_(SECCLASS_CURSOR, CURSOR__ASSIGN, "assign") + S_(SECCLASS_CURSOR, CURSOR__SETATTR, "setattr") + S_(SECCLASS_XCLIENT, XCLIENT__KILL, "kill") + S_(SECCLASS_XINPUT, XINPUT__LOOKUP, "lookup") + S_(SECCLASS_XINPUT, XINPUT__GETATTR, "getattr") + S_(SECCLASS_XINPUT, XINPUT__SETATTR, "setattr") + S_(SECCLASS_XINPUT, XINPUT__SETFOCUS, "setfocus") + S_(SECCLASS_XINPUT, XINPUT__WARPPOINTER, "warppointer") + S_(SECCLASS_XINPUT, XINPUT__ACTIVEGRAB, "activegrab") + S_(SECCLASS_XINPUT, XINPUT__PASSIVEGRAB, "passivegrab") + S_(SECCLASS_XINPUT, XINPUT__UNGRAB, "ungrab") + S_(SECCLASS_XINPUT, XINPUT__BELL, "bell") + S_(SECCLASS_XINPUT, XINPUT__MOUSEMOTION, "mousemotion") + S_(SECCLASS_XINPUT, XINPUT__RELABELINPUT, "relabelinput") + S_(SECCLASS_XSERVER, XSERVER__SCREENSAVER, "screensaver") + S_(SECCLASS_XSERVER, XSERVER__GETHOSTLIST, "gethostlist") + S_(SECCLASS_XSERVER, XSERVER__SETHOSTLIST, "sethostlist") + S_(SECCLASS_XSERVER, XSERVER__GETFONTPATH, "getfontpath") + S_(SECCLASS_XSERVER, XSERVER__SETFONTPATH, "setfontpath") + S_(SECCLASS_XSERVER, XSERVER__GETATTR, "getattr") + S_(SECCLASS_XSERVER, XSERVER__GRAB, "grab") + S_(SECCLASS_XSERVER, XSERVER__UNGRAB, "ungrab") + S_(SECCLASS_XEXTENSION, XEXTENSION__QUERY, "query") + S_(SECCLASS_XEXTENSION, XEXTENSION__USE, "use") + S_(SECCLASS_PAX, PAX__PAGEEXEC, "pageexec") + S_(SECCLASS_PAX, PAX__EMUTRAMP, "emutramp") + S_(SECCLASS_PAX, PAX__MPROTECT, "mprotect") + S_(SECCLASS_PAX, PAX__RANDMMAP, "randmmap") + S_(SECCLASS_PAX, PAX__RANDEXEC, "randexec") + S_(SECCLASS_PAX, PAX__SEGMEXEC, "segmexec") + S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_NETLINK_TCPDIAG_SOCKET, NETLINK_TCPDIAG_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_TCPDIAG_SOCKET, NETLINK_TCPDIAG_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_NETLINK_XFRM_SOCKET, NETLINK_XFRM_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_XFRM_SOCKET, NETLINK_XFRM_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_RELAY, "nlmsg_relay") + S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV, "nlmsg_readpriv") + S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_DBUS, DBUS__ACQUIRE_SVC, "acquire_svc") + S_(SECCLASS_DBUS, DBUS__SEND_MSG, "send_msg") + S_(SECCLASS_NSCD, NSCD__GETPWD, "getpwd") + S_(SECCLASS_NSCD, NSCD__GETGRP, "getgrp") + S_(SECCLASS_NSCD, NSCD__GETHOST, "gethost") + S_(SECCLASS_NSCD, NSCD__GETSTAT, "getstat") + S_(SECCLASS_NSCD, NSCD__ADMIN, "admin") + S_(SECCLASS_NSCD, NSCD__SHMEMPWD, "shmempwd") + S_(SECCLASS_NSCD, NSCD__SHMEMGRP, "shmemgrp") + S_(SECCLASS_NSCD, NSCD__SHMEMHOST, "shmemhost") + S_(SECCLASS_ASSOCIATION, ASSOCIATION__SENDTO, "sendto") + S_(SECCLASS_ASSOCIATION, ASSOCIATION__RECVFROM, "recvfrom") + S_(SECCLASS_ASSOCIATION, ASSOCIATION__SETCONTEXT, "setcontext") ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/av_permissions.h#9 (text+ko) ==== @@ -1,617 +1,967 @@ /* This file is automatically generated. Do not edit. */ -/* FLASK */ +#define COMMON_FILE__POLL 0x00000001UL +#define COMMON_FILE__IOCTL 0x00000002UL +#define COMMON_FILE__READ 0x00000004UL +#define COMMON_FILE__WRITE 0x00000008UL +#define COMMON_FILE__CREATE 0x00000010UL +#define COMMON_FILE__GETATTR 0x00000020UL +#define COMMON_FILE__SETATTR 0x00000040UL +#define COMMON_FILE__LOCK 0x00000080UL +#define COMMON_FILE__RELABELFROM 0x00000100UL +#define COMMON_FILE__RELABELTO 0x00000200UL +#define COMMON_FILE__TRANSITION 0x00000400UL +#define COMMON_FILE__APPEND 0x00000800UL +#define COMMON_FILE__ACCESS 0x00001000UL +#define COMMON_FILE__UNLINK 0x00002000UL +#define COMMON_FILE__LINK 0x00004000UL +#define COMMON_FILE__RENAME 0x00008000UL +#define COMMON_FILE__EXECUTE 0x00010000UL +#define COMMON_FILE__SWAPON 0x00020000UL +#define COMMON_FILE__QUOTAON 0x00040000UL +#define COMMON_FILE__MOUNTON 0x00080000UL + +#define COMMON_SOCKET__IOCTL 0x00000001UL +#define COMMON_SOCKET__READ 0x00000002UL +#define COMMON_SOCKET__WRITE 0x00000004UL +#define COMMON_SOCKET__CREATE 0x00000008UL +#define COMMON_SOCKET__GETATTR 0x00000010UL +#define COMMON_SOCKET__SETATTR 0x00000020UL +#define COMMON_SOCKET__LOCK 0x00000040UL +#define COMMON_SOCKET__RELABELFROM 0x00000080UL +#define COMMON_SOCKET__RELABELTO 0x00000100UL +#define COMMON_SOCKET__APPEND 0x00000200UL +#define COMMON_SOCKET__BIND 0x00000400UL +#define COMMON_SOCKET__CONNECT 0x00000800UL +#define COMMON_SOCKET__LISTEN 0x00001000UL +#define COMMON_SOCKET__ACCEPT 0x00002000UL +#define COMMON_SOCKET__GETOPT 0x00004000UL +#define COMMON_SOCKET__SETOPT 0x00008000UL +#define COMMON_SOCKET__SHUTDOWN 0x00010000UL +#define COMMON_SOCKET__RECVFROM 0x00020000UL +#define COMMON_SOCKET__SENDTO 0x00040000UL +#define COMMON_SOCKET__RECV_MSG 0x00080000UL +#define COMMON_SOCKET__SEND_MSG 0x00100000UL +#define COMMON_SOCKET__NAME_BIND 0x00200000UL + +#define COMMON_IPC__CREATE 0x00000001UL +#define COMMON_IPC__DESTROY 0x00000002UL +#define COMMON_IPC__GETATTR 0x00000004UL +#define COMMON_IPC__SETATTR 0x00000008UL +#define COMMON_IPC__READ 0x00000010UL +#define COMMON_IPC__WRITE 0x00000020UL +#define COMMON_IPC__ASSOCIATE 0x00000040UL +#define COMMON_IPC__UNIX_READ 0x00000080UL +#define COMMON_IPC__UNIX_WRITE 0x00000100UL + +#define FILESYSTEM__MOUNT 0x00000001UL +#define FILESYSTEM__REMOUNT 0x00000002UL +#define FILESYSTEM__UNMOUNT 0x00000004UL +#define FILESYSTEM__GETATTR 0x00000008UL +#define FILESYSTEM__RELABELFROM 0x00000010UL +#define FILESYSTEM__RELABELTO 0x00000020UL +#define FILESYSTEM__TRANSITION 0x00000040UL +#define FILESYSTEM__ASSOCIATE 0x00000080UL +#define FILESYSTEM__QUOTAMOD 0x00000100UL +#define FILESYSTEM__QUOTAGET 0x00000200UL + +#define DIR__POLL 0x00000001UL +#define DIR__IOCTL 0x00000002UL +#define DIR__READ 0x00000004UL +#define DIR__WRITE 0x00000008UL +#define DIR__CREATE 0x00000010UL +#define DIR__GETATTR 0x00000020UL +#define DIR__SETATTR 0x00000040UL +#define DIR__LOCK 0x00000080UL +#define DIR__RELABELFROM 0x00000100UL +#define DIR__RELABELTO 0x00000200UL +#define DIR__TRANSITION 0x00000400UL +#define DIR__APPEND 0x00000800UL +#define DIR__ACCESS 0x00001000UL +#define DIR__UNLINK 0x00002000UL +#define DIR__LINK 0x00004000UL +#define DIR__RENAME 0x00008000UL +#define DIR__EXECUTE 0x00010000UL +#define DIR__SWAPON 0x00020000UL +#define DIR__QUOTAON 0x00040000UL +#define DIR__MOUNTON 0x00080000UL + +#define DIR__ADD_NAME 0x00100000UL +#define DIR__REMOVE_NAME 0x00200000UL +#define DIR__REPARENT 0x00400000UL +#define DIR__SEARCH 0x00800000UL +#define DIR__RMDIR 0x01000000UL + +#define FILE__POLL 0x00000001UL +#define FILE__IOCTL 0x00000002UL +#define FILE__READ 0x00000004UL +#define FILE__WRITE 0x00000008UL +#define FILE__CREATE 0x00000010UL +#define FILE__GETATTR 0x00000020UL +#define FILE__SETATTR 0x00000040UL +#define FILE__LOCK 0x00000080UL +#define FILE__RELABELFROM 0x00000100UL +#define FILE__RELABELTO 0x00000200UL +#define FILE__TRANSITION 0x00000400UL +#define FILE__APPEND 0x00000800UL +#define FILE__ACCESS 0x00001000UL +#define FILE__UNLINK 0x00002000UL +#define FILE__LINK 0x00004000UL +#define FILE__RENAME 0x00008000UL +#define FILE__EXECUTE 0x00010000UL +#define FILE__SWAPON 0x00020000UL +#define FILE__QUOTAON 0x00040000UL +#define FILE__MOUNTON 0x00080000UL + +#define FILE__EXECUTE_NO_TRANS 0x00100000UL +#define FILE__ENTRYPOINT 0x00200000UL +#define FILE__EXECMOD 0x00400000UL + +#define LNK_FILE__POLL 0x00000001UL +#define LNK_FILE__IOCTL 0x00000002UL +#define LNK_FILE__READ 0x00000004UL +#define LNK_FILE__WRITE 0x00000008UL +#define LNK_FILE__CREATE 0x00000010UL +#define LNK_FILE__GETATTR 0x00000020UL +#define LNK_FILE__SETATTR 0x00000040UL +#define LNK_FILE__LOCK 0x00000080UL +#define LNK_FILE__RELABELFROM 0x00000100UL +#define LNK_FILE__RELABELTO 0x00000200UL +#define LNK_FILE__TRANSITION 0x00000400UL +#define LNK_FILE__APPEND 0x00000800UL +#define LNK_FILE__ACCESS 0x00001000UL +#define LNK_FILE__UNLINK 0x00002000UL +#define LNK_FILE__LINK 0x00004000UL +#define LNK_FILE__RENAME 0x00008000UL +#define LNK_FILE__EXECUTE 0x00010000UL +#define LNK_FILE__SWAPON 0x00020000UL +#define LNK_FILE__QUOTAON 0x00040000UL +#define LNK_FILE__MOUNTON 0x00080000UL + +#define CHR_FILE__POLL 0x00000001UL +#define CHR_FILE__IOCTL 0x00000002UL +#define CHR_FILE__READ 0x00000004UL +#define CHR_FILE__WRITE 0x00000008UL +#define CHR_FILE__CREATE 0x00000010UL +#define CHR_FILE__GETATTR 0x00000020UL +#define CHR_FILE__SETATTR 0x00000040UL +#define CHR_FILE__LOCK 0x00000080UL +#define CHR_FILE__RELABELFROM 0x00000100UL +#define CHR_FILE__RELABELTO 0x00000200UL +#define CHR_FILE__TRANSITION 0x00000400UL +#define CHR_FILE__APPEND 0x00000800UL +#define CHR_FILE__ACCESS 0x00001000UL +#define CHR_FILE__UNLINK 0x00002000UL +#define CHR_FILE__LINK 0x00004000UL +#define CHR_FILE__RENAME 0x00008000UL +#define CHR_FILE__EXECUTE 0x00010000UL +#define CHR_FILE__SWAPON 0x00020000UL +#define CHR_FILE__QUOTAON 0x00040000UL +#define CHR_FILE__MOUNTON 0x00080000UL + +#define CHR_FILE__EXECUTE_NO_TRANS 0x00100000UL +#define CHR_FILE__ENTRYPOINT 0x00200000UL +#define CHR_FILE__EXECMOD 0x00400000UL + +#define BLK_FILE__POLL 0x00000001UL +#define BLK_FILE__IOCTL 0x00000002UL +#define BLK_FILE__READ 0x00000004UL +#define BLK_FILE__WRITE 0x00000008UL +#define BLK_FILE__CREATE 0x00000010UL +#define BLK_FILE__GETATTR 0x00000020UL +#define BLK_FILE__SETATTR 0x00000040UL +#define BLK_FILE__LOCK 0x00000080UL +#define BLK_FILE__RELABELFROM 0x00000100UL +#define BLK_FILE__RELABELTO 0x00000200UL +#define BLK_FILE__TRANSITION 0x00000400UL +#define BLK_FILE__APPEND 0x00000800UL +#define BLK_FILE__ACCESS 0x00001000UL +#define BLK_FILE__UNLINK 0x00002000UL +#define BLK_FILE__LINK 0x00004000UL +#define BLK_FILE__RENAME 0x00008000UL +#define BLK_FILE__EXECUTE 0x00010000UL +#define BLK_FILE__SWAPON 0x00020000UL +#define BLK_FILE__QUOTAON 0x00040000UL +#define BLK_FILE__MOUNTON 0x00080000UL + +#define SOCK_FILE__POLL 0x00000001UL +#define SOCK_FILE__IOCTL 0x00000002UL +#define SOCK_FILE__READ 0x00000004UL +#define SOCK_FILE__WRITE 0x00000008UL +#define SOCK_FILE__CREATE 0x00000010UL +#define SOCK_FILE__GETATTR 0x00000020UL +#define SOCK_FILE__SETATTR 0x00000040UL +#define SOCK_FILE__LOCK 0x00000080UL +#define SOCK_FILE__RELABELFROM 0x00000100UL +#define SOCK_FILE__RELABELTO 0x00000200UL +#define SOCK_FILE__TRANSITION 0x00000400UL +#define SOCK_FILE__APPEND 0x00000800UL +#define SOCK_FILE__ACCESS 0x00001000UL +#define SOCK_FILE__UNLINK 0x00002000UL +#define SOCK_FILE__LINK 0x00004000UL +#define SOCK_FILE__RENAME 0x00008000UL +#define SOCK_FILE__EXECUTE 0x00010000UL +#define SOCK_FILE__SWAPON 0x00020000UL +#define SOCK_FILE__QUOTAON 0x00040000UL +#define SOCK_FILE__MOUNTON 0x00080000UL + +#define FIFO_FILE__POLL 0x00000001UL +#define FIFO_FILE__IOCTL 0x00000002UL +#define FIFO_FILE__READ 0x00000004UL +#define FIFO_FILE__WRITE 0x00000008UL +#define FIFO_FILE__CREATE 0x00000010UL +#define FIFO_FILE__GETATTR 0x00000020UL +#define FIFO_FILE__SETATTR 0x00000040UL +#define FIFO_FILE__LOCK 0x00000080UL +#define FIFO_FILE__RELABELFROM 0x00000100UL +#define FIFO_FILE__RELABELTO 0x00000200UL +#define FIFO_FILE__TRANSITION 0x00000400UL +#define FIFO_FILE__APPEND 0x00000800UL +#define FIFO_FILE__ACCESS 0x00001000UL +#define FIFO_FILE__UNLINK 0x00002000UL +#define FIFO_FILE__LINK 0x00004000UL +#define FIFO_FILE__RENAME 0x00008000UL +#define FIFO_FILE__EXECUTE 0x00010000UL +#define FIFO_FILE__SWAPON 0x00020000UL +#define FIFO_FILE__QUOTAON 0x00040000UL +#define FIFO_FILE__MOUNTON 0x00080000UL + +#define FD__CREATE 0x00000001UL +#define FD__USE 0x00000002UL + +#define SOCKET__IOCTL 0x00000001UL +#define SOCKET__READ 0x00000002UL +#define SOCKET__WRITE 0x00000004UL +#define SOCKET__CREATE 0x00000008UL +#define SOCKET__GETATTR 0x00000010UL +#define SOCKET__SETATTR 0x00000020UL +#define SOCKET__LOCK 0x00000040UL +#define SOCKET__RELABELFROM 0x00000080UL +#define SOCKET__RELABELTO 0x00000100UL +#define SOCKET__APPEND 0x00000200UL +#define SOCKET__BIND 0x00000400UL +#define SOCKET__CONNECT 0x00000800UL +#define SOCKET__LISTEN 0x00001000UL +#define SOCKET__ACCEPT 0x00002000UL +#define SOCKET__GETOPT 0x00004000UL +#define SOCKET__SETOPT 0x00008000UL +#define SOCKET__SHUTDOWN 0x00010000UL +#define SOCKET__RECVFROM 0x00020000UL +#define SOCKET__SENDTO 0x00040000UL +#define SOCKET__RECV_MSG 0x00080000UL +#define SOCKET__SEND_MSG 0x00100000UL +#define SOCKET__NAME_BIND 0x00200000UL + +#define TCP_SOCKET__IOCTL 0x00000001UL +#define TCP_SOCKET__READ 0x00000002UL +#define TCP_SOCKET__WRITE 0x00000004UL +#define TCP_SOCKET__CREATE 0x00000008UL +#define TCP_SOCKET__GETATTR 0x00000010UL +#define TCP_SOCKET__SETATTR 0x00000020UL +#define TCP_SOCKET__LOCK 0x00000040UL +#define TCP_SOCKET__RELABELFROM 0x00000080UL +#define TCP_SOCKET__RELABELTO 0x00000100UL +#define TCP_SOCKET__APPEND 0x00000200UL +#define TCP_SOCKET__BIND 0x00000400UL +#define TCP_SOCKET__CONNECT 0x00000800UL +#define TCP_SOCKET__LISTEN 0x00001000UL +#define TCP_SOCKET__ACCEPT 0x00002000UL +#define TCP_SOCKET__GETOPT 0x00004000UL +#define TCP_SOCKET__SETOPT 0x00008000UL +#define TCP_SOCKET__SHUTDOWN 0x00010000UL +#define TCP_SOCKET__RECVFROM 0x00020000UL +#define TCP_SOCKET__SENDTO 0x00040000UL +#define TCP_SOCKET__RECV_MSG 0x00080000UL +#define TCP_SOCKET__SEND_MSG 0x00100000UL +#define TCP_SOCKET__NAME_BIND 0x00200000UL + +#define TCP_SOCKET__CONNECTTO 0x00400000UL +#define TCP_SOCKET__NEWCONN 0x00800000UL +#define TCP_SOCKET__ACCEPTFROM 0x01000000UL +#define TCP_SOCKET__NODE_BIND 0x02000000UL +#define TCP_SOCKET__NAME_CONNECT 0x04000000UL + +#define UDP_SOCKET__IOCTL 0x00000001UL +#define UDP_SOCKET__READ 0x00000002UL +#define UDP_SOCKET__WRITE 0x00000004UL +#define UDP_SOCKET__CREATE 0x00000008UL +#define UDP_SOCKET__GETATTR 0x00000010UL +#define UDP_SOCKET__SETATTR 0x00000020UL +#define UDP_SOCKET__LOCK 0x00000040UL +#define UDP_SOCKET__RELABELFROM 0x00000080UL +#define UDP_SOCKET__RELABELTO 0x00000100UL +#define UDP_SOCKET__APPEND 0x00000200UL +#define UDP_SOCKET__BIND 0x00000400UL +#define UDP_SOCKET__CONNECT 0x00000800UL +#define UDP_SOCKET__LISTEN 0x00001000UL +#define UDP_SOCKET__ACCEPT 0x00002000UL +#define UDP_SOCKET__GETOPT 0x00004000UL +#define UDP_SOCKET__SETOPT 0x00008000UL +#define UDP_SOCKET__SHUTDOWN 0x00010000UL +#define UDP_SOCKET__RECVFROM 0x00020000UL +#define UDP_SOCKET__SENDTO 0x00040000UL +#define UDP_SOCKET__RECV_MSG 0x00080000UL +#define UDP_SOCKET__SEND_MSG 0x00100000UL +#define UDP_SOCKET__NAME_BIND 0x00200000UL + +#define UDP_SOCKET__NODE_BIND 0x00400000UL + +#define RAWIP_SOCKET__IOCTL 0x00000001UL +#define RAWIP_SOCKET__READ 0x00000002UL +#define RAWIP_SOCKET__WRITE 0x00000004UL +#define RAWIP_SOCKET__CREATE 0x00000008UL +#define RAWIP_SOCKET__GETATTR 0x00000010UL +#define RAWIP_SOCKET__SETATTR 0x00000020UL +#define RAWIP_SOCKET__LOCK 0x00000040UL +#define RAWIP_SOCKET__RELABELFROM 0x00000080UL +#define RAWIP_SOCKET__RELABELTO 0x00000100UL +#define RAWIP_SOCKET__APPEND 0x00000200UL +#define RAWIP_SOCKET__BIND 0x00000400UL +#define RAWIP_SOCKET__CONNECT 0x00000800UL +#define RAWIP_SOCKET__LISTEN 0x00001000UL +#define RAWIP_SOCKET__ACCEPT 0x00002000UL +#define RAWIP_SOCKET__GETOPT 0x00004000UL +#define RAWIP_SOCKET__SETOPT 0x00008000UL +#define RAWIP_SOCKET__SHUTDOWN 0x00010000UL +#define RAWIP_SOCKET__RECVFROM 0x00020000UL +#define RAWIP_SOCKET__SENDTO 0x00040000UL +#define RAWIP_SOCKET__RECV_MSG 0x00080000UL +#define RAWIP_SOCKET__SEND_MSG 0x00100000UL +#define RAWIP_SOCKET__NAME_BIND 0x00200000UL + +#define RAWIP_SOCKET__NODE_BIND 0x00400000UL + +#define NODE__TCP_RECV 0x00000001UL +#define NODE__TCP_SEND 0x00000002UL +#define NODE__UDP_RECV 0x00000004UL +#define NODE__UDP_SEND 0x00000008UL +#define NODE__RAWIP_RECV 0x00000010UL +#define NODE__RAWIP_SEND 0x00000020UL +#define NODE__ENFORCE_DEST 0x00000040UL + +#define NETIF__TCP_RECV 0x00000001UL +#define NETIF__TCP_SEND 0x00000002UL +#define NETIF__UDP_RECV 0x00000004UL +#define NETIF__UDP_SEND 0x00000008UL +#define NETIF__RAWIP_RECV 0x00000010UL +#define NETIF__RAWIP_SEND 0x00000020UL + +#define NETLINK_SOCKET__IOCTL 0x00000001UL +#define NETLINK_SOCKET__READ 0x00000002UL +#define NETLINK_SOCKET__WRITE 0x00000004UL +#define NETLINK_SOCKET__CREATE 0x00000008UL +#define NETLINK_SOCKET__GETATTR 0x00000010UL +#define NETLINK_SOCKET__SETATTR 0x00000020UL +#define NETLINK_SOCKET__LOCK 0x00000040UL +#define NETLINK_SOCKET__RELABELFROM 0x00000080UL +#define NETLINK_SOCKET__RELABELTO 0x00000100UL +#define NETLINK_SOCKET__APPEND 0x00000200UL +#define NETLINK_SOCKET__BIND 0x00000400UL +#define NETLINK_SOCKET__CONNECT 0x00000800UL +#define NETLINK_SOCKET__LISTEN 0x00001000UL +#define NETLINK_SOCKET__ACCEPT 0x00002000UL +#define NETLINK_SOCKET__GETOPT 0x00004000UL +#define NETLINK_SOCKET__SETOPT 0x00008000UL +#define NETLINK_SOCKET__SHUTDOWN 0x00010000UL +#define NETLINK_SOCKET__RECVFROM 0x00020000UL +#define NETLINK_SOCKET__SENDTO 0x00040000UL +#define NETLINK_SOCKET__RECV_MSG 0x00080000UL +#define NETLINK_SOCKET__SEND_MSG 0x00100000UL +#define NETLINK_SOCKET__NAME_BIND 0x00200000UL + +#define PACKET_SOCKET__IOCTL 0x00000001UL +#define PACKET_SOCKET__READ 0x00000002UL +#define PACKET_SOCKET__WRITE 0x00000004UL +#define PACKET_SOCKET__CREATE 0x00000008UL +#define PACKET_SOCKET__GETATTR 0x00000010UL +#define PACKET_SOCKET__SETATTR 0x00000020UL +#define PACKET_SOCKET__LOCK 0x00000040UL +#define PACKET_SOCKET__RELABELFROM 0x00000080UL +#define PACKET_SOCKET__RELABELTO 0x00000100UL +#define PACKET_SOCKET__APPEND 0x00000200UL +#define PACKET_SOCKET__BIND 0x00000400UL +#define PACKET_SOCKET__CONNECT 0x00000800UL +#define PACKET_SOCKET__LISTEN 0x00001000UL +#define PACKET_SOCKET__ACCEPT 0x00002000UL +#define PACKET_SOCKET__GETOPT 0x00004000UL +#define PACKET_SOCKET__SETOPT 0x00008000UL +#define PACKET_SOCKET__SHUTDOWN 0x00010000UL +#define PACKET_SOCKET__RECVFROM 0x00020000UL +#define PACKET_SOCKET__SENDTO 0x00040000UL +#define PACKET_SOCKET__RECV_MSG 0x00080000UL +#define PACKET_SOCKET__SEND_MSG 0x00100000UL +#define PACKET_SOCKET__NAME_BIND 0x00200000UL + +#define KEY_SOCKET__IOCTL 0x00000001UL +#define KEY_SOCKET__READ 0x00000002UL +#define KEY_SOCKET__WRITE 0x00000004UL +#define KEY_SOCKET__CREATE 0x00000008UL +#define KEY_SOCKET__GETATTR 0x00000010UL +#define KEY_SOCKET__SETATTR 0x00000020UL +#define KEY_SOCKET__LOCK 0x00000040UL +#define KEY_SOCKET__RELABELFROM 0x00000080UL +#define KEY_SOCKET__RELABELTO 0x00000100UL +#define KEY_SOCKET__APPEND 0x00000200UL +#define KEY_SOCKET__BIND 0x00000400UL +#define KEY_SOCKET__CONNECT 0x00000800UL +#define KEY_SOCKET__LISTEN 0x00001000UL +#define KEY_SOCKET__ACCEPT 0x00002000UL +#define KEY_SOCKET__GETOPT 0x00004000UL +#define KEY_SOCKET__SETOPT 0x00008000UL +#define KEY_SOCKET__SHUTDOWN 0x00010000UL +#define KEY_SOCKET__RECVFROM 0x00020000UL +#define KEY_SOCKET__SENDTO 0x00040000UL +#define KEY_SOCKET__RECV_MSG 0x00080000UL +#define KEY_SOCKET__SEND_MSG 0x00100000UL +#define KEY_SOCKET__NAME_BIND 0x00200000UL + +#define UNIX_STREAM_SOCKET__IOCTL 0x00000001UL +#define UNIX_STREAM_SOCKET__READ 0x00000002UL +#define UNIX_STREAM_SOCKET__WRITE 0x00000004UL +#define UNIX_STREAM_SOCKET__CREATE 0x00000008UL +#define UNIX_STREAM_SOCKET__GETATTR 0x00000010UL +#define UNIX_STREAM_SOCKET__SETATTR 0x00000020UL +#define UNIX_STREAM_SOCKET__LOCK 0x00000040UL +#define UNIX_STREAM_SOCKET__RELABELFROM 0x00000080UL +#define UNIX_STREAM_SOCKET__RELABELTO 0x00000100UL +#define UNIX_STREAM_SOCKET__APPEND 0x00000200UL +#define UNIX_STREAM_SOCKET__BIND 0x00000400UL +#define UNIX_STREAM_SOCKET__CONNECT 0x00000800UL +#define UNIX_STREAM_SOCKET__LISTEN 0x00001000UL +#define UNIX_STREAM_SOCKET__ACCEPT 0x00002000UL +#define UNIX_STREAM_SOCKET__GETOPT 0x00004000UL +#define UNIX_STREAM_SOCKET__SETOPT 0x00008000UL +#define UNIX_STREAM_SOCKET__SHUTDOWN 0x00010000UL +#define UNIX_STREAM_SOCKET__RECVFROM 0x00020000UL +#define UNIX_STREAM_SOCKET__SENDTO 0x00040000UL +#define UNIX_STREAM_SOCKET__RECV_MSG 0x00080000UL +#define UNIX_STREAM_SOCKET__SEND_MSG 0x00100000UL +#define UNIX_STREAM_SOCKET__NAME_BIND 0x00200000UL + +#define UNIX_STREAM_SOCKET__CONNECTTO 0x00400000UL +#define UNIX_STREAM_SOCKET__NEWCONN 0x00800000UL +#define UNIX_STREAM_SOCKET__ACCEPTFROM 0x01000000UL + +#define UNIX_DGRAM_SOCKET__IOCTL 0x00000001UL +#define UNIX_DGRAM_SOCKET__READ 0x00000002UL +#define UNIX_DGRAM_SOCKET__WRITE 0x00000004UL +#define UNIX_DGRAM_SOCKET__CREATE 0x00000008UL +#define UNIX_DGRAM_SOCKET__GETATTR 0x00000010UL +#define UNIX_DGRAM_SOCKET__SETATTR 0x00000020UL +#define UNIX_DGRAM_SOCKET__LOCK 0x00000040UL +#define UNIX_DGRAM_SOCKET__RELABELFROM 0x00000080UL +#define UNIX_DGRAM_SOCKET__RELABELTO 0x00000100UL +#define UNIX_DGRAM_SOCKET__APPEND 0x00000200UL +#define UNIX_DGRAM_SOCKET__BIND 0x00000400UL +#define UNIX_DGRAM_SOCKET__CONNECT 0x00000800UL +#define UNIX_DGRAM_SOCKET__LISTEN 0x00001000UL +#define UNIX_DGRAM_SOCKET__ACCEPT 0x00002000UL +#define UNIX_DGRAM_SOCKET__GETOPT 0x00004000UL +#define UNIX_DGRAM_SOCKET__SETOPT 0x00008000UL >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 18:40:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A772316B1D1 for ; Tue, 16 May 2006 18:40:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 252C243D67 for ; Tue, 16 May 2006 18:40:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9860B46CB3 for ; Tue, 16 May 2006 14:40:45 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2006F7437B; Tue, 16 May 2006 18:33:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E15EE16A6E3; Tue, 16 May 2006 18:33:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B656516A5C0 for ; Tue, 16 May 2006 18:33:29 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7ECB643D45 for ; Tue, 16 May 2006 18:33:29 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GIXCAe072446 for ; Tue, 16 May 2006 18:33:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GIXCYU072443 for perforce@freebsd.org; Tue, 16 May 2006 18:33:12 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 18:33:12 GMT Message-Id: <200605161833.k4GIXCYU072443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97272 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 18:40:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=97272 Change 97272 by millert@millert_p4 on 2006/05/16 18:32:48 Compile new .c files added by SEBSD module upgrade. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/conf/files#20 edit .. //depot/projects/trustedbsd/sebsd/sys/modules/sebsd/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/conf/files#20 (text+ko) ==== @@ -1876,6 +1876,7 @@ security/sebsd/sebsd_syscall.c optional sebsd security/sebsd/sebsd_sysctl.c optional sebsd security/sebsd/avc/avc.c optional sebsd +security/sebsd/avc/avc_audit.c optional sebsd security/sebsd/ss/avtab.c optional sebsd security/sebsd/ss/ebitmap.c optional sebsd security/sebsd/ss/hashtab.c optional sebsd @@ -1887,6 +1888,7 @@ security/sebsd/ss/symtab.c optional sebsd security/sebsd/ss/fileutils.c optional sebsd security/sebsd/ss/conditional.c optional sebsd +security/sebsd/ss/mls.c optional sebsd ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_balloc.c optional ffs ufs/ffs/ffs_inode.c optional ffs ==== //depot/projects/trustedbsd/sebsd/sys/modules/sebsd/Makefile#4 (text+ko) ==== @@ -9,6 +9,7 @@ sebsd_syscall.c \ sebsd_sysctl.c \ avc.c \ + avc_audit.c \ avtab.c \ ebitmap.c \ hashtab.c \ @@ -19,6 +20,7 @@ sidtab.c \ symtab.c \ fileutils.c \ - conditional.c + conditional.c \ + mls.c .include From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 18:47:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0584F16B2AB for ; Tue, 16 May 2006 18:47:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49E8443E0C for ; Tue, 16 May 2006 18:45:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2ACBF46C90 for ; Tue, 16 May 2006 14:45:11 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C0BA15CF09; Tue, 16 May 2006 18:42:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A8ECD16B0FD; Tue, 16 May 2006 18:42:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E87E16B010 for ; Tue, 16 May 2006 18:42:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6D1543D7C for ; Tue, 16 May 2006 18:42:41 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GIgPVi072938 for ; Tue, 16 May 2006 18:42:25 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GIgOY5072935 for perforce@freebsd.org; Tue, 16 May 2006 18:42:24 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 18:42:24 GMT Message-Id: <200605161842.k4GIgOY5072935@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97274 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 18:47:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=97274 Change 97274 by millert@millert_p4 on 2006/05/16 18:41:54 Remove unused SEBSD files. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/conf/files#21 edit .. //depot/projects/trustedbsd/sebsd/sys/modules/sebsd/Makefile#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask_types.h#8 delete .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#9 delete .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.h#4 delete .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/queue.c#5 delete .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/queue.h#4 delete Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/conf/files#21 (text+ko) ==== @@ -1882,11 +1882,9 @@ security/sebsd/ss/hashtab.c optional sebsd security/sebsd/ss/init.c optional sebsd security/sebsd/ss/policydb.c optional sebsd -security/sebsd/ss/queue.c optional sebsd security/sebsd/ss/services.c optional sebsd security/sebsd/ss/sidtab.c optional sebsd security/sebsd/ss/symtab.c optional sebsd -security/sebsd/ss/fileutils.c optional sebsd security/sebsd/ss/conditional.c optional sebsd security/sebsd/ss/mls.c optional sebsd ufs/ffs/ffs_alloc.c optional ffs ==== //depot/projects/trustedbsd/sebsd/sys/modules/sebsd/Makefile#5 (text+ko) ==== @@ -15,11 +15,9 @@ hashtab.c \ init.c \ policydb.c \ - queue.c \ services.c \ sidtab.c \ symtab.c \ - fileutils.c \ conditional.c \ mls.c From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 18:55:14 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4463616A87F for ; Tue, 16 May 2006 18:55:14 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22A8243D62 for ; Tue, 16 May 2006 18:55:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 97B7146C90 for ; Tue, 16 May 2006 14:55:04 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 27BD055FD1; Tue, 16 May 2006 18:55:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 19DEC16B2F2; Tue, 16 May 2006 18:55:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83B0A16B150 for ; Tue, 16 May 2006 18:55:02 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B06143D77 for ; Tue, 16 May 2006 18:54:58 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GIsfQu073460 for ; Tue, 16 May 2006 18:54:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GIsfwu073457 for perforce@freebsd.org; Tue, 16 May 2006 18:54:41 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 18:54:41 GMT Message-Id: <200605161854.k4GIsfwu073457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97276 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 18:55:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=97276 Change 97276 by millert@millert_p4 on 2006/05/16 18:54:10 Simple emulation of the Linux audit API for use by avc.c Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc_audit.c#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 18:57:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0446A16B4F1 for ; Tue, 16 May 2006 18:57:30 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A772A43D6A for ; Tue, 16 May 2006 18:57:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 43FBB46C90 for ; Tue, 16 May 2006 14:57:09 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C0AE1570E6; Tue, 16 May 2006 18:57:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9767816A5E7; Tue, 16 May 2006 18:57:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98B6516A5A4 for ; Tue, 16 May 2006 18:57:05 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 392C443D60 for ; Tue, 16 May 2006 18:57:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GIujbX073634 for ; Tue, 16 May 2006 18:56:45 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GIuiI2073631 for perforce@freebsd.org; Tue, 16 May 2006 18:56:44 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 18:56:44 GMT Message-Id: <200605161856.k4GIuiI2073631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97278 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 18:57:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=97278 Change 97278 by millert@millert_p4 on 2006/05/16 18:56:34 A port of checkpolicy version 1.30.3 from sourceforge to SEBSD. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/COPYING#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/ChangeLog#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/VERSION#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkmodule.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkmodule.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.c#11 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.h#7 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/module_compiler.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/module_compiler.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_parse.y#8 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_scan.l#7 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/queue.c#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/queue.h#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/test/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/test/dismod.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/test/dispol.c#1 add Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.8#2 (text+ko) ==== @@ -3,7 +3,7 @@ checkpolicy \- SELinux policy compiler .SH SYNOPSIS .B checkpolicy -.I "[-b] [-d] [-c policyvers] [-o output_file] [input_file]" +.I "[-b] [-d] [-M] [-c policyvers] [-o output_file] [input_file]" .br .SH "DESCRIPTION" This manual page describes the @@ -24,6 +24,9 @@ .B \-d Enter debug mode after loading the policy. .TP +.B \-M +Enable the MLS policy when checking and compiling the policy. +.TP .B \-o filename Write a binary policy file to the specified filename. .TP ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.c#11 (text+ko) ==== @@ -3,7 +3,12 @@ * Author : Stephen Smalley, */ -/* Updated: Karl MacMillan +/* + * Updated: Trusted Computer Solutions, Inc. + * + * Support for enhanced MLS infrastructure. + * + * Updated: Karl MacMillan * * Added conditional policy language extensions * @@ -11,7 +16,14 @@ * * Added IPv6 support. * - * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * Updated: Joshua Brindle + * Karl MacMillan + * Jason Tang + * + * Policy Module support. + * + * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. + * Copyright (C) 2003 - 2005 Tresys Technology, LLC * Copyright (C) 2003 Red Hat, Inc., James Morris * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -58,10 +70,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "queue.h" #include "checkpolicy.h" @@ -76,30 +91,36 @@ extern queue_t id_queue; extern unsigned int policydb_errors; extern unsigned long policydb_lineno; -extern unsigned long source_lineno; extern char source_file[]; -extern unsigned int pass; +extern int mlspol; extern FILE *yyin; +extern void init_parser(int); extern int yyparse(void); extern void yyrestart(FILE *); -char *txtfile = "policy.conf"; -char *binfile = "policy"; +static char *txtfile = "policy.conf"; +static char *binfile = "policy"; unsigned int policyvers = POLICYDB_VERSION_MAX; void usage(char *progname) { - printf("usage: %s [-b] [-d] [-c policyvers (%d-%d)] [-o output_file] [input_file]\n", + printf("usage: %s [-b] [-d] [-M] [-c policyvers (%d-%d)] [-o output_file] [input_file]\n", progname, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX); exit(1); } -static int print_sid(security_id_t sid, +#define FGETS(out, size, in) \ +if (fgets(out,size,in)==NULL) { \ + fprintf(stderr, "fgets failed at line %d: %s\n", __LINE__,\ + strerror(errno)); \ + exit(1);\ +} +static int print_sid(sepol_security_id_t sid, context_struct_t * context __attribute__ ((unused)), void *data __attribute__ ((unused))) { - security_context_t scontext; + sepol_security_context_t scontext; size_t scontext_len; int rc; @@ -133,16 +154,6 @@ return 0; } -static int type_attr_remove(hashtab_key_t key __attribute__ ((unused)), hashtab_datum_t datum, void *p __attribute__ ((unused))) -{ - type_datum_t *typdatum; - - typdatum = (type_datum_t *) datum; - if (typdatum->isattr) - return 1; - return 0; -} - #ifdef EQUIVTYPES static int insert_type_rule(avtab_key_t *k, avtab_datum_t *d, struct avtab_node *type_rules) @@ -270,100 +281,9 @@ } #endif -static void cond_check_type_rules_list(cond_av_list_t *list) -{ - cond_av_list_t *cur = list; - - while (cur) { - if (cur->node->datum.specified & AVTAB_TYPE) { - if (avtab_search(&policydbp->te_avtab, &cur->node->key, AVTAB_TYPE)) { - fprintf(stderr, "conditional type rule for (%s, %s : %s) conflicts with entry in base policy; " - "conditional rule discarded.\n", policydbp->p_type_val_to_name[cur->node->key.source_type-1], - policydbp->p_type_val_to_name[cur->node->key.target_type-1], - policydbp->p_class_val_to_name[cur->node->key.target_class-1]); - cur->node->parse_context = (void*)0; - } else { - cur->node->parse_context = (void*)1; - } - } else { - cur->node->parse_context = (void*)1; - } - cur = cur->next; - } -} - -/* check for duplicate type rules - this has to be done after all of - * the parsing is finished because the conditional and base type rules - * are collected in the same pass */ -static void cond_check_type_rules(void) -{ - cond_list_t *node; - - for (node = policydbp->cond_list; node != NULL; node = node->next) { - cond_check_type_rules_list(node->true_list); - cond_check_type_rules_list(node->false_list); - } -} +extern char *av_to_string(uint32_t tclass, sepol_access_vector_t av); -extern char *av_to_string(uint32_t tclass, access_vector_t av); -void check_assertion_helper(unsigned int stype, unsigned int ttype, ebitmap_t *tclasses, - access_vector_t *avp, unsigned long line) -{ - avtab_key_t avkey; - avtab_datum_t *avdatump; - unsigned int k; - - - for (k = ebitmap_startbit(tclasses); k < ebitmap_length(tclasses); k++) { - if (!ebitmap_get_bit(tclasses, k)) - continue; - avkey.source_type = stype + 1; - avkey.target_type = ttype + 1; - avkey.target_class = k + 1; - avdatump = avtab_search(&policydb.te_avtab, &avkey, AVTAB_AV); - if (!avdatump) - continue; - - if ((avdatump->specified & AVTAB_ALLOWED) && - (avtab_allowed(avdatump) & avp[k])) { - fprintf(stderr, "assertion on line %ld violated by allow %s %s:%s {%s };\n", line, policydb.p_type_val_to_name[stype], policydb.p_type_val_to_name[ttype], policydb.p_class_val_to_name[k], - av_to_string(k+1, - avtab_allowed(avdatump) & avp[k])); - policydb_errors++; - } - } -} - -void check_assertions(void) -{ - te_assert_t *a, *tmp; - unsigned int i, j; - - a = te_assertions; - while (a) { - for (i = ebitmap_startbit(&a->stypes); i < ebitmap_length(&a->stypes); i++) { - if (!ebitmap_get_bit(&a->stypes, i)) - continue; - if (a->self) { - check_assertion_helper(i, i, &a->tclasses, a->avp, a->line); - } - for (j = ebitmap_startbit(&a->ttypes); j < ebitmap_length(&a->ttypes); j++) { - if (!ebitmap_get_bit(&a->ttypes, j)) - continue; - check_assertion_helper(i, j, &a->tclasses, a->avp, a->line); - } - } - tmp = a; - a = a->next; - ebitmap_destroy(&tmp->stypes); - ebitmap_destroy(&tmp->ttypes); - ebitmap_destroy(&tmp->tclasses); - free(tmp->avp); - free(tmp); - } -} - int display_bools() { int i; @@ -435,12 +355,23 @@ return 0; } +static int check_level(hashtab_key_t key, hashtab_datum_t datum, void *arg) +{ + level_datum_t *levdatum = (level_datum_t *) datum; + + if (!levdatum->isalias && !levdatum->defined) { + fprintf(stderr, "Error: sensitivity %s was not used in a level definition!\n", key); + return -1; + } + return 0; +} + int main(int argc, char **argv) { - security_class_t tclass; - security_id_t ssid, tsid, *sids; - security_context_t scontext; - struct av_decision avd; + sepol_security_class_t tclass; + sepol_security_id_t ssid, tsid, *sids; + sepol_security_context_t scontext; + struct sepol_av_decision avd; class_datum_t *cladatum; char ans[80 + 1], *file = txtfile, *outfile = NULL, *path, *fstype; size_t scontext_len, pathlen; @@ -449,7 +380,7 @@ unsigned int binary = 0, debug = 0; struct val_to_name v; int ret, ch, fd; - unsigned int nel; + unsigned int nel, uret; struct stat sb; void *map; FILE *outfp = NULL; @@ -459,7 +390,7 @@ struct policy_file pf; - while ((ch = getopt(argc, argv, "o:dbVc:")) != EOF) { + while ((ch = getopt(argc, argv, "o:dbMVc:")) != EOF) { switch (ch) { case 'o': outfile = optarg; @@ -474,6 +405,9 @@ case 'V': show_version = 1; break; + case 'M': + mlspol = 1; + break; case 'c': { long int n = strtol(optarg, NULL, 10); if (errno) { @@ -497,11 +431,7 @@ } if (show_version) { -#ifdef CONFIG_SECURITY_SELINUX_MLS - printf("%d-mls (compatibility range %d-%d)\n", policyvers, POLICYDB_VERSION_MAX, POLICYDB_VERSION_MIN); -#else printf("%d (compatibility range %d-%d)\n", policyvers, POLICYDB_VERSION_MAX, POLICYDB_VERSION_MIN); -#endif exit(0); } @@ -540,63 +470,93 @@ pf.type = PF_USE_MEMORY; pf.data = map; pf.len = sb.st_size; + if (policydb_init(&policydb)) { + fprintf(stderr, "%s: policydb_init: Out of memory!\n", argv[0]); + exit(1); + } ret = policydb_read(&policydb, &pf, 1); if (ret) { fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); exit(1); } policydbp = &policydb; + + /* Check Policy Consistency */ + if (policydbp->mls) { + if (!mlspol) { + fprintf(stderr,"%s: MLS policy, but non-MLS" + " is specified\n", argv[0]); + exit(1); + } + } else { + if (mlspol) { + fprintf(stderr,"%s: non-MLS policy, but MLS" + " is specified\n", argv[0]); + exit(1); + } + } } else { - yyin = fopen(file, "r"); + policydb_t parse_policy; + + yyin = fopen(file, "r"); if (!yyin) { fprintf(stderr, "%s: unable to open %s\n", argv[0], file); exit(1); } - if (policydb_init(&policydb)) + if (policydb_init(&parse_policy)) exit(1); + /* We build this as a base policy first since that is all the parser understands */ + parse_policy.policy_type = POLICY_BASE; + /* Let sepol know if we are dealing with MLS support */ + parse_policy.mls = mlspol; + id_queue = queue_create(); if (!id_queue) { fprintf(stderr, "%s: out of memory\n", argv[0]); exit(1); } - policydbp = &policydb; - policydb_errors = 0; - pass = 1; + policydbp = &parse_policy; + init_parser(1); if (yyparse() || policydb_errors) { fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); exit(1); } rewind(yyin); - policydb_lineno = 1; + init_parser(2); source_file[0] = '\0'; - source_lineno = 1; yyrestart(yyin); - pass = 2; if (yyparse() || policydb_errors) { fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); exit(1); } queue_destroy(id_queue); - cond_check_type_rules(); - cond_optimize_lists(policydb.cond_list); + if (policydb_errors) + exit(1); + + if (hashtab_map(policydbp->p_levels.table, check_level, NULL)) + exit(1); - check_assertions(); - if (policydb_errors) + if (policydb_init(&policydb)) { + fprintf(stderr, "%s: policydb_init failed\n", argv[0]); exit(1); + } - if (policyvers >= POLICYDB_VERSION_NLCLASS && - policydb.p_classes.nprim < SECCLASS_NETLINK_DNRT_SOCKET) { - fprintf(stderr, "%s: policy lacks new netlink classes, unable to generate policy version %d\n", argv[0], policyvers); + /* Linking takes care of optional avrule blocks */ + if (link_modules(NULL, &parse_policy, NULL, 0, 0)) { + fprintf(stderr, "Error while resolving optionals\n"); exit(1); } - - /* remove type attributes */ - hashtab_map_remove_on_error(policydb.p_types.table, - type_attr_remove, 0, 0); + + if (expand_module(NULL, &parse_policy, &policydb, 0, 1)) { + fprintf(stderr, "Error while expanding policy\n"); + exit(1); + } + policydb_destroy(&parse_policy); + policydbp = &policydb; fclose(yyin); } @@ -614,7 +574,8 @@ exit(1); } - sepol_set_policyvers(policyvers); + policydb.policy_type = POLICY_KERN; + policydb.policyvers = policyvers; pf.type = PF_USE_STDIO; pf.fp = outfp; @@ -626,8 +587,10 @@ } fclose(outfp); } - if (!debug) + if (!debug) { + policydb_destroy(&policydb); exit(0); + } menu: printf("\nSelect an option:\n"); @@ -656,19 +619,19 @@ printf("q) Exit\n"); while (1) { printf("\nChoose: "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); switch (ans[0]) { case '0': printf("source sid? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ssid = atoi(ans); printf("target sid? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); tsid = atoi(ans); printf("target class? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); if (isdigit(ans[0])) { tclass = atoi(ans); if (!tclass || tclass > policydb.p_classes.nprim) { @@ -720,7 +683,7 @@ break; case '1': printf("sid? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ssid = atoi(ans); ret = sepol_sid_to_context(ssid, &scontext, &scontext_len); @@ -741,7 +704,7 @@ break; case '2': printf("scontext? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); scontext_len = strlen(ans); ans[scontext_len - 1] = 0; ret = sepol_context_to_sid(ans, scontext_len, @@ -766,14 +729,14 @@ ch = ans[0]; printf("source sid? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ssid = atoi(ans); printf("target sid? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); tsid = atoi(ans); printf("object class? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); if (isdigit(ans[0])) { tclass = atoi(ans); if (!tclass || tclass > policydb.p_classes.nprim) { @@ -816,7 +779,7 @@ break; case '7': printf("pathname? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); pathlen = strlen(ans); ans[pathlen - 1] = 0; printf("%s: loading policy configuration from %s\n", argv[0], ans); @@ -854,7 +817,7 @@ break; case '8': printf("fs kdevname? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; sepol_fs_sid(ans, &ssid, &tsid); printf("fs_sid %d default_file_sid %d\n", @@ -862,7 +825,7 @@ break; case '9': printf("protocol? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; if (!strcmp(ans, "tcp") || !strcmp(ans, "TCP")) protocol = IPPROTO_TCP; @@ -873,14 +836,14 @@ break; } printf("port? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); port = atoi(ans); sepol_port_sid(0, 0, protocol, port, &ssid); printf("sid %d\n", ssid); break; case 'a': printf("netif name? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; sepol_netif_sid(ans, &ssid, &tsid); printf("if_sid %d default_msg_sid %d\n", @@ -893,7 +856,7 @@ struct in6_addr addr6; printf("protocol family? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; if (!strcasecmp(ans, "ipv4")) family = AF_INET; @@ -905,7 +868,7 @@ } printf("node address? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; if (family == AF_INET) { @@ -927,10 +890,10 @@ } case 'c': printf("fstype? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; - sepol_fs_use(ans, &ret, &ssid); - switch (ret) { + sepol_fs_use(ans, &uret, &ssid); + switch (uret) { case SECURITY_FS_USE_XATTR: printf("use xattr\n"); break; @@ -951,15 +914,15 @@ break; case 'd': printf("fstype? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; fstype = strdup(ans); printf("path? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; path = strdup(ans); printf("object class? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); if (isdigit(ans[0])) { tclass = atoi(ans); if (!tclass || tclass > policydb.p_classes.nprim) { @@ -983,12 +946,12 @@ break; case 'e': printf("from SID? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; ssid = atoi(ans); printf("username? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; ret = sepol_get_user_sids(ssid, ans, &sids, &nel); @@ -1019,7 +982,7 @@ break; case 'h': printf("name? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; name = malloc((strlen(ans) + 1) * sizeof(char)); @@ -1031,7 +994,7 @@ printf("state? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; if (atoi(ans)) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.h#7 (text+ko) ==== @@ -1,14 +1,14 @@ #ifndef _CHECKPOLICY_H_ #define _CHECKPOLICY_H_ -#include +#include typedef struct te_assert { ebitmap_t stypes; ebitmap_t ttypes; ebitmap_t tclasses; int self; - access_vector_t *avp; + sepol_access_vector_t *avp; unsigned long line; struct te_assert *next; } te_assert_t; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_parse.y#8 (text+ko) ==== @@ -3,11 +3,23 @@ * Author : Stephen Smalley, */ -/* Updated: David Caplan, +/* + * Updated: Trusted Computer Solutions, Inc. + * + * Support for enhanced MLS infrastructure. + * + * Updated: David Caplan, * * Added conditional policy language extensions * - * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * Updated: Joshua Brindle + * Karl MacMillan + * Jason Tang + * + * Added support for binary policy modules + * + * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. + * Copyright (C) 2003 - 2005 Tresys Technology, LLC * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, version 2. @@ -17,45 +29,60 @@ %{ #include +#include +#include #include +#include +#include +#include #include #include #include +#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "queue.h" #include "checkpolicy.h" +#include "module_compiler.h" /* * We need the following so we have a valid error return code in yacc * when we have a parse error for a conditional rule. We can't check * for NULL (ie 0) because that is a potentially valid return. */ -static cond_av_list_t *conditional_unused_error_code; -#define COND_ERR (cond_av_list_t *)&conditional_unused_error_code +static avrule_t *conditional_unused_error_code; +#define COND_ERR (avrule_t *)&conditional_unused_error_code #define TRUE 1 #define FALSE 0 policydb_t *policydbp; queue_t id_queue = 0; -unsigned int pass; +static unsigned int pass; char *curfile = 0; -unsigned int curline; +int mlspol = 0; extern unsigned long policydb_lineno; +extern unsigned long source_lineno; +extern unsigned int policydb_errors; +extern unsigned int policyvers; extern char yytext[]; +extern int yylex(void); extern int yywarn(char *msg); extern int yyerror(char *msg); -static char errormsg[255]; +#define ERRORMSG_LEN 255 +static char errormsg[ERRORMSG_LEN + 1] = {0}; static int insert_separator(int push); static int insert_id(char *id,int push); +static int id_has_dot(char *id); static int define_class(void); static int define_initial_sid(void); static int define_common_perms(void); @@ -64,10 +91,9 @@ static int define_dominance(void); static int define_category(void); static int define_level(void); -static int define_common_base(void); -static int define_av_base(void); static int define_attrib(void); static int define_typealias(void); +static int define_typeattribute(void); static int define_type(int alias); static int define_compute_type(int which); static int define_te_avtab(int which); @@ -75,16 +101,16 @@ static role_datum_t *merge_roles_dom(role_datum_t *r1,role_datum_t *r2); static role_datum_t *define_role_dom(role_datum_t *r); static int define_role_trans(void); +static int define_range_trans(void); static int define_role_allow(void); static int define_constraint(constraint_expr_t *expr); -static int define_bool(); -static int define_conditional(cond_expr_t *expr,cond_av_list_t *t_list, cond_av_list_t *f_list ); +static int define_validatetrans(constraint_expr_t *expr); +static int define_bool(void); +static int define_conditional(cond_expr_t *expr, avrule_t *t_list, avrule_t *f_list ); static cond_expr_t *define_cond_expr(uint32_t expr_type, void *arg1, void* arg2); -static cond_av_list_t *define_cond_pol_list(cond_av_list_t *avlist, cond_av_list_t *stmt); -static cond_av_list_t *define_cond_compute_type(int which); -static cond_av_list_t *define_cond_te_avtab(int which); -static cond_av_list_t *cond_list_append(cond_av_list_t *sl, avtab_key_t *key, avtab_datum_t *datum); -static void cond_reduce_insert_list(cond_av_list_t *new, cond_av_list_t **active, cond_av_list_t **inactive, int state ); +static avrule_t *define_cond_pol_list(avrule_t *avlist, avrule_t *stmt); +static avrule_t *define_cond_compute_type(int which); +static avrule_t *define_cond_te_avtab(int which); static uintptr_t define_cexpr(uint32_t expr_type, uintptr_t arg1, uintptr_t arg2); static int define_user(void); static int parse_security_context(context_struct_t *c); @@ -96,31 +122,38 @@ static int define_netif_context(void); static int define_ipv4_node_context(unsigned int addr, unsigned int mask); static int define_ipv6_node_context(void); + +typedef int (* require_func_t)(); + %} %union { unsigned int val; uintptr_t valptr; void *ptr; + require_func_t require_func; } -%type cond_expr cond_expr_prim cond_pol_list +%type cond_expr cond_expr_prim cond_pol_list cond_else %type cond_allow_def cond_auditallow_def cond_auditdeny_def cond_dontaudit_def %type cond_transition_def cond_te_avtab_def cond_rule_def %type role_def roles -%type cexpr cexpr_prim op roleop +%type cexpr cexpr_prim op role_mls_op %type ipv4_addr_def number +%type require_decl_def %token PATH %token CLONE %token COMMON %token CLASS %token CONSTRAIN +%token VALIDATETRANS %token INHERITS %token SID %token ROLE %token ROLES %token TYPEALIAS +%token TYPEATTRIBUTE %token TYPE %token TYPES %token ALIAS @@ -132,12 +165,15 @@ %token TYPE_MEMBER %token TYPE_CHANGE %token ROLE_TRANSITION +%token RANGE_TRANSITION %token SENSITIVITY %token DOMINANCE %token DOM DOMBY INCOMP %token CATEGORY %token LEVEL -%token RANGES +%token RANGE +%token MLSCONSTRAIN +%token MLSVALIDATETRANS %token USER %token NEVERALLOW %token ALLOW @@ -150,7 +186,7 @@ %token FSCON PORTCON NETIFCON NODECON %token FSUSEXATTR FSUSETASK FSUSETRANS %token GENFSCON -%token U1 U2 R1 R2 T1 T2 +%token U1 U2 U3 R1 R2 R3 T1 T2 T3 L1 L2 H1 H2 %token NOT AND OR XOR %token CTRUE CFALSE %token IDENTIFIER @@ -159,6 +195,7 @@ %token EQUALS %token NOTEQUAL %token IPV6_ADDR +%token MODULE VERSION_IDENTIFIER REQUIRE OPTIONAL %left OR %left XOR @@ -166,12 +203,17 @@ %right NOT %left EQUALS NOTEQUAL %% -policy : classes initial_sids access_vectors - { if (pass == 1) { if (policydb_index_classes(policydbp)) return -1; } } +policy : base_policy + | module_policy + ; +base_policy : { if (define_policy(pass, 0) == -1) return -1; } + classes initial_sids access_vectors + { if (pass == 1) { if (policydb_index_classes(policydbp)) return -1; } + else if (pass == 2) { if (policydb_index_others(NULL, policydbp, 0)) return -1; }} opt_mls te_rbac users opt_constraints { if (pass == 1) { if (policydb_index_bools(policydbp)) return -1;} - if (pass == 2) { if (policydb_index_others(policydbp, 1)) return -1;} } - initial_sid_contexts opt_fs_contexts fs_uses opt_genfs_contexts net_contexts + else if (pass == 2) { if (policydb_index_others(NULL, policydbp, 0)) return -1;}} + initial_sid_contexts opt_fs_contexts opt_fs_uses opt_genfs_contexts net_contexts ; classes : class_def | classes class_def @@ -209,7 +251,7 @@ opt_mls : mls | ; -mls : sensitivities dominance opt_categories levels base_perms +mls : sensitivities dominance opt_categories levels mlspolicy ; sensitivities : sensitivity_def | sensitivities sensitivity_def @@ -244,39 +286,26 @@ {if (define_level()) return -1;} | LEVEL identifier ';' {if (define_level()) return -1;} - ; -base_perms : opt_common_base av_base ; -opt_common_base : common_base - | - ; -common_base : common_base_def - | common_base common_base_def +mlspolicy : mlspolicy_decl + | mlspolicy mlspolicy_decl ; -common_base_def : COMMON identifier '{' perm_base_list '}' - {if (define_common_base()) return -1;} +mlspolicy_decl : mlsconstraint_def + | mlsvalidatetrans_def ; -av_base : av_base_def - | av_base av_base_def +mlsconstraint_def : MLSCONSTRAIN names names cexpr ';' + { if (define_constraint((constraint_expr_t*)$4)) return -1; } ; -av_base_def : CLASS identifier '{' perm_base_list '}' - {if (define_av_base()) return -1;} - | CLASS identifier - {if (define_av_base()) return -1;} +mlsvalidatetrans_def : MLSVALIDATETRANS names cexpr ';' + { if (define_validatetrans((constraint_expr_t*)$3)) return -1; } ; -perm_base_list : perm_base - | perm_base_list perm_base - ; -perm_base : identifier ':' identifier - {if (insert_separator(0)) return -1;} - | identifier ':' '{' identifier_list '}' - {if (insert_separator(0)) return -1;} - ; te_rbac : te_rbac_decl | te_rbac te_rbac_decl ; te_rbac_decl : te_decl | rbac_decl + | cond_stmt_def + | optional_block | ';' ; rbac_decl : role_type_def @@ -287,10 +316,11 @@ te_decl : attribute_def | type_def | typealias_def + | typeattribute_def | bool_def | transition_def + | range_trans_def | te_avtab_def - | cond_stmt_def ; attribute_def : ATTRIBUTE identifier ';' { if (define_attrib()) return -1;} @@ -303,6 +333,9 @@ typealias_def : TYPEALIAS identifier alias_def ';' {if (define_typealias()) return -1;} ; +typeattribute_def : TYPEATTRIBUTE identifier id_comma_list ';' + {if (define_typeattribute()) return -1;} + ; opt_attr_list : ',' id_comma_list | ; @@ -314,19 +347,13 @@ | CFALSE { if (insert_id("F",0)) return -1; } ; -cond_stmt_def : IF cond_expr '{' cond_pol_list '}' - { if (pass == 2) { if (define_conditional((cond_expr_t*)$2, (cond_av_list_t*)$4,(cond_av_list_t*) 0) < 0) return -1; }} - | IF cond_expr '{' cond_pol_list '}' ELSE '{' cond_pol_list '}' - { if (pass == 2) { if (define_conditional((cond_expr_t*)$2,(cond_av_list_t*)$4,(cond_av_list_t*)$8) < 0 ) return -1; }} - | IF cond_expr '{' cond_pol_list '}' ELSE '{' '}' - { if (pass == 2) { if (define_conditional((cond_expr_t*)$2,(cond_av_list_t*)$4,(cond_av_list_t*) 0) < 0 ) return -1; }} - | IF cond_expr '{' '}' ELSE '{' cond_pol_list '}' - { if (pass == 2) { if (define_conditional((cond_expr_t*)$2,(cond_av_list_t*) 0,(cond_av_list_t*) $7) < 0 ) return -1; }} - | IF cond_expr '{' '}' ELSE '{' '}' >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 19:01:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 186EE16B468 for ; Tue, 16 May 2006 19:01:24 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E548743D78 for ; Tue, 16 May 2006 19:01:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7C19946CD8 for ; Tue, 16 May 2006 15:01:12 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 355C9560EF; Tue, 16 May 2006 19:01:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D36B16B425; Tue, 16 May 2006 19:01:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 653C216B356 for ; Tue, 16 May 2006 19:01:09 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A591943D6E for ; Tue, 16 May 2006 19:01:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJ0otV074127 for ; Tue, 16 May 2006 19:00:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJ0o4o074124 for perforce@freebsd.org; Tue, 16 May 2006 19:00:50 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:00:50 GMT Message-Id: <200605161900.k4GJ0o4o074124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97279 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 19:01:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=97279 Change 97279 by millert@millert_p4 on 2006/05/16 18:59:58 Remove old SEBSD versions of checkpolicy and setfiles. Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/Makefile#15 edit .. //depot/projects/trustedbsd/sebsd/sbin/sebsd_checkpolicy/Makefile#4 delete .. //depot/projects/trustedbsd/sebsd/sbin/sebsd_setfiles/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/sbin/sebsd_setfiles/setfiles.c#3 delete Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/Makefile#15 (text+ko) ==== @@ -83,8 +83,6 @@ rtsol \ savecore \ ${_sconfig} \ - ${_sebsd_checkpolicy} \ - ${_sebsd_setfiles} \ setfsmac \ setkey \ shutdown \ @@ -114,11 +112,6 @@ _pflogd= pflogd .endif -.if !defined(NO_SEBSD) -_sebsd_checkpolicy= sebsd_checkpolicy -_sebsd_setfiles= sebsd_setfiles -.endif - .if ${MK_INET6} != "no" _ip6fw= ip6fw _ping6= ping6 From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 19:03:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E66716B437 for ; Tue, 16 May 2006 19:03:18 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B35BF43D48 for ; Tue, 16 May 2006 19:03:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id ADE6E46CE1 for ; Tue, 16 May 2006 15:03:15 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 490BE55555; Tue, 16 May 2006 19:03:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C8A016A945; Tue, 16 May 2006 19:03:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C2ED16A93A for ; Tue, 16 May 2006 19:03:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B759C43D45 for ; Tue, 16 May 2006 19:03:10 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJ2rIX074258 for ; Tue, 16 May 2006 19:02:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJ2rmc074255 for perforce@freebsd.org; Tue, 16 May 2006 19:02:53 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:02:53 GMT Message-Id: <200605161902.k4GJ2rmc074255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97280 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 19:03:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=97280 Change 97280 by millert@millert_p4 on 2006/05/16 19:02:20 Build new checkpolicy Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.bin/Makefile#13 edit .. //depot/projects/trustedbsd/sebsd/usr.bin/checkpolicy/Makefile#1 add Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.bin/Makefile#13 (text+ko) ==== @@ -32,6 +32,7 @@ ${_catman} \ chat \ checknr \ + ${_checkpolicy} \ ${_chkey} \ chpass \ cksum \ @@ -326,4 +327,8 @@ _smbutil= smbutil .endif +.if !defined(NO_SEBSD) +_checkpolicy= checkpolicy +.endif + .include From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 19:09:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80AC316A8DF for ; Tue, 16 May 2006 19:09:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A573543D73 for ; Tue, 16 May 2006 19:09:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3F36546CDC for ; Tue, 16 May 2006 15:09:11 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1FED856424; Tue, 16 May 2006 19:08:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 50EC216A86E; Tue, 16 May 2006 19:08:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A6B916A7FD for ; Tue, 16 May 2006 19:08:29 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A364A43D69 for ; Tue, 16 May 2006 19:08:19 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJ824L075640 for ; Tue, 16 May 2006 19:08:02 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJ80gx075629 for perforce@freebsd.org; Tue, 16 May 2006 19:08:00 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:08:00 GMT Message-Id: <200605161908.k4GJ80gx075629@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97281 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 19:09:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=97281 Change 97281 by millert@millert_p4 on 2006/05/16 19:07:51 A port of libselinux 1.30 from sourceforge. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/ChangeLog#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/LICENSE#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/VERSION#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/av_inherit.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/av_perm_to_string.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/av_permissions.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/avc.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/class_to_string.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/common_perm_to_string.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/context.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/flask.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/get_context_list.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/get_default_type.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/selinux.h#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/libselinux.spec#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_add_callback.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_audit.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_av_stats.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_cache_stats.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_cleanup.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_context_to_sid.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_destroy.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_entry_ref_init.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_has_perm.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_has_perm_noaudit.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_init.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_reset.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_sid_stats.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/avc_sid_to_context.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/checkPasswdAccess.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/context_free.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/context_new.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/context_range_get.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/context_range_set.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/context_role_get.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/context_role_set.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/context_type_get.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/context_type_set.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/context_user_get.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/context_user_set.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/freecon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/freeconary.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/fsetfilecon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/get_default_context.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/get_default_context_with_level.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/get_default_context_with_role.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/get_default_context_with_rolelevel.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/get_ordered_context_list.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/get_ordered_context_list_with_level.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getcon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getexeccon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getfilecon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getfscreatecon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getpeercon.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getpidcon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getprevcon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/getseuserbyname.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/is_context_customizable.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/is_selinux_enabled.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/lsetfilecon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/manual_user_enter_context.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/matchmediacon.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/matchpathcon.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/query_user_context.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/rpm_execcon.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_check_context.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_commit_booleans.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_compute_av.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_compute_create.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_compute_relabel.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_compute_user.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_get_boolean_active.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_get_boolean_names.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_get_boolean_pending.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_getenforce.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_load_booleans.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_load_policy.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_policyvers.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_set_boolean.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/security_setenforce.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_binary_policy_path.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_booleans_path.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_contexts_path.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_default_context_path.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_failsafe_context_path.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_file_context_path.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_getenforcemode.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_media_context_path.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_policy_root.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_policyroot.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_removable_context_path.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_user_contexts_path.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/set_matchpathcon_printf.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/setcon.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/setexeccon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/setfilecon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/setfscreatecon.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/sidget.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/sidput.3#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/avcstat.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/booleans.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/getenforce.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/getsebool.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/matchpathcon.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/selinux.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/selinuxenabled.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/setenforce.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/setsebool.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/togglesebool.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/av_inherit.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/av_perm_to_string.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/avc.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/avc_internal.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/avc_internal.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/avc_sidtab.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/avc_sidtab.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/booleans.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/canonicalize_context.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/checkAccess.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/check_context.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/class_to_string.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/common_perm_to_string.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compat_file_path.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compute_av.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compute_create.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compute_member.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compute_relabel.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/compute_user.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/context.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/context_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/disable.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/dso.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/enabled.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/fgetfilecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/file_path_suffixes.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/freecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/freeconary.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/fsetfilecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/get_context_list.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/get_context_list_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/get_default_type.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/get_default_type_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getcon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getenforce.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getexeccon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getfilecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getfscreatecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getpeercon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getpidcon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/getprevcon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/helpers.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/init.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/is_customizable_type.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/lgetfilecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/load_policy.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/lsetfilecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/matchmediacon.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/matchpathcon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/policy.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/policyvers.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/query_user_context.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/rpm.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/sebsd_config.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/sebsd_config.c.NEW#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinux.py#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinux_config.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinux_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinux_netlink.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinuxswig.i#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/selinuxswig_wrap.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setcon.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setenforce.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setexeccon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setfilecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/setfscreatecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/seusers.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/trans.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/avcstat.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/compute_av.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/compute_create.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/compute_member.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/compute_relabel.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/compute_user.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/deftype.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/execcon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getcon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getconlist.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getenforce.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getenforcemode.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getfilecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getpidcon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getsebool.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getseuser.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/matchpathcon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/mkdircon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/policyvers.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/selinuxconfig.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/selinuxdisable.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/selinuxenabled.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/setenforce.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/setfilecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/setsebool.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/togglesebool.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,359 @@ +1.30 2006-03-14 + * Updated version for release. + +1.29.8 2006-02-27 + * Altered rpm_execcon fallback logic for permissive mode to also + handle case where /selinux/enforce is not available. + +1.29.7 2006-01-20 + * Merged install-pywrap Makefile patch from Joshua Brindle. + +1.29.6 2006-01-18 + * Merged pywrap Makefile patch from Dan Walsh. + +1.29.5 2006-01-11 + * Added getseuser test program. + +1.29.4 2006-01-06 + * Added format attribute to myprintf in matchpathcon.c and + removed obsoleted rootlen variable in init_selinux_config(). + +1.29.3 2006-01-04 + * Merged several fixes and improvements from Ulrich Drepper + (Red Hat), including: + - corrected use of getline + - further calls to __fsetlocking for local files + - use of strdupa and asprintf + - proper handling of dirent in booleans code + - use of -z relro + - several other optimizations + * Merged getpidcon python wrapper from Dan Walsh (Red Hat). + +1.29.2 2005-12-14 + * Merged call to finish_context_translations from Dan Walsh. + This eliminates a memory leak from failing to release memory + allocated by libsetrans. + +1.29.1 2005-12-08 + * Merged patch for swig interfaces from Dan Walsh. + +1.28 2005-12-07 + * Updated version for release. + +1.27.28 2005-12-01 + * Added MATCHPATHCON_VALIDATE flag for set_matchpathcon_flags() and + modified matchpathcon implementation to make context validation/ + canonicalization optional at matchpathcon_init time, deferring it + to a successful matchpathcon by default unless the new flag is set + by the caller. + +1.27.27 2005-12-01 + * Added matchpathcon_init_prefix() interface, and + reworked matchpathcon implementation to support selective + loading of file contexts entries based on prefix matching + between the pathname regex stems and the specified path + prefix (stem must be a prefix of the specified path prefix). + +1.27.26 2005-11-29 + * Merged getsebool patch from Dan Walsh. + +1.27.25 2005-11-29 + * Added -f file_contexts option to matchpathcon util. + Fixed warning message in matchpathcon_init(). + +1.27.24 2005-11-29 + * Merged Makefile python definitions patch from Dan Walsh. + +1.27.23 2005-11-28 + * Merged swigify patch from Dan Walsh. + +1.27.22 2005-11-15 + * Merged make failure in rpm_execcon non-fatal in permissive mode + patch from Ivan Gyurdiev. + +1.27.21 2005-11-08 + * Added MATCHPATHCON_NOTRANS flag for set_matchpathcon_flags() + and modified matchpathcon_init() to skip context translation + if it is set by the caller. + +1.27.20 2005-11-07 + * Added security_canonicalize_context() interface and + set_matchpathcon_canoncon() interface for obtaining + canonical contexts. Changed matchpathcon internals + to obtain canonical contexts by default. Provided + fallback for kernels that lack extended selinuxfs context + interface. + +1.27.19 2005-11-04 + * Merged seusers parser changes from Ivan Gyurdiev. + * Merged setsebool to libsemanage patch from Ivan Gyurdiev. + * Changed seusers parser to reject empty fields. + +1.27.18 2005-11-03 + * Merged seusers empty level handling patch from Jonathan Kim (TCS). + +1.27.17 2005-10-27 + * Changed default entry for seusers to use __default__ to avoid + ambiguity with users named "default". + +1.27.16 2005-10-27 + * Fixed init_selinux_config() handling of missing /etc/selinux/config + or missing SELINUXTYPE= definition. + * Merged selinux_translations_path() patch from Dan Walsh. + +1.27.15 2005-10-25 + * Added hidden_proto/def for get_default_context_with_role. + +1.27.14 2005-10-25 + * Merged selinux_path() and selinux_homedir_context_path() + functions from Joshua Brindle. + +1.27.13 2005-10-19 + * Merged fixes for make DESTDIR= builds from Joshua Brindle. + +1.27.12 2005-10-18 + * Merged get_default_context_with_rolelevel and man pages from + Dan Walsh (Red Hat). + +1.27.11 2005-10-18 + * Updated call to sepol_policydb_to_image for sepol changes. + +1.27.10 2005-10-17 + * Changed getseuserbyname to ignore empty lines and to handle + no matching entry in the same manner as no seusers file. + +1.27.9 2005-10-13 + * Changed selinux_mkload_policy to try downgrading the + latest policy version available to the kernel-supported version. + +1.27.8 2005-10-11 + * Changed selinux_mkload_policy to fall back to the maximum + policy version supported by libsepol if the kernel policy version + falls outside of the supported range. + +1.27.7 2005-10-06 + * Changed getseuserbyname to fall back to the Linux username and + NULL level if seusers config file doesn't exist unless + REQUIRESEUSERS=1 is set in /etc/selinux/config. + * Moved seusers.conf under $SELINUXTYPE and renamed to seusers. + +1.27.6 2005-10-06 + * Added selinux_init_load_policy() function as an even higher level + interface for the initial policy load by /sbin/init. This obsoletes + the load_policy() function in the sysvinit-selinux.patch. + +1.27.5 2005-10-06 + * Added selinux_mkload_policy() function as a higher level interface + for loading policy than the security_load_policy() interface. + +1.27.4 2005-10-05 + * Merged fix for matchpathcon (regcomp error checking) from Johan + Fischer. Also added use of regerror to obtain the error string + for inclusion in the error message. + +1.27.3 2005-10-03 + * Changed getseuserbyname to not require (and ignore if present) + the MLS level in seusers.conf if MLS is disabled, setting *level + to NULL in this case. + +1.27.2 2005-09-30 + * Merged getseuserbyname patch from Dan Walsh. + +1.27.1 2005-09-19 + * Merged STRIP_LEVEL patch for matchpathcon from Dan Walsh. + This allows file_contexts with MLS fields to be processed on + non-MLS-enabled systems with policies that are otherwise + identical (e.g. same type definitions). + * Merged get_ordered_context_list_with_level() function from + Dan Walsh, and added get_default_context_with_level(). + This allows MLS level selection for users other than the + default level. + +1.26 2005-09-06 + * Updated version for release. + +1.25.7 2005-09-01 + * Merged modified form of patch to avoid dlopen/dlclose by + the static libselinux from Dan Walsh. Users of the static libselinux + will not have any context translation by default. + +1.25.6 2005-08-31 + * Added public functions to export context translation to + users of libselinux (selinux_trans_to_raw_context, + selinux_raw_to_trans_context). + +1.25.5 2005-08-26 + * Remove special definition for context_range_set; use + common code. + +1.25.4 2005-08-25 + * Hid translation-related symbols entirely and ensured that + raw functions have hidden definitions for internal use. + * Allowed setting NULL via context_set* functions. + * Allowed whitespace in MLS component of context. + * Changed rpm_execcon to use translated functions to workaround + lack of MLS level on upgraded systems. + +1.25.3 2005-08-23 + * Merged context translation patch, originally by TCS, + with modifications by Dan Walsh (Red Hat). + +1.25.2 2005-08-11 + * Merged several fixes for error handling paths in the + AVC sidtab, matchpathcon, booleans, context, and get_context_list + code from Serge Hallyn (IBM). Bugs found by Coverity. + +1.25.1 2005-08-10 + * Removed setupns; migrated to pam. + * Merged patches to rename checkPasswdAccess() from Joshua Brindle. + Original symbol is temporarily retained for compatibility until + all callers are updated. + +1.24 2005-06-20 + * Updated version for release. + +1.23.12 2005-06-13 + * Merged security_setupns() from Chad Sellers. + +1.23.11 2005-05-19 + * Merged avcstat and selinux man page from Dan Walsh. + * Changed security_load_booleans to process booleans.local + even if booleans file doesn't exist. + +1.23.10 2005-04-29 + * Merged set_selinuxmnt patch from Bill Nottingham (Red Hat). + +1.23.9 2005-04-26 + * Rewrote get_ordered_context_list and helpers, including + changing logic to allow variable MLS fields. + +1.23.8 2005-04-25 + * Merged matchpathcon and man page patch from Dan Walsh. + +1.23.7 2005-04-12 + * Changed boolean functions to return -1 with errno ENOENT + rather than assert on a NULL selinux_mnt (i.e. selinuxfs not + mounted). + +1.23.6 2005-04-08 + * Fixed bug in matchpathcon_filespec_destroy. + +1.23.5 2005-04-05 + * Fixed bug in rpm_execcon error handling path. + +1.23.4 2005-04-04 + * Merged fix for set_matchpathcon* functions from Andreas Steinmetz. + * Merged fix for getconlist utility from Andreas Steinmetz. + +1.23.3 2005-03-29 + * Merged security_set_boolean_list patch from Dan Walsh. + This introduces booleans.local support for setsebool. + +1.23.2 2005-03-17 + * Merged destructors patch from Tomas Mraz. + +1.23.1 2005-03-16 + * Added set_matchpathcon_flags() function for setting flags + controlling operation of matchpathcon. MATCHPATHCON_BASEONLY + means only process the base file_contexts file, not + file_contexts.homedirs or file_contexts.local, and is for use by + setfiles -c. + * Updated matchpathcon.3 man page. + +1.22 2005-03-09 + * Updated version for release. + +1.21.13 2005-03-08 + * Fixed bug in matchpathcon_filespec_add() - failure to clear fl_head. + +1.21.12 2005-03-01 + * Changed matchpathcon_common to ignore any non-format bits in the mode. + +1.21.11 2005-02-22 + * Merged several fixes from Ulrich Drepper. + +1.21.10 2005-02-17 + * Merged matchpathcon patch for file_contexts.homedir from Dan Walsh. + * Added selinux_users_path() for path to directory containing + system.users and local.users. + +1.21.9 2005-02-09 + * Changed relabel Makefile target to use restorecon. + +1.21.8 2005-02-07 + * Regenerated av_permissions.h. + +1.21.7 2005-02-01 + * Modified avc_dump_av to explicitly check for any permissions that + cannot be mapped to string names and display them as a hex value. + +1.21.6 2005-01-31 + * Regenerated av_permissions.h. + +1.21.5 2005-01-28 + * Generalized matchpathcon internals, exported more interfaces, + and moved additional code from setfiles into libselinux so that + setfiles can directly use matchpathcon. + +1.21.4 2005-01-27 + * Prevent overflow of spec array in matchpathcon. + +1.21.3 2005-01-26 + * Fixed several uses of internal functions to avoid relocations. + * Changed rpm_execcon to check is_selinux_enabled() and fallback to + a regular execve if not enabled (or unable to determine due to a lack + of /proc, e.g. chroot'd environment). + + +1.21.2 2005-01-24 + * Merged minor fix for avcstat from Dan Walsh. + +1.21.1 2005-01-19 + * Merged patch from Dan Walsh, including: + - new is_context_customizable function + - changed matchpathcon to also use file_contexts.local if present + - man page cleanups + +1.20 2005-01-04 + * Changed matchpathcon to return -1 with errno ENOENT for + <> entries, and also for an empty file_contexts configuration. + * Removed some trivial utils that were not useful or redundant. + * Changed BINDIR default to /usr/sbin to match change in Fedora. + * Added security_compute_member. + * Added man page for setcon. + * Merged more man pages from Dan Walsh. + * Merged avcstat from James Morris. + * Merged build fix for mips from Manoj Srivastava. + * Merged C++ support from John Ramsdell of MITRE. + * Merged setcon() function from Darrel Goeddel of TCS. + * Merged setsebool/togglesebool enhancement from Steve Grubb. + * Merged cleanup patches from Steve Grubb. + +1.18 2004-11-01 + * Merged cleanup patches from Steve Grubb. + * Added rpm_execcon. + * Merged setenforce and removable context patch from Dan Walsh. + * Merged build fix for alpha from Ulrich Drepper. + * Removed copyright/license from selinux_netlink.h - definitions only. + * Merged matchmediacon from Dan Walsh. + * Regenerated headers for new nscd permissions. + * Added get_default_context_with_role. + * Added set_matchpathcon_printf. + * Reworked av_inherit.h to allow easier re-use by kernel. + * Changed avc_has_perm_noaudit to not fail on netlink errors. + * Changed avc netlink code to check pid based on patch by Steve Grubb. + * Merged second optimization patch from Ulrich Drepper. + * Changed matchpathcon to skip invalid file_contexts entries. + * Made string tables private to libselinux. + * Merged strcat->stpcpy patch from Ulrich Drepper. + * Merged matchpathcon man page from Dan Walsh. + * Merged patch to eliminate PLTs for local syms from Ulrich Drepper. + * Autobind netlink socket. + * Dropped compatibility code from security_compute_user. + * Merged fix for context_range_set from Chad Hanson. + * Merged allocation failure checking patch from Chad Hanson. + * Merged avc netlink error message patch from Colin Walters. + 1.16 2004-08-19 * Regenerated headers for nscd class. * Merged man pages from Dan Walsh. ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/LICENSE#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/Makefile#2 (text+ko) ==== @@ -2,13 +2,20 @@ $(MAKE) -C src $(MAKE) -C utils +pywrap: + $(MAKE) -C src pywrap + install: $(MAKE) -C include install $(MAKE) -C src install $(MAKE) -C utils install $(MAKE) -C man install -relabel: +install-pywrap: + $(MAKE) -C src install-pywrap + +relabel: + $(MAKE) -C src relabel clean: $(MAKE) -C src clean ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.16 +1.30 ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/av_inherit.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/av_perm_to_string.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/av_permissions.h#2 (text+ko) ==== @@ -1,6 +1,4 @@ /* This file is automatically generated. Do not edit. */ -/* FLASK */ - #define COMMON_FILE__IOCTL 0x00000001UL #define COMMON_FILE__READ 0x00000002UL #define COMMON_FILE__WRITE 0x00000004UL @@ -107,6 +105,7 @@ #define FILE__EXECUTE_NO_TRANS 0x00020000UL #define FILE__ENTRYPOINT 0x00040000UL +#define FILE__EXECMOD 0x00080000UL #define LNK_FILE__IOCTL 0x00000001UL #define LNK_FILE__READ 0x00000002UL @@ -144,6 +143,10 @@ #define CHR_FILE__QUOTAON 0x00008000UL #define CHR_FILE__MOUNTON 0x00010000UL +#define CHR_FILE__EXECUTE_NO_TRANS 0x00020000UL +#define CHR_FILE__ENTRYPOINT 0x00040000UL +#define CHR_FILE__EXECMOD 0x00080000UL + #define BLK_FILE__IOCTL 0x00000001UL #define BLK_FILE__READ 0x00000002UL #define BLK_FILE__WRITE 0x00000004UL @@ -458,6 +461,9 @@ #define PROCESS__SIGINH 0x00100000UL #define PROCESS__SETRLIMIT 0x00200000UL #define PROCESS__RLIMITINH 0x00400000UL +#define PROCESS__DYNTRANSITION 0x00800000UL +#define PROCESS__SETCURRENT 0x01000000UL +#define PROCESS__EXECMEM 0x02000000UL #define IPC__CREATE 0x00000001UL #define IPC__DESTROY 0x00000002UL @@ -515,6 +521,7 @@ #define SECURITY__COMPUTE_USER 0x00000040UL #define SECURITY__SETENFORCE 0x00000080UL #define SECURITY__SETBOOL 0x00000100UL +#define SECURITY__SETSECPARAM 0x00000200UL #define SYSTEM__IPC_INFO 0x00000001UL #define SYSTEM__SYSLOG_READ 0x00000002UL @@ -550,6 +557,8 @@ #define CAPABILITY__SYS_TTY_CONFIG 0x04000000UL #define CAPABILITY__MKNOD 0x08000000UL #define CAPABILITY__LEASE 0x10000000UL +#define CAPABILITY__AUDIT_WRITE 0x20000000UL +#define CAPABILITY__AUDIT_CONTROL 0x40000000UL #define PASSWD__PASSWD 0x00000001UL #define PASSWD__CHFN 0x00000002UL @@ -887,6 +896,10 @@ #define NSCD__GETHOST 0x00000004UL #define NSCD__GETSTAT 0x00000008UL #define NSCD__ADMIN 0x00000010UL +#define NSCD__SHMEMPWD 0x00000020UL +#define NSCD__SHMEMGRP 0x00000040UL +#define NSCD__SHMEMHOST 0x00000080UL +#define ASSOCIATION__SENDTO 0x00000001UL +#define ASSOCIATION__RECVFROM 0x00000002UL -/* FLASK */ ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/avc.h#3 (text+ko) ==== @@ -11,6 +11,10 @@ #include #include +#ifdef __cplusplus +extern "C" +{ +#endif /* * SID format and operations @@ -362,4 +366,8 @@ */ void avc_sid_stats(void); +#ifdef __cplusplus +} +#endif + #endif /* _SELINUX_AVC_H_ */ ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/class_to_string.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/common_perm_to_string.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/context.h#2 (text+ko) ==== @@ -1,6 +1,11 @@ #ifndef _SELINUX_CONTEXT_H_ #define _SELINUX_CONTEXT_H_ +#ifdef __cplusplus +extern "C" +{ +#endif + /* * Functions to deal with security contexts in user space. */ @@ -40,4 +45,8 @@ extern int context_role_set(context_t,const char*); extern int context_user_set(context_t,const char*); +#ifdef __cplusplus +} +#endif + #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/flask.h#2 (text+ko) ==== @@ -58,6 +58,7 @@ #define SECCLASS_NETLINK_DNRT_SOCKET 51 #define SECCLASS_DBUS 52 #define SECCLASS_NSCD 53 +#define SECCLASS_ASSOCIATION 54 /* * Security identifier indices for initial entities ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/get_context_list.h#2 (text+ko) ==== @@ -3,6 +3,11 @@ #include +#ifdef __cplusplus +extern "C" +{ +#endif + #define SELINUX_DEFAULTUSER "user_u" /* Get an ordered list of authorized security contexts for a user session @@ -16,6 +21,13 @@ security_context_t fromcon, security_context_t **list); +/* As above, but use the provided MLS level rather than the + default level for the user. */ +int get_ordered_context_list_with_level (const char *user, + const char *level, + security_context_t fromcon, + security_context_t **list); + /* Get the default security context for a user session for 'user' spawned by 'fromcon' and set *newcon to refer to it. The context will be one of those authorized by the policy, but the selection @@ -27,6 +39,30 @@ security_context_t fromcon, security_context_t *newcon); +/* As above, but use the provided MLS level rather than the + default level for the user. */ +int get_default_context_with_level(const char *user, + const char *level, + security_context_t fromcon, + security_context_t *newcon); + +/* Same as get_default_context, but only return a context + that has the specified role. If no reachable context exists + for the user with that role, then return -1. */ +int get_default_context_with_role(const char* user, + const char *role, + security_context_t fromcon, + security_context_t *newcon); + +/* Same as get_default_context, but only return a context + that has the specified role and level. If no reachable context exists + for the user with that role, then return -1. */ +int get_default_context_with_rolelevel(const char* user, + const char *level, + const char *role, + security_context_t fromcon, + security_context_t *newcon); + /* Given a list of authorized security contexts for the user, query the user to select one and set *newcon to refer to it. Caller must free via freecon. @@ -41,4 +77,8 @@ extern int manual_user_enter_context(const char *user, security_context_t *newcon); +#ifdef __cplusplus +} +#endif + #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/get_default_type.h#2 (text+ko) ==== @@ -5,12 +5,21 @@ #ifndef _SELINUX_GET_DEFAULT_TYPE_H_ #define _SELINUX_GET_DEFAULT_TYPE_H_ +#ifdef __cplusplus +extern "C" +{ +#endif + /* Return path to default type file. */ -char *selinux_default_type_path(void); +const char *selinux_default_type_path(void); /* Get the default type (domain) for 'role' and set 'type' to refer to it. Caller must free via free(). Return 0 on success or -1 otherwise. */ int get_default_type (const char* role, char** type); +#ifdef __cplusplus +} +#endif + #endif /* ifndef _GET_DEFAULT_TYPE_H_ */ ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/selinux.h#4 (text+ko) ==== @@ -2,17 +2,20 @@ #define _SELINUX_H_ #include +#include -#define _LINUX_FLASK_TYPES_H_ -typedef unsigned short security_class_t; -typedef unsigned int access_vector_t; -typedef char *security_context_t; +#ifdef __cplusplus +extern "C" +{ +#endif /* Return 1 if we are running on a SELinux kernel, or 0 if not or -1 if we get an error. */ extern int is_selinux_enabled(void); /* Return 1 if we are running on a SELinux MLS kernel, or 0 otherwise. */ extern int is_selinux_mls_enabled(void); +typedef char* security_context_t; + /* Free the memory allocated for a context by any of the below get* calls. */ extern void freecon(security_context_t con); @@ -24,32 +27,55 @@ /* Get current context, and set *con to refer to it. Caller must free via freecon. */ extern int getcon(security_context_t *con); +extern int getcon_raw(security_context_t *con); + +/* Set the current security context to con. + Note that use of this function requires that the entire application + be trusted to maintain any desired separation between the old and new + security contexts, unlike exec-based transitions performed via setexeccon. + When possible, decompose your application and use setexeccon()+execve() + instead. Note that the application may lose access to its open descriptors + as a result of a setcon() unless policy allows it to use descriptors opened + by the old context. */ +extern int setcon(security_context_t con); +extern int setcon_raw(security_context_t con); /* Get context of process identified by pid, and - set *con to refer to it. Caller must free via freecon. */ -extern int getpidcon(pid_t pid, security_context_t *con); + set *con to refer to it. Caller must free via freecon. + This has not been ported to SEBSD yet. */ +//extern int getpidcon(pid_t pid, security_context_t *con); +//extern int getpidcon_raw(pid_t pid, security_context_t *con); /* Get previous context (prior to last exec), and set *con to refer to it. - Caller must free via freecon. */ -extern int getprevcon(security_context_t *con); + Caller must free via freecon. + This has not been ported to SEBSD yet.*/ +//extern int getprevcon(security_context_t *con); +//extern int getprevcon_raw(security_context_t *con); /* Get exec context, and set *con to refer to it. Sets *con to NULL if no exec context has been set, i.e. using default. If non-NULL, caller must free via freecon. */ extern int getexeccon(security_context_t *con); +extern int getexeccon_raw(security_context_t *con); /* Set exec security context for the next execve. - Call with NULL if you want to reset to the default. */ -extern int setexeccon(security_context_t con); + Call with NULL if you want to reset to the default. + This is not yet supported by SEBSD. */ +//extern int setexeccon(security_context_t con); +//extern int setexeccon_raw(security_context_t con); /* Get fscreate context, and set *con to refer to it. Sets *con to NULL if no fs create context has been set, i.e. using default. - If non-NULL, caller must free via freecon. */ -extern int getfscreatecon(security_context_t *con); + If non-NULL, caller must free via freecon. + This has not been ported to SEBSD yet. */ +//extern int getfscreatecon(security_context_t *con); +//extern int getfscreatecon_raw(security_context_t *con); /* Set the fscreate security context for subsequent file creations. - Call with NULL if you want to reset to the default. */ -extern int setfscreatecon(security_context_t context); + Call with NULL if you want to reset to the default. + This has not been ported to SEBSD yet. */ +//extern int setfscreatecon(security_context_t context); +//extern int setfscreatecon_raw(security_context_t context); /* Wrappers for the xattr API. */ @@ -57,13 +83,19 @@ /* Get file context, and set *con to refer to it. Caller must free via freecon. */ extern int getfilecon(const char *path, security_context_t *con); +extern int getfilecon_raw(const char *path, security_context_t *con); extern int lgetfilecon(const char *path, security_context_t *con); +extern int lgetfilecon_raw(const char *path, security_context_t *con); extern int fgetfilecon(int fd, security_context_t *con); +extern int fgetfilecon_raw(int fd, security_context_t *con); /* Set file context */ extern int setfilecon(const char *path, security_context_t con); +extern int setfilecon_raw(const char *path, security_context_t con); extern int lsetfilecon(const char *path, security_context_t con); +extern int lsetfilecon_raw(const char *path, security_context_t con); extern int fsetfilecon(int fd, security_context_t con); +extern int fsetfilecon_raw(int fd, security_context_t con); /* Wrappers for the socket API */ @@ -71,10 +103,14 @@ /* Get context of peer socket, and set *con to refer to it. Caller must free via freecon. */ extern int getpeercon(int fd, security_context_t *con); +extern int getpeercon_raw(int fd, security_context_t *con); /* Wrappers for the selinuxfs (policy) API. */ +typedef unsigned int access_vector_t; +typedef unsigned short security_class_t; + struct av_decision { access_vector_t allowed; access_vector_t decided; @@ -89,13 +125,22 @@ security_class_t tclass, access_vector_t requested, struct av_decision *avd); +extern int security_compute_av_raw(security_context_t scon, + security_context_t tcon, + security_class_t tclass, + access_vector_t requested, + struct av_decision *avd); /* Compute a labeling decision and set *newcon to refer to it. Caller must free via freecon. */ -extern int security_compute_create(security_context_t scon, - security_context_t tcon, - security_class_t tclass, - security_context_t *newcon); +//extern int security_compute_create(security_context_t scon, +// security_context_t tcon, +// security_class_t tclass, +// security_context_t *newcon); +//extern int security_compute_create_raw(security_context_t scon, +// security_context_t tcon, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 19:12:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E781616AF45 for ; Tue, 16 May 2006 19:12:52 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF24143D5F for ; Tue, 16 May 2006 19:12:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CD26046CBA for ; Tue, 16 May 2006 15:12:43 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 03CB8554A3; Tue, 16 May 2006 19:12:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C8EE16AA0B; Tue, 16 May 2006 19:12:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B862C16A95B for ; Tue, 16 May 2006 19:12:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 203F943D46 for ; Tue, 16 May 2006 19:12:25 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJC855076738 for ; Tue, 16 May 2006 19:12:08 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJC7dw076735 for perforce@freebsd.org; Tue, 16 May 2006 19:12:07 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:12:07 GMT Message-Id: <200605161912.k4GJC7dw076735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97282 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 19:12:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=97282 Change 97282 by millert@millert_p4 on 2006/05/16 19:11:56 A port of libsemanage 1.6 to SEBSD Obtained from: selinux.sourceforge.net Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/COPYING#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/ChangeLog#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/VERSION#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/boolean_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/booleans_active.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/booleans_local.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/booleans_policy.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/context_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/debug.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/fcontext_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/fcontexts_local.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/fcontexts_policy.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/handle.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/iface_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/interfaces_local.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/interfaces_policy.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/modules.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/node_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/nodes_local.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/nodes_policy.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/port_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/ports_local.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/ports_policy.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/semanage.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/seuser_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/seusers_local.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/seusers_policy.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/user_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/users_local.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/include/semanage/users_policy.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_count.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_count_active.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_count_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_del_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_exists.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_exists_active.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_exists_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_iterate.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_iterate_active.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_iterate_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_list.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_list_active.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_list_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_modify_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_query.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_query_active.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_query_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_bool_set_active.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_count.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_count_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_del_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_exists.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_exists_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_iterate.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_iterate_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_list.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_list_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_modify_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_query.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_fcontext_query_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_count.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_count_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_del_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_exists.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_exists_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_iterate.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_iterate_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_list.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_list_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_modify_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_query.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_iface_query_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_count.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_count_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_del_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_exists.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_exists_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_iterate.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_iterate_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_list.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_list_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_modify_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_query.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_node_query_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_count.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_count_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_del_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_exists.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_exists_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_iterate.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_iterate_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_list.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_list_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_modify_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_query.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_port_query_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_count.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_count_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_del_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_exists.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_exists_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_iterate.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_iterate_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_list.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_list_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_modify_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_query.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_seuser_query_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_count.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_count_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_del_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_exists.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_exists_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_iterate.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_iterate_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_list.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_list_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_modify_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_query.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/man/man3/semanage_user_query_local.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/boolean_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/boolean_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_active.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_activedb.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_file.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_local.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_policy.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/booleans_policydb.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/conf-parse.y#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/conf-scan.l#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/context_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/context_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_activedb.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_activedb.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_file.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_file.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_join.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_join.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_llist.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_llist.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_policydb.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/database_policydb.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/debug.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/debug.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/direct_api.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/direct_api.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/dso.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/fcontext_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/fcontext_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/fcontexts_file.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/fcontexts_local.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/fcontexts_policy.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/handle.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/handle.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/handle_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/iface_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/iface_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/interfaces_file.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/interfaces_local.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/interfaces_policy.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/interfaces_policydb.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/libsemanage.map#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/module_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/modules.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/modules.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/node_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/node_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/nodes_file.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/nodes_local.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/nodes_policy.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/nodes_policydb.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/parse_utils.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/parse_utils.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/policy.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/policy_components.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/port_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/port_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/ports_file.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/ports_local.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/ports_policy.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/ports_policydb.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/private.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/pywrap-test.py#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanage.conf#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanage.py#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanage_conf.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanage_store.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanage_store.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanageswig.i#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanageswig_python.i#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/semanageswig_wrap.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/seuser_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/seuser_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/seusers_file.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/seusers_local.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/seusers_policy.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/strverscmp.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/user_base_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/user_extra_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/user_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/user_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_base_file.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_base_policydb.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_extra_file.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_join.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_local.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsemanage/src/users_policy.c#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 19:14:41 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A84316B421 for ; Tue, 16 May 2006 19:14:41 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D70E143D49 for ; Tue, 16 May 2006 19:14:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 859D446CE4 for ; Tue, 16 May 2006 15:14:33 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6FD4255406; Tue, 16 May 2006 19:14:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 67F9D16A6F1; Tue, 16 May 2006 19:14:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4732116B278 for ; Tue, 16 May 2006 19:14:29 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E029F43D46 for ; Tue, 16 May 2006 19:14:28 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJEBa5077979 for ; Tue, 16 May 2006 19:14:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJEAJN077961 for perforce@freebsd.org; Tue, 16 May 2006 19:14:10 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:14:10 GMT Message-Id: <200605161914.k4GJEAJN077961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97283 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 19:14:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=97283 Change 97283 by millert@millert_p4 on 2006/05/16 19:13:46 A port of libsepol 1.12.4 to SEBSD Obtained from: selinux.sourceforge.net Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/COPYING#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/ChangeLog#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/VERSION#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/avtab.h#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/boolean_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/booleans.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/conditional.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/constraint.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/context.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/context_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/debug.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/ebitmap.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask_types.h#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/handle.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/hashtab.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/iface_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/interfaces.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/mls.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/mls_types.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/module.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/node_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/nodes.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/avrule_block.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/avtab.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/conditional.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/constraint.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/context.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/ebitmap.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/expand.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/flask.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/flask_types.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/hashtab.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/hierarchy.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/link.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/mls_types.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/module.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/policydb.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/services.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/sidtab.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb/symtab.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/port_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/ports.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/roles.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/sepol.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/services.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/sidtab.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/symtab.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/user_record.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/users.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/man/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/man/man3/sepol_check_context.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/man/man3/sepol_genbools.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/man/man3/sepol_genusers.3#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/man/man8/chkcon.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/man/man8/genpolbools.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/man/man8/genpolusers.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/assertion.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/av_permissions.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/avrule_block.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/avtab.c#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/boolean_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/boolean_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/booleans.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/conditional.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/constraint.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/context.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/context.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/context_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/context_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/debug.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/debug.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/dso.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/ebitmap.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/expand.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/genbools.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/genusers.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/handle.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/handle.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/hashtab.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/hierarchy.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/iface_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/iface_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/interfaces.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/libsepol.map#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/link.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/mls.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/mls.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/module.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/module_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/node_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/node_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/nodes.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/policydb.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/policydb_convert.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/policydb_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/policydb_public.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/port_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/port_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/ports.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/private.h#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/roles.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/services.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/sidtab.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/symtab.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/user_internal.h#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/user_record.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/users.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/util.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/write.c#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/utils/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/utils/chkcon.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/utils/genpolbools.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/avtab.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/conditional.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/constraint.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/context.h#2 (text+ko) ==== @@ -1,131 +1,31 @@ +#ifndef _SEPOL_CONTEXT_H_ +#define _SEPOL_CONTEXT_H_ -/* Author : Stephen Smalley, */ +#include +#include +#include -/* FLASK */ +/* -- Deprecated -- */ -/* - * A security context is a set of security attributes - * associated with each subject and object controlled - * by the security policy. Security contexts are - * externally represented as variable-length strings - * that can be interpreted by a user or application - * with an understanding of the security policy. - * Internally, the security server uses a simple - * structure. This structure is private to the - * security server and can be changed without affecting - * clients of the security server. - */ +extern int sepol_check_context( + const char *context); -#ifndef _CONTEXT_H_ -#define _CONTEXT_H_ +/* -- End deprecated -- */ -#include +extern int sepol_context_check( + sepol_handle_t* handle, + const sepol_policydb_t* policydb, + const sepol_context_t* context); -#include +extern int sepol_mls_contains( + sepol_handle_t* handle, + const sepol_policydb_t* policydb, + const char* mls1, + const char* mls2, + int* response); -/* - * A security context consists of an authenticated user - * identity, a role, a type and a MLS range. - */ -typedef struct context_struct { - uint32_t user; - uint32_t role; - uint32_t type; -#ifdef CONFIG_SECURITY_SELINUX_MLS - mls_range_t range; -#endif -} context_struct_t; - - -#ifdef CONFIG_SECURITY_SELINUX_MLS - -static inline void mls_context_init(context_struct_t * c) -{ - memset(&c->range, 0, sizeof(c->range)); -} - -static inline int mls_context_cpy(context_struct_t * dst, - context_struct_t * src) -{ - int rc; - - dst->range.level[0].sens = src->range.level[0].sens; - rc = ebitmap_cpy(&dst->range.level[0].cat, &src->range.level[0].cat); - if (rc) - goto out; - - dst->range.level[1].sens = src->range.level[1].sens; - rc = ebitmap_cpy(&dst->range.level[1].cat, &src->range.level[1].cat); - if (rc) - ebitmap_destroy(&dst->range.level[0].cat); -out: - return rc; -} - -static inline int mls_context_cmp(context_struct_t * c1, - context_struct_t * c2) -{ - return ((c1->range.level[0].sens == c2->range.level[0].sens) && - ebitmap_cmp(&c1->range.level[0].cat,&c2->range.level[0].cat) && - (c1->range.level[1].sens == c2->range.level[1].sens) && - ebitmap_cmp(&c1->range.level[1].cat,&c2->range.level[1].cat)); -} - -static inline void mls_context_destroy(context_struct_t * c) -{ - ebitmap_destroy(&c->range.level[0].cat); - ebitmap_destroy(&c->range.level[1].cat); - mls_context_init(c); -} - -#else - -static inline void mls_context_init(context_struct_t *c __attribute__ ((unused))) -{ } - -static inline int mls_context_cpy(context_struct_t * dst __attribute__ ((unused)), - context_struct_t * src __attribute__ ((unused))) -{ return 0; } - -static inline int mls_context_cmp(context_struct_t * c1 __attribute__ ((unused)), - context_struct_t * c2 __attribute__ ((unused))) -{ return 1; } - -static inline void mls_context_destroy(context_struct_t * c __attribute__ ((unused))) -{ } - +extern int sepol_mls_check( + sepol_handle_t* handle, + const sepol_policydb_t* policydb, + const char* mls); #endif - -static inline void context_init(context_struct_t * c) -{ - memset(c, 0, sizeof(*c)); -} - -static inline int context_cpy(context_struct_t * dst, - context_struct_t * src) -{ - dst->user = src->user; - dst->role = src->role; - dst->type = src->type; - return mls_context_cpy(dst, src); -} - -static inline void context_destroy(context_struct_t * c) -{ - c->user = c->role = c->type = 0; - mls_context_destroy(c); -} - -static inline int context_cmp(context_struct_t * c1, - context_struct_t * c2) -{ - return ((c1->user == c2->user) && - (c1->role == c2->role) && - (c1->type == c2->type) && - mls_context_cmp(c1, c2)); -} - -#endif /* _CONTEXT_H_ */ - -/* FLASK */ - ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/ebitmap.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask_types.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/hashtab.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/mls.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/mls_types.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb.h#2 (text+ko) ==== @@ -1,327 +1,130 @@ +#ifndef _SEPOL_POLICYDB_H_ +#define _SEPOL_POLICYDB_H_ -/* Author : Stephen Smalley, */ +#include +#include -/* Updated: Frank Mayer and Karl MacMillan - * - * Added conditional policy language extensions - * - * Copyright (C) 2003 - 2004 Tresys Technology, LLC - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 2. - */ +#include -/* FLASK */ +struct sepol_policy_file; +typedef struct sepol_policy_file sepol_policy_file_t; -/* - * A policy database (policydb) specifies the - * configuration data for the security policy. - */ +struct sepol_policydb; +typedef struct sepol_policydb sepol_policydb_t; -#ifndef _POLICYDB_H_ -#define _POLICYDB_H_ +/* Policy file public interfaces. */ -#include +/* Create and free memory associated with a policy file. */ +extern int sepol_policy_file_create(sepol_policy_file_t **pf); +extern void sepol_policy_file_free(sepol_policy_file_t *pf); -#include -#include -#include -#include -#include -#include +/* + * Set the policy file to represent a binary policy memory image. + * Subsequent operations using the policy file will read and write + * the image located at the specified address with the specified length. + * If 'len' is 0, then merely compute the necessary length upon + * subsequent policydb write operations in order to determine the + * necessary buffer size to allocate. + */ +extern void sepol_policy_file_set_mem(sepol_policy_file_t *pf, + char *data, + size_t len); /* - * A datum type is defined for each kind of symbol - * in the configuration data: individual permissions, - * common prefixes for access vectors, classes, - * users, roles, types, sensitivities, categories, etc. + * Get the size of the buffer needed to store a policydb write + * previously done on this policy file. */ +extern int sepol_policy_file_get_len(sepol_policy_file_t *pf, + size_t *len); -/* Permission attributes */ -typedef struct perm_datum { - uint32_t value; /* permission bit + 1 */ -#ifdef CONFIG_SECURITY_SELINUX_MLS -#define MLS_BASE_READ 1 /* MLS base permission `read' */ -#define MLS_BASE_WRITE 2 /* MLS base permission `write' */ -#define MLS_BASE_READBY 4 /* MLS base permission `readby' */ -#define MLS_BASE_WRITEBY 8 /* MLS base permission `writeby' */ - uint32_t base_perms; /* MLS base permission mask */ -#endif -} perm_datum_t; +/* + * Set the policy file to represent a FILE. + * Subsequent operations using the policy file will read and write + * to the FILE. + */ +extern void sepol_policy_file_set_fp(sepol_policy_file_t *pf, + FILE *fp); -/* Attributes of a common prefix for access vectors */ -typedef struct common_datum { - uint32_t value; /* internal common value */ - symtab_t permissions; /* common permissions */ -} common_datum_t; +/* + * Associate a handle with a policy file, for use in + * error reporting from subsequent calls that take the + * policy file as an argument. + */ +extern void sepol_policy_file_set_handle(sepol_policy_file_t *pf, + sepol_handle_t *handle); -/* Class attributes */ -typedef struct class_datum { - uint32_t value; /* class value */ - char *comkey; /* common name */ - common_datum_t *comdatum; /* common datum */ - symtab_t permissions; /* class-specific permission symbol table */ - constraint_node_t *constraints; /* constraints on class permissions */ -#ifdef CONFIG_SECURITY_SELINUX_MLS - mls_perms_t mlsperms; /* MLS base permission masks */ -#endif -} class_datum_t; +/* Policydb public interfaces. */ -/* Role attributes */ -typedef struct role_datum { - uint32_t value; /* internal role value */ - ebitmap_t dominates; /* set of roles dominated by this role */ - ebitmap_t types; /* set of authorized types for role */ -} role_datum_t; +/* Create and free memory associated with a policydb. */ +extern int sepol_policydb_create(sepol_policydb_t **p); +extern void sepol_policydb_free(sepol_policydb_t *p); -typedef struct role_trans { - uint32_t role; /* current role */ - uint32_t type; /* program executable type */ - uint32_t new_role; /* new role */ - struct role_trans *next; -} role_trans_t; +/* Legal types of policies that the policydb can represent. */ +#define SEPOL_POLICY_KERN 0 +#define SEPOL_POLICY_BASE 1 +#define SEPOL_POLICY_MOD 2 -typedef struct role_allow { - uint32_t role; /* current role */ - uint32_t new_role; /* new role */ - struct role_allow *next; -} role_allow_t; +/* + * Range of policy versions for the kernel policy type supported + * by this library. + */ +extern int sepol_policy_kern_vers_min(void); +extern int sepol_policy_kern_vers_max(void); -/* Type attributes */ -typedef struct type_datum { - uint32_t value; /* internal type value */ - unsigned char primary; /* primary name? */ -#ifndef __KERNEL__ - unsigned char isattr; /* is this a type attribute? */ - ebitmap_t types; /* types with this attribute */ -#endif -} type_datum_t; +/* + * Set the policy type as specified, and automatically initialize the + * policy version accordingly to the maximum version supported for the + * policy type. + * Returns -1 if the policy type is not legal. + */ +extern int sepol_policydb_set_typevers(sepol_policydb_t *p, unsigned int type); -/* User attributes */ -typedef struct user_datum { - uint32_t value; /* internal user value */ - ebitmap_t roles; /* set of authorized roles for user */ -#ifdef CONFIG_SECURITY_SELINUX_MLS - mls_range_list_t *ranges; /* list of authorized MLS ranges for user */ -#endif - unsigned defined; -} user_datum_t; +/* + * Set the policy version to a different value. + * Returns -1 if the policy version is not in the supported range for + * the (previously set) policy type. + */ +extern int sepol_policydb_set_vers(sepol_policydb_t *p, unsigned int vers); +/* + * Read a policydb from a policy file. + * This automatically sets the type and version based on the + * image contents. + */ +extern int sepol_policydb_read(sepol_policydb_t *p, + sepol_policy_file_t *pf); -#ifdef CONFIG_SECURITY_SELINUX_MLS -/* Sensitivity attributes */ -typedef struct level_datum { - mls_level_t *level; /* sensitivity and associated categories */ - unsigned char isalias; /* is this sensitivity an alias for another? */ -} level_datum_t; +/* + * Write a policydb to a policy file. + * The generated image will be in the binary format corresponding + * to the policy version associated with the policydb. + */ +extern int sepol_policydb_write(sepol_policydb_t *p, + sepol_policy_file_t *pf); -/* Category attributes */ -typedef struct cat_datum { - uint32_t value; /* internal category bit + 1 */ - unsigned char isalias; /* is this category an alias for another? */ -} cat_datum_t; -#endif - -/* Boolean data type */ -typedef struct cond_bool_datum { - uint32_t value; /* internal type value */ - int state; -} cond_bool_datum_t; - -struct cond_node; - -typedef struct cond_node cond_list_t; - /* - * The configuration data includes security contexts for - * initial SIDs, unlabeled file systems, TCP and UDP port numbers, - * network interfaces, and nodes. This structure stores the - * relevant data for one such entry. Entries of the same kind - * (e.g. all initial SIDs) are linked together into a list. + * Extract a policydb from a binary policy memory image. + * This is equivalent to sepol_policydb_read with a policy file + * set to refer to memory. */ -typedef struct ocontext { - union { - char *name; /* name of initial SID, fs, netif, fstype, path */ - struct { - uint8_t protocol; - uint16_t low_port; - uint16_t high_port; - } port; /* TCP or UDP port information */ - struct { - uint32_t addr; - uint32_t mask; - } node; /* node information */ - struct { - uint32_t addr[4]; - uint32_t mask[4]; - } node6; /* IPv6 node information */ - } u; - union { - uint32_t sclass; /* security class for genfs */ - uint32_t behavior; /* labeling behavior for fs_use */ - } v; - context_struct_t context[2]; /* security context(s) */ - security_id_t sid[2]; /* SID(s) */ - struct ocontext *next; -} ocontext_t; - -typedef struct genfs { - char *fstype; - struct ocontext *head; - struct genfs *next; -} genfs_t; - -/* symbol table array indices */ -#define SYM_COMMONS 0 -#define SYM_CLASSES 1 -#define SYM_ROLES 2 -#define SYM_TYPES 3 -#define SYM_USERS 4 -#ifdef CONFIG_SECURITY_SELINUX_MLS -#define SYM_LEVELS 5 -#define SYM_CATS 6 -#define SYM_BOOLS 7 -#define SYM_NUM 8 -#else -#define SYM_BOOLS 5 -#define SYM_NUM 6 -#endif - -/* object context array indices */ -#define OCON_ISID 0 /* initial SIDs */ -#define OCON_FS 1 /* unlabeled file systems */ -#define OCON_PORT 2 /* TCP and UDP port numbers */ -#define OCON_NETIF 3 /* network interfaces */ -#define OCON_NODE 4 /* nodes */ -#define OCON_FSUSE 5 /* fs_use */ -#define OCON_NODE6 6 /* IPv6 nodes */ -#define OCON_NUM 7 - -/* The policy database */ -typedef struct policydb { - /* symbol tables */ - symtab_t symtab[SYM_NUM]; -#define p_commons symtab[SYM_COMMONS] -#define p_classes symtab[SYM_CLASSES] -#define p_roles symtab[SYM_ROLES] -#define p_types symtab[SYM_TYPES] -#define p_users symtab[SYM_USERS] -#define p_levels symtab[SYM_LEVELS] -#define p_cats symtab[SYM_CATS] -#define p_bools symtab[SYM_BOOLS] +extern int sepol_policydb_from_image(sepol_handle_t *handle, + void* data, size_t len, + sepol_policydb_t *p); - /* symbol names indexed by (value - 1) */ - char **sym_val_to_name[SYM_NUM]; -#define p_common_val_to_name sym_val_to_name[SYM_COMMONS] -#define p_class_val_to_name sym_val_to_name[SYM_CLASSES] -#define p_role_val_to_name sym_val_to_name[SYM_ROLES] -#define p_type_val_to_name sym_val_to_name[SYM_TYPES] -#define p_user_val_to_name sym_val_to_name[SYM_USERS] -#define p_sens_val_to_name sym_val_to_name[SYM_LEVELS] -#define p_cat_val_to_name sym_val_to_name[SYM_CATS] -#define p_bool_val_to_name sym_val_to_name[SYM_BOOLS] - /* class, role, and user attributes indexed by (value - 1) */ - class_datum_t **class_val_to_struct; - role_datum_t **role_val_to_struct; - user_datum_t **user_val_to_struct; - - /* type enforcement access vectors and transitions */ - avtab_t te_avtab; - - /* bools indexed by (value - 1) */ - cond_bool_datum_t **bool_val_to_struct; - /* type enforcement conditional access vectors and transitions */ - avtab_t te_cond_avtab; - /* linked list indexing te_cond_avtab by conditional */ - cond_list_t* cond_list; - - /* role transitions */ - role_trans_t *role_tr; - - /* role allows */ - role_allow_t *role_allow; - - /* security contexts of initial SIDs, unlabeled file systems, - TCP or UDP port numbers, network interfaces and nodes */ - ocontext_t *ocontexts[OCON_NUM]; - - /* security contexts for files in filesystems that cannot support - a persistent label mapping or use another - fixed labeling behavior. */ - genfs_t *genfs; - -#ifdef CONFIG_SECURITY_SELINUX_MLS - /* number of legitimate MLS levels */ - uint32_t nlevels; - - ebitmap_t trustedreaders; - ebitmap_t trustedwriters; - ebitmap_t trustedobjects; -#endif - - unsigned policyvers; -} policydb_t; - -extern int policydb_init(policydb_t * p); - -extern int policydb_index_classes(policydb_t * p); - -extern int policydb_index_bools(policydb_t * p); - -extern int policydb_index_others(policydb_t * p, unsigned int verbose); - -extern int constraint_expr_destroy(constraint_expr_t * expr); - -extern void policydb_destroy(policydb_t * p); - -extern int policydb_load_isids(policydb_t *p, sidtab_t *s); - -extern int policydb_context_isvalid(policydb_t *p, context_struct_t *c); - -/* A policy "file" may be a memory region referenced by a (data, len) pair - or a file referenced by a FILE pointer. */ -struct policy_file { -#define PF_USE_MEMORY 0 -#define PF_USE_STDIO 1 - unsigned type; - char *data; - size_t len; - FILE *fp; -}; - -extern int policydb_read(policydb_t * p, struct policy_file * fp, unsigned int verbose); - -extern int policydb_write(struct policydb *p, struct policy_file *pf); - -#define PERM_SYMTAB_SIZE 32 - -/* Identify specific policy version changes */ -#define POLICYDB_VERSION_BASE 15 -#define POLICYDB_VERSION_BOOL 16 -#define POLICYDB_VERSION_IPV6 17 -#define POLICYDB_VERSION_NLCLASS 18 - -/* Range of policy versions we understand*/ -#define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE -#define POLICYDB_VERSION_MAX POLICYDB_VERSION_NLCLASS - /* - * Set policy version for writing policies. - * May be any value from POLICYDB_VERSION_MIN to POLICYDB_VERSION_MAX. - * If not set, then policydb_write defaults to the max. + * Generate a binary policy memory image from a policydb. + * This is equivalent to sepol_policydb_write with a policy file + * set to refer to memory, but internally handles computing the + * necessary length and allocating an appropriately sized memory + * buffer for the caller. */ -extern int sepol_set_policyvers(unsigned int policyvers); +extern int sepol_policydb_to_image(sepol_handle_t *handle, + sepol_policydb_t *p, + void **newdata, + size_t *newlen); -#define POLICYDB_CONFIG_MLS 1 +extern int sepol_policydb_mls_enabled( + const sepol_policydb_t* p); -#define OBJECT_R "object_r" -#define OBJECT_R_VAL 1 - -#define POLICYDB_MAGIC SELINUX_MAGIC -#define POLICYDB_STRING "SE Linux" - -#endif /* _POLICYDB_H_ */ - -/* FLASK */ - +#endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/sepol.h#2 (text+ko) ==== @@ -1,21 +1,28 @@ #ifndef _SEPOL_H_ #define _SEPOL_H_ -#include +#include +#include -/* Given an existing binary policy (starting at 'data', with length 'len') - and a boolean configuration file named by 'boolpath', rewrite the binary - policy for the boolean settings in the boolean configuration file. - The binary policy is rewritten in place in memory. - Returns 0 upon success, or -1 otherwise. */ -extern int sepol_genbools(void *data, size_t len, char *boolpath); +#include +#include +#include +#include +#include +#include -/* Given an existing binary policy (starting at 'data', with length 'len') - and boolean settings specified by the parallel arrays ('names', 'values') - with 'nel' elements, rewrite the binary policy for the boolean settings. - The binary policy is rewritten in place in memory. - Returns 0 upon success or -1 otherwise. */ -extern int sepol_genbools_array(void *data, size_t len, char **names, int *values, int nel); +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/* Set internal policydb from a file for subsequent service calls. */ +extern int sepol_set_policydb_from_file(FILE *fp); #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/services.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/sidtab.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/symtab.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/Makefile#3 (text+ko) ==== @@ -5,22 +5,13 @@ LIBVERSION = 1 -# Set to y for MLS -MLS=n - -.if $(MLS) == "y" -OPTIONS = -DCONFIG_SECURITY_SELINUX_MLS -.else -OPTIONS = -.endif - LIBA=libsepol.a TARGET=libsepol.so LIBSO=$(TARGET).$(LIBVERSION) OBJS= $(patsubst %.c,%.o,$(wildcard *.c)) LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c)) -CFLAGS = -Wall $(OPTIONS) -override CFLAGS += -I. -I../include +CFLAGS ?= -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute +override CFLAGS += -I. -I../include -D_GNU_SOURCE all: $(LIBA) $(LIBSO) @@ -29,14 +20,14 @@ ranlib $@ $(LIBSO): $(LOBJS) - $(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,$(LIBSO),--version-script=libsepol.map + $(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,$(LIBSO),--version-script=libsepol.map,-z,defs ln -sf $@ $(TARGET) %.o: %.c $(CC) $(CFLAGS) -c -o $@ $< %.lo: %.c - $(CC) $(CFLAGS) -fPIC -c -o $@ $< + $(CC) $(CFLAGS) -fpic -DSHARED -c -o $@ $< install: all test -d $(LIBDIR) || install -m 755 -d $(LIBDIR) @@ -45,6 +36,9 @@ install -m 755 $(LIBSO) $(SHLIBDIR) cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) +relabel: + /sbin/restorecon $(SHLIBDIR)/$(LIBSO) + clean: - rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET) + -rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/av_permissions.h#2 (text+ko) ==== @@ -1,2 +1,3 @@ /* Used by security_compute_av. */ #define PROCESS__TRANSITION 0x00000002UL +#define PROCESS__DYNTRANSITION 0x00800000UL ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/avtab.c#4 (text+ko) ==== @@ -5,10 +5,26 @@ * * Added conditional policy language extensions * + * Updated: Red Hat, Inc. James Morris + * + * Code cleanup + * * Copyright (C) 2003 Tresys Technology, LLC - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 2. + * Copyright (C) 2003 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* FLASK */ @@ -18,9 +34,10 @@ */ #include -#include -#include +#include +#include +#include "debug.h" #include "private.h" #define AVTAB_HASH(keyp) \ @@ -30,7 +47,7 @@ AVTAB_HASH_MASK) static avtab_ptr_t - avtab_insert_node(avtab_t *h, int hvalue, avtab_ptr_t prev, avtab_ptr_t cur, avtab_key_t *key, avtab_datum_t *datum) + avtab_insert_node(avtab_t *h, int hvalue, avtab_ptr_t prev, avtab_key_t *key, avtab_datum_t *datum) { avtab_ptr_t newnode; newnode = (avtab_ptr_t) malloc(sizeof(struct avtab_node)); @@ -57,6 +74,7 @@ { int hvalue; avtab_ptr_t prev, cur, newnode; + uint16_t specified = key->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); if (!h) return -ENOMEM; @@ -68,7 +86,7 @@ if (key->source_type == cur->key.source_type && key->target_type == cur->key.target_type && key->target_class == cur->key.target_class && - (datum->specified & cur->datum.specified)) + (specified & cur->key.specified)) return -EEXIST; if (key->source_type < cur->key.source_type) break; @@ -81,7 +99,7 @@ break; } - newnode = avtab_insert_node(h, hvalue, prev, cur, key, datum); + newnode = avtab_insert_node(h, hvalue, prev, key, datum); if(!newnode) return -ENOMEM; @@ -97,6 +115,7 @@ { int hvalue; avtab_ptr_t prev, cur, newnode; + uint16_t specified = key->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); if (!h) return NULL; @@ -107,7 +126,7 @@ if (key->source_type == cur->key.source_type && key->target_type == cur->key.target_type && key->target_class == cur->key.target_class && - (datum->specified & cur->datum.specified)) + (specified & cur->key.specified)) break; if (key->source_type < cur->key.source_type) break; @@ -119,37 +138,17 @@ key->target_class < cur->key.target_class) break; } - newnode = avtab_insert_node(h, hvalue, prev, cur, key, datum); + newnode = avtab_insert_node(h, hvalue, prev, key, datum); return newnode; } -/* Unlike avtab_insert(), this function stores a caller-provided parse_context pointer, AND - * allow multiple insertions of the same key/specified mask into the table, AND returns - * a pointer to the new node added, all as needed by the conditional avtab. - */ -avtab_ptr_t - avtab_insert_with_parse_context(avtab_t *h, avtab_key_t *key, avtab_datum_t *datum, void *parse_context) -{ - avtab_ptr_t newnode; - - if (!h) - return NULL; - - newnode = avtab_insert_nonunique(h, key, datum); - if(!newnode) - return NULL; - - newnode->parse_context = parse_context; - - return newnode; -} - avtab_datum_t * - avtab_search(avtab_t * h, avtab_key_t * key, int specified) + avtab_search(avtab_t * h, avtab_key_t * key) { int hvalue; avtab_ptr_t cur; + uint16_t specified = key->specified & ~(AVTAB_ENABLED|AVTAB_ENABLED_OLD); if (!h) @@ -160,7 +159,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 19:17:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BF2516B378 for ; Tue, 16 May 2006 19:17:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0755943D45 for ; Tue, 16 May 2006 19:17:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 81BF046CE3 for ; Tue, 16 May 2006 15:17:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3579855453; Tue, 16 May 2006 19:17:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 28A4116A620; Tue, 16 May 2006 19:17:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E8BF16A5A4 for ; Tue, 16 May 2006 19:17:34 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4D9143D45 for ; Tue, 16 May 2006 19:17:33 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJHGig078911 for ; Tue, 16 May 2006 19:17:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJHGN0078908 for perforce@freebsd.org; Tue, 16 May 2006 19:17:16 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:17:16 GMT Message-Id: <200605161917.k4GJHGN0078908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97285 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 19:17:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=97285 Change 97285 by millert@millert_p4 on 2006/05/16 19:17:01 Adapt to new SEBSD kernel bits. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#24 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/Makefile#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/access_vectors#9 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/mkaccess_vector.sh#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/mkflask.sh#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#24 (text+ko) ==== @@ -18,9 +18,13 @@ FLASKDIR = flask/ PREFIX = /usr -LOADPOLICY = /usr/sbin/sebsd_loadpolicy -CHECKPOLICY = /sbin/sebsd_checkpolicy -SETFILES = /sbin/sebsd_setfiles +.if exists($(DESTDIR)/usr/bin/checkpolicy) +CHECKPOLICY = $(DESTDIR)/usr/bin/checkpolicy +.else +CHECKPOLICY = /usr/bin/checkpolicy +.endif +LOADPOLICY = $(DESTDIR)/usr/sbin/load_policy +SETFILES = $(DESTDIR)/usr/sbin/setfiles .if (POLICYVERCOMPAT) POLICYVERTMP = $(POLICYVERCOMPAT) POLICYVERCOMPATARGS = -c $(POLICYVERCOMPAT) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/Makefile#4 (text+ko) ==== @@ -9,20 +9,22 @@ FLASK_H_DEPEND = security_classes initial_sids AV_H_DEPEND = access_vectors -FLASK_H_FILES = av_inherit.h av_perm_to_string.h av_permissions.h class_to_string.h common_perm_to_string.h initial_sid_to_string.h +FLASK_H_FILES = class_to_string.h flask.h initial_sid_to_string.h +AV_H_FILES = av_inherit.h common_perm_to_string.h av_perm_to_string.h av_permissions.h +ALL_H_FILES = $(FLASK_H_FILES) $(AV_H_FILES) -all: flask.h av_permissions.h +all: $(ALL_H_FILES) -flask.h: $(FLASK_H_DEPEND) +$(FLASK_H_FILES): $(FLASK_H_DEPEND) /bin/sh ./mkflask.sh $(AWK) $(FLASK_H_DEPEND) -av_permissions.h: $(AV_H_DEPEND) +$(AV_H_FILES): $(AV_H_DEPEND) /bin/sh ./mkaccess_vector.sh $(AWK) $(AV_H_DEPEND) -install: flask.h av_permissions.h - install -C -m0644 $(FLASK_H_FILES) $(KERNDIR)/avc - install -C -m0644 flask.h $(KERNDIR) +install: all + install -C -m 644 ${ALL_H_FILES:Nflask.h} $(KERNDIR)/avc + install -C -m 644 flask.h $(KERNDIR) clean: rm -f $(FLASK_H_FILES) - rm -f $(FLASK_IH_FILES) + rm -f $(AV_H_FILES) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/access_vectors#9 (text+ko) ==== @@ -248,6 +248,7 @@ siginh setrlimit rlimitinh + dyntransition } ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/mkaccess_vector.sh#3 (text+ko) ==== @@ -5,9 +5,6 @@ set -e -#subproject id -subproject="FLASK" - awk=$1 shift @@ -18,9 +15,25 @@ av_perm_to_string="av_perm_to_string.h" cat $* | $awk " + # Quicksort function for awk arrays, from The AWK Programming + # Language, by Aho, Kernighan and Weinberger. + # Call qsort(array, smallestindex, largestindex) + function qsort(a,left,right, i,last) { + if (left >= right) return + swap(a, left, left + int((right-left+1)*rand())) + last = left + for (i=left+1; i<=right; i++) + if (a[i] < a[left]) swap(a, ++last, i) + swap(a, left, last) + qsort(a, left, last-1) + qsort(a, last+1, right) + } + function swap(a,i,j, t) { + t = a[i]; a[i] = a[j]; a[j] = t; + } + BEGIN { outfile = \"$av_permissions\" - subproject = \"$subproject\" inheritfile = \"$av_inherit\" cpermfile = \"$common_perm_to_string\" avpermfile = \"$av_perm_to_string\" @@ -31,27 +44,6 @@ printf("/* This file is automatically generated. Do not edit. */\n") > cpermfile; printf("/* This file is automatically generated. Do not edit. */\n") > avpermfile; ; - printf("/* %s */\n\n", subproject) > outfile; - - printf("/* %s */\n\n", subproject) > cpermfile; - - printf("/* %s */\n\n", subproject) > inheritfile; - printf("typedef struct\n") > inheritfile; - printf("{\n") > inheritfile; - printf(" security_class_t tclass;\n") > inheritfile; - printf(" char **common_pts;\n") > inheritfile; - printf(" access_vector_t common_base;\n") > inheritfile; - printf("} av_inherit_t;\n\n") > inheritfile; - printf("static av_inherit_t av_inherit[] = {\n") > inheritfile; - - printf("/* %s */\n\n", subproject) > avpermfile; - printf("typedef struct\n") > avpermfile; - printf("{\n") > avpermfile; - printf(" security_class_t tclass;\n") > avpermfile; - printf(" access_vector_t value;\n") > avpermfile; - printf(" char *name;\n") > avpermfile; - printf("} av_perm_to_string_t;\n\n") > avpermfile; - printf("static av_perm_to_string_t av_perm_to_string[] = {\n") > avpermfile; } /^[ \t]*#/ { next; @@ -74,7 +66,7 @@ common_name = $2; permission = 1; - printf("static char *common_%s_perm_to_string[] =\n{\n", $2) > cpermfile; + printf("TB_(common_%s_perm_to_string)\n", $2) > cpermfile; nextstate = "COMMON-OPENBRACKET"; next; @@ -123,21 +115,31 @@ split(combined,separate, SUBSEP); if (separate[1] == inherits) { - printf("#define %s__%s", toupper(tclass), toupper(separate[2])) > outfile; - spaces = 40 - (length(separate[2]) + length(tclass)); - if (spaces < 1) - spaces = 1; - for (i = 0; i < spaces; i++) - printf(" ") > outfile; - pt = common_perms[combined]; - printf("0x%08x%08xUL\n", pt>32 ? 2^(pt-33) : 0, pt<33 ? 2^(pt-1) : 0) > outfile; - #printf("0x%08xUL\n", common_perms[combined]) > outfile; + inherited_perms[common_perms[combined]] = separate[2]; } } + + n = 0; + for (i in inherited_perms) { + n++; + ind[n] = i + 0; + } + qsort(ind, 1, n); + for (i = 1; i <= n; i++) { + perm = inherited_perms[ind[i]]; + printf("#define %s__%s", toupper(tclass), toupper(perm)) > outfile; + spaces = 40 - (length(perm) + length(tclass)); + if (spaces < 1) + spaces = 1; + for (j = 0; j < spaces; j++) + printf(" ") > outfile; + printf("0x%08xUL\n", ind[i]) > outfile; + } printf("\n") > outfile; - - printf(" { SECCLASS_%s, common_%s_perm_to_string, 0x%08x%08xUL },\n", toupper(tclass), inherits, - permission>32 ? 2^(permission-33) : 0, permission<33 ? 2^(permission-1) : 0) > inheritfile; + for (i in ind) delete ind[i]; + for (i in inherited_perms) delete inherited_perms[i]; + + printf(" S_(SECCLASS_%s, %s, 0x%08xUL)\n", toupper(tclass), inherits, permission) > inheritfile; nextstate = "CLASS_OR_CLASS-OPENBRACKET"; next; @@ -180,7 +182,7 @@ printf("#define COMMON_%s__%s", toupper(common_name), toupper($1)) > outfile; - printf(" \"%s\",\n", $1) > cpermfile; + printf(" S_(\"%s\")\n", $1) > cpermfile; } else { @@ -203,7 +205,7 @@ printf("#define %s__%s", toupper(tclass), toupper($1)) > outfile; - printf(" { SECCLASS_%s, %s__%s, \"%s\" },\n", toupper(tclass), toupper(tclass), toupper($1), $1) > avpermfile; + printf(" S_(SECCLASS_%s, %s__%s, \"%s\")\n", toupper(tclass), toupper(tclass), toupper($1), $1) > avpermfile; } spaces = 40 - (length($1) + length(tclass)); @@ -212,8 +214,8 @@ for (i = 0; i < spaces; i++) printf(" ") > outfile; - printf("0x%08x%08xUL\n", permission>32 ? 2^(permission-33) : 0, permission<33 ? 2^(permission-1) : 0) > outfile; - permission = permission + 1; + printf("0x%08xUL\n", permission) > outfile; + permission = permission * 2; } $1 == "}" { if (nextstate != "CLASS-CLOSEBRACKET" && @@ -226,7 +228,7 @@ if (nextstate == "COMMON-CLOSEBRACKET") { common_base[common_name] = permission; - printf("};\n\n") > cpermfile; + printf("TE_(common_%s_perm_to_string)\n\n", common_name) > cpermfile; } printf("\n") > outfile; @@ -237,17 +239,6 @@ if (nextstate != "COMMON_OR_AV" && nextstate != "CLASS_OR_CLASS-OPENBRACKET") printf("Parse error: Unexpected end of file\n"); - printf("\n/* %s */\n", subproject) > outfile; - - printf("\n/* %s */\n", subproject) > cpermfile; - - printf("};\n\n") > inheritfile; - printf("#define AV_INHERIT_SIZE (sizeof(av_inherit)/sizeof(av_inherit_t))\n\n") > inheritfile; - printf("\n/* %s */\n", subproject) > inheritfile; - - printf("};\n\n") > avpermfile; - printf("#define AV_PERM_TO_STRING_SIZE (sizeof(av_perm_to_string)/sizeof(av_perm_to_string_t))\n\n") > avpermfile; - printf("\n/* %s */\n", subproject) > avpermfile; }' # FLASK ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/mkflask.sh#3 (text+ko) ==== @@ -23,15 +23,12 @@ printf("/* This file is automatically generated. Do not edit. */\n") > outfile; - printf("#ifndef _LINUX_FLASK_H_\n") > outfile; - printf("#define _LINUX_FLASK_H_\n") > outfile; - printf("\n#include \n") > outfile; - + printf("#ifndef _SELINUX_FLASK_H_\n") > outfile; + printf("#define _SELINUX_FLASK_H_\n") > outfile; printf("\n/*\n * Security object class definitions\n */\n") > outfile; printf("/* This file is automatically generated. Do not edit. */\n") > debugfile; printf("/*\n * Security object class definitions\n */\n") > debugfile; - printf("static char *class_to_string[] =\n{\n") > debugfile; - printf(" \"null\",\n") > debugfile; + printf(" S_(\"null\")\n") > debugfile; printf("/* This file is automatically generated. Do not edit. */\n") > debugfile2; printf("static char *initial_sid_to_string[] =\n{\n") > debugfile2; printf(" \"null\",\n") > debugfile2; @@ -60,13 +57,12 @@ printf(" ") > outfile; printf("%d\n", class_value) > outfile; - printf(" \"%s\",\n", $2) > debugfile; + printf(" S_(\"%s\")\n", $2) > debugfile; } $1 == "sid" { if (nextstate == "CLASS") { nextstate = "SID"; - printf("};\n\n") > debugfile; printf("\n/*\n * Security identifier indices for initial entities\n */\n") > outfile; } From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 19:21:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBFD816A7F6 for ; Tue, 16 May 2006 19:21:27 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FE0443D73 for ; Tue, 16 May 2006 19:21:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 100A246CEF for ; Tue, 16 May 2006 15:21:07 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 47062563F3; Tue, 16 May 2006 19:19:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E6E616A5FC; Tue, 16 May 2006 19:19:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B558316A68F for ; Tue, 16 May 2006 19:19:38 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C1A443D49 for ; Tue, 16 May 2006 19:19:37 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJJKqH079501 for ; Tue, 16 May 2006 19:19:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJJJl3079483 for perforce@freebsd.org; Tue, 16 May 2006 19:19:19 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:19:19 GMT Message-Id: <200605161919.k4GJJJl3079483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97286 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 19:21:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=97286 Change 97286 by millert@millert_p4 on 2006/05/16 19:18:30 A port of policycoreutils version 1.30 to SEBSD Obtained from: selinux.sourceforge.net Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/COPYING#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/ChangeLog#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/VERSION#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/audit2allow#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/audit2allow.1#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/audit2allow.perl#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2why/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2why/audit2why.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2why/audit2why.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/load_policy/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/load_policy/load_policy.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/load_policy/load_policy.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/newrole/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/newrole/newrole.1#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/newrole/newrole.c#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/newrole/newrole.pamd#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/Makefile.in#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/Makefile.in.in#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/POTFILES#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/POTFILES.in#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/da.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/de.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/es.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/et.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/fr.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/gl.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/id.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/it.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ko.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/nl.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/pl.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/policycoreutils.pot#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/pt_BR.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/ru.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/po/sv.po#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/policycoreutils.spec#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecon/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecon/restorecon.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/restorecon/restorecon.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/run_init/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/run_init/open_init_pty.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/run_init/open_init_pty.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/run_init/run_init.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/run_init/run_init.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/run_init/run_init.pamd#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/chcat#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/chcat.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/fixfiles#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/fixfiles.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/fixfiles.8.gz#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/fixfiles.cron#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/genhomedircon#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/genhomedircon.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semanage/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semanage/semanage#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semanage/semanage.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semanage/seobject.py#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule/semodule.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule/semodule.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_expand/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_expand/semodule_expand.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_expand/semodule_expand.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_link/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_link/semodule_link.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_link/semodule_link.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_package/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_package/semodule_package.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/semodule_package/semodule_package.c#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/sestatus/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/sestatus/sestatus.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/sestatus/sestatus.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/sestatus/sestatus.conf#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setfiles/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setfiles/setfiles.8#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setfiles/setfiles.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setsebool/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setsebool/setsebool.8#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/setsebool/setsebool.c#1 add Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/COPYING#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,458 @@ +1.30 2006-03-14 + * Updated version for release. + +1.29.28 2006-03-13 + * Merged German translations (de.po) by Debian translation team from Manoj Srivastava. + +1.29.27 2006-03-08 + * Merged audit2allow -R support, chcat fix, semanage MLS checks + and semanage audit calls from Dan Walsh. + +1.29.26 2006-02-15 + * Merged semanage bug fix patch from Ivan Gyurdiev. + +1.29.25 2006-02-14 + * Merged improve bindings patch from Ivan Gyurdiev. + +1.29.24 2006-02-14 + * Merged semanage usage patch from Ivan Gyurdiev. + * Merged use PyList patch from Ivan Gyurdiev. + +1.29.23 2006-02-13 + * Merged newrole -V/--version support from Glauber de Oliveira Costa. + +1.29.22 2006-02-13 + * Merged genhomedircon prefix patch from Dan Walsh. + +1.29.21 2006-02-13 + * Merged optionals in base patch from Joshua Brindle. + +1.29.20 2006-02-07 + * Merged seuser/user_extra support patch to semodule_package + from Joshua Brindle. + +1.29.19 2006-02-06 + * Merged getopt type fix for semodule_link/expand and sestatus + from Chris PeBenito. + +1.29.18 2006-02-02 + * Merged clone record on set_con patch from Ivan Gyurdiev. + +1.29.17 2006-01-30 + * Merged genhomedircon fix from Dan Walsh. + +1.29.16 2006-01-30 + * Merged seusers.system patch from Ivan Gyurdiev. + * Merged improve port/fcontext API patch from Ivan Gyurdiev. + * Merged genhomedircon patch from Dan Walsh. + +1.29.15 2006-01-27 + * Merged newrole audit patch from Steve Grubb. + +1.29.14 2006-01-27 + * Merged seuser -> seuser local rename patch from Ivan Gyurdiev. + +1.29.13 2006-01-27 + * Merged semanage and semodule access check patches from Joshua Brindle. + +1.29.12 2006-01-26 + * Merged restorecon, chcat, and semanage patches from Dan Walsh. + +1.29.11 2006-01-25 + * Modified newrole and run_init to use the loginuid when + supported to obtain the Linux user identity to re-authenticate, + and to fall back to real uid. Dropped the use of the SELinux + user identity, as Linux users are now mapped to SELinux users + via seusers and the SELinux user identity space is separate. + +1.29.10 2006-01-20 + * Merged semanage bug fixes from Ivan Gyurdiev. + * Merged semanage fixes from Russell Coker. + * Merged chcat.8 and genhomedircon patches from Dan Walsh. + +1.29.9 2006-01-19 + * Merged chcat, semanage, and setsebool patches from Dan Walsh. + +1.29.8 2006-01-18 + * Merged semanage fixes from Ivan Gyurdiev. + * Merged semanage fixes from Russell Coker. + * Merged chcat, genhomedircon, and semanage diffs from Dan Walsh. + +1.29.7 2006-01-13 + * Merged newrole cleanup patch from Steve Grubb. + * Merged setfiles/restorecon performance patch from Russell Coker. + * Merged genhomedircon and semanage patches from Dan Walsh. + +1.29.6 2006-01-12 + * Merged remove add_local/set_local patch from Ivan Gyurdiev. + +1.29.5 2006-01-05 + * Added filename to semodule error reporting. + +1.29.4 2006-01-05 + * Merged genhomedircon and semanage patch from Dan Walsh. + * Changed semodule error reporting to include argv[0]. + +1.29.3 2006-01-04 + * Merged semanage getpwnam bug fix from Serge Hallyn (IBM). + * Merged patch series from Ivan Gyurdiev. + This includes patches to: + - cleanup setsebool + - update setsebool to apply active booleans through libsemanage + - update semodule to use the new semanage_set_rebuild() interface + - fix various bugs in semanage + * Merged patch from Dan Walsh (Red Hat). + This includes fixes for restorecon, chcat, fixfiles, genhomedircon, + and semanage. + +1.29.2 2005-12-14 + * Merged patch for chcat script from Dan Walsh. + +1.29.1 2005-12-08 + * Merged fix for audit2allow long option list from Dan Walsh. + * Merged -r option for restorecon (alias for -R) from Dan Walsh. + * Merged chcat script and man page from Dan Walsh. + +1.28 2005-12-07 + * Updated version for release. + +1.27.37 2005-12-07 + * Clarified the genhomedircon warning message. + +1.27.36 2005-12-05 + * Changed genhomedircon to warn on use of ROLE in homedir_template + if using managed policy, as libsemanage does not yet support it. + +1.27.35 2005-12-02 + * Merged genhomedircon bug fix from Dan Walsh. + +1.27.34 2005-12-02 + * Revised semodule* man pages to refer to checkmodule and + to include example sections. + +1.27.33 2005-12-01 + * Merged audit2allow --tefile and --fcfile support from Dan Walsh. + * Merged genhomedircon fix from Dan Walsh. + * Merged semodule* man pages from Dan Walsh, and edited them. + +1.27.32 2005-12-01 + * Changed setfiles to set the MATCHPATHCON_VALIDATE flag to + retain validation/canonicalization of contexts during init. + +1.27.31 2005-11-29 + * Changed genhomedircon to always use user_r for the role in the + managed case since user_get_defrole is broken. + +1.27.30 2005-11-29 + * Merged sestatus, audit2allow, and semanage patch from Dan Walsh. + * Fixed semodule -v option. + +1.27.29 2005-11-28 + * Merged audit2allow python script from Dan Walsh. + (old script moved to audit2allow.perl, will be removed later). + * Merged genhomedircon fixes from Dan Walsh. + * Merged semodule quieting patch from Dan Walsh + (inverts default, use -v to restore original behavior). + +1.27.28 2005-11-15 + * Merged genhomedircon rewrite from Dan Walsh. + +1.27.27 2005-11-09 + * Merged setsebool cleanup patch from Ivan Gyurdiev. + +1.27.26 2005-11-09 + * Added -B (--build) option to semodule to force a rebuild. + +1.27.25 2005-11-08 + * Reverted setsebool patch to call semanage_set_reload_bools(). + * Changed setsebool to disable policy reload and to call + security_set_boolean_list to update the runtime booleans. + +1.27.24 2005-11-08 + * Changed setfiles -c to use new flag to set_matchpathcon_flags() + to disable context translation by matchpathcon_init(). + +1.27.23 2005-11-07 + * Changed setfiles for the context canonicalization support. + +1.27.22 2005-11-07 + * Changed setsebool to call semanage_is_managed() interface + and fall back to security_set_boolean_list() if policy is + not managed. + +1.27.21 2005-11-07 + * Merged setsebool memory leak fix from Ivan Gyurdiev. + * Merged setsebool patch to call semanage_set_reload_bools() + interface from Ivan Gyurdiev. + +1.27.20 2005-11-04 + * Merged setsebool patch from Ivan Gyurdiev. + This moves setsebool from libselinux/utils to policycoreutils, + and rewrites it to use libsemanage for permanent boolean changes. + +1.27.19 2005-10-25 + * Merged semodule support for reload, noreload, and store options + from Joshua Brindle. + * Merged semodule_package rewrite from Joshua Brindle. + +1.27.18 2005-10-20 + * Cleaned up usage and error messages and releasing of memory by + semodule_* utilities. + +1.27.17 2005-10-20 + * Corrected error reporting by semodule. + +1.27.16 2005-10-19 + * Updated semodule_expand for change to sepol interface. + +1.27.15 2005-10-19 + * Merged fixes for make DESTDIR= builds from Joshua Brindle. + +1.27.14 2005-10-18 + * Updated semodule_package for sepol interface changes. + +1.27.13 2005-10-17 + * Updated semodule_expand/link for sepol interface changes. + +1.27.12 2005-10-14 + * Merged non-PAM Makefile support for newrole and run_init from Timothy Wood. + +1.27.11 2005-10-13 + * Updated semodule_expand to use get interfaces for hidden sepol_module_package type. + +1.27.10 2005-10-13 + * Merged newrole and run_init pam config patches from Dan Walsh (Red Hat). + +1.27.9 2005-10-13 + * Merged fixfiles patch from Dan Walsh (Red Hat). + +1.27.8 2005-10-13 + * Updated semodule for removal of semanage_strerror. + +1.27.7 2005-10-11 + * Updated semodule_link and semodule_expand to use shared libsepol. + Fixed audit2why to call policydb_init prior to policydb_read (still + uses the static libsepol). + +1.27.6 2005-10-07 + * Updated for changes to libsepol. + Changed semodule and semodule_package to use the shared libsepol. + Disabled build of semodule_link and semodule_expand for now. + Updated audit2why for relocated policydb internal headers, + still needs to be converted to a shared lib interface. + +1.27.5 2005-10-06 + * Fixed warnings in load_policy. + +1.27.4 2005-10-06 + * Rewrote load_policy to use the new selinux_mkload_policy() + interface provided by libselinux. + +1.27.3 2005-09-28 + * Merged patch to update semodule to the new libsemanage API + and improve the user interface from Karl MacMillan (Tresys). + * Modified semodule for the create/connect API split. + +1.27.2 2005-09-20 + * Merged run_init open_init_pty bug fix from Manoj Srivastava + (unblock SIGCHLD). Bug reported by Erich Schubert. + +1.27.1 2005-09-20 + * Merged error shadowing bug fix for restorecon from Dan Walsh. + * Merged setfiles usage/man page update for -r option from Dan Walsh. + * Merged fixfiles -C patch to ignore :s0 addition on update + to a MCS/MLS policy from Dan Walsh. + +1.26 2005-09-06 + * Updated version for release. + +1.25.9 2005-08-31 + * Changed setfiles -c to translate the context to raw format + prior to calling libsepol. + +1.25.8 2005-08-31 + * Changed semodule to report errors even without -v, + to detect extraneous arguments, and corrected usage message. + +1.25.7 2005-08-25 + * Merged patch for fixfiles -C from Dan Walsh. + +1.25.6 2005-08-22 + * Merged fixes for semodule_link and sestatus from Serge Hallyn (IBM). + Bugs found by Coverity. + +1.25.5 2005-08-02 + * Merged patch to move module read/write code from libsemanage + to libsepol from Jason Tang (Tresys). + +1.25.4 2005-07-27 + * Changed semodule* to link with libsemanage. + +1.25.3 2005-07-26 + * Merged restorecon patch from Ivan Gyurdiev. + +1.25.2 2005-07-11 + * Merged load_policy, newrole, and genhomedircon patches from Red Hat. + +1.25.1 2005-07-06 + * Merged loadable module support from Tresys Technology. + +1.24 2005-06-20 + * Updated version for release. + +1.23.11 2005-05-19 + * Merged fixfiles and newrole patch from Dan Walsh. + * Merged audit2why man page from Dan Walsh. + +1.23.10 2005-05-16 + * Extended audit2why to incorporate booleans and local user + settings when analyzing audit messages. + +1.23.9 2005-05-13 + * Updated audit2why for sepol_ prefixes on Flask types to + avoid namespace collision with libselinux, and to + include now. + +1.23.8 2005-05-13 + * Added audit2why utility. + +1.23.7 2005-04-29 + * Merged patch for fixfiles from Dan Walsh. + Allow passing -F to force reset of customizable contexts. + +1.23.6 2005-04-13 + * Fixed signed/unsigned pointer bug in load_policy. + * Reverted context validation patch for genhomedircon. + +1.23.5 2005-04-12 + * Reverted load_policy is_selinux_enabled patch from Dan Walsh. + Otherwise, an initial policy load cannot be performed using + load_policy, e.g. for anaconda. + +1.23.4 2005-04-08 + * Merged load_policy is_selinux_enabled patch from Dan Walsh. + * Merged restorecon verbose output patch from Dan Walsh. + * Merged setfiles altroot patch from Chris PeBenito. + +1.23.3 2005-03-17 + * Merged context validation patch for genhomedircon from Eric Paris. + +1.23.2 2005-03-16 + * Changed setfiles -c to call set_matchpathcon_flags(3) to + turn off processing of .homedirs and .local. + +1.23.1 2005-03-14 + * Merged rewrite of genhomedircon by Eric Paris. + * Changed fixfiles to relabel jfs since it now supports security xattrs + (as of 2.6.11). Removed reiserfs until 2.6.12 is released with + fixed support for reiserfs and selinux. + +1.22 2005-03-09 + * Updated version for release. + +1.21.22 2005-03-07 + * Merged restorecon and genhomedircon patch from Dan Walsh. + +1.21.21 2005-02-28 + * Merged load_policy and genhomedircon patch from Dan Walsh. + +1.21.20 2005-02-24 + * Merged fixfiles and genhomedircon patch from Dan Walsh. + +1.21.19 2005-02-22 + * Merged several fixes from Ulrich Drepper. + +1.21.18 2005-02-18 + * Changed load_policy to fall back to the original policy upon + an error from sepol_genusers(). + +1.21.17 2005-02-17 + * Merged new genhomedircon script from Dan Walsh. + +1.21.16 2005-02-17 + * Changed load_policy to call sepol_genusers(). + +1.21.15 2005-02-09 + * Changed relabel Makefile target to use restorecon. + +1.21.14 2005-02-08 + * Merged restorecon patch from Dan Walsh. + +1.21.13 2005-02-07 + * Merged sestatus patch from Dan Walsh. + * Merged further change to fixfiles -C from Dan Walsh. + +1.21.12 2005-02-02 + * Merged further patches for restorecon/setfiles -e and fixfiles -C. + +1.21.11 2005-02-02 + * Merged patch for fixfiles -C option from Dan Walsh. + * Merged patch -e support for restorecon from Dan Walsh. + * Merged updated -e support for setfiles from Dan Walsh. + +1.21.10 2005-01-31 + * Merged patch for open_init_pty from Manoj Srivastava. + +1.21.9 2005-01-28 + * Merged updated fixfiles script from Dan Walsh. + * Merged updated man page for fixfiles from Dan Walsh and re-added unzipped. + * Reverted fixfiles patch for file_contexts.local; + obsoleted by setfiles rewrite. + * Merged error handling patch for restorecon from Dan Walsh. + * Merged semi raw mode for open_init_pty helper from Manoj Srivastava. + +1.21.8 2005-01-28 + * Rewrote setfiles to use matchpathcon and the new interfaces + exported by libselinux (>= 1.21.5). + +1.21.7 2005-01-27 + * Prevent overflow of spec array in setfiles. + +1.21.6 2005-01-27 + * Merged genhomedircon STARTING_UID bug fix from Dan Walsh. + +1.21.5 2005-01-26 + * Merged newrole -l support from Darrel Goeddel (TCS). + +1.21.4 2005-01-25 + * Merged fixfiles patch for file_contexts.local from Dan Walsh. + +1.21.3 2005-01-21 + * Fixed restorecon to not treat errors from is_context_customizable() + as a customizable context. + * Merged setfiles/restorecon patch to not reset user field unless + -F option is specified from Dan Walsh. + +1.21.2 2005-01-21 + * Merged open_init_pty helper for run_init from Manoj Srivastava. + * Merged audit2allow and genhomedircon man pages from Manoj Srivastava. + +1.21.1 2005-01-19 + * Merged customizable contexts patch for restorecon/setfiles from Dan Walsh. + +1.20 2005-01-06 + * Merged fixfiles rewrite from Dan Walsh. + * Merged restorecon patch from Dan Walsh. + * Merged fixfiles and restorecon patches from Dan Walsh. + * Changed restorecon to ignore ENOENT errors from matchpathcon. + * Merged nonls patch from Chris PeBenito. + * Removed fixfiles.cron. + * Merged run_init.8 patch from Dan Walsh. + +1.18 2004-11-01 + * Merged audit2allow patch from Thomas Bleher, with mods by Dan Walsh. + * Merged sestatus patch from Steve Grubb. + * Merged fixfiles patch from Dan Walsh. + * Added -l option to setfiles to log changes via syslog. + * Merged -e option to setfiles to exclude directories. + * Merged -R option to restorecon for recursive descent. + * Merged sestatus patch from Steve Grubb via Dan Walsh. + * Merged load_policy and fixfiles.cron patches from Dan Walsh. + * Merged fix for setfiles context validation patch from Colin Walters. + * Merged setfiles context validation patch from Colin Walters. + * Merged genhomedircon patch from Russell Coker. + * Merged restorecon patch from Russell Coker. + 1.16 2004-08-13 * Merged audit2allow fix from Tom London. * Merged load_policy man page from Dan Walsh. ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -SUBDIRS=setfiles load_policy newrole run_init restorecon audit2allow scripts po sestatus +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po all install relabel clean: @for subdir in $(SUBDIRS); do \ ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.16 +1.30 ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ # Installation directories. PREFIX ?= ${DESTDIR}/usr BINDIR ?= $(PREFIX)/bin +MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale TARGETS=audit2allow @@ -10,6 +11,8 @@ install: all -mkdir -p $(BINDIR) install -m 755 $(TARGETS) $(BINDIR) + -mkdir -p $(MANDIR)/man1 + install -m 644 audit2allow.1 $(MANDIR)/man1/ clean: ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/audit2allow/audit2allow#2 (text+ko) ==== @@ -1,7 +1,12 @@ -#!/usr/bin/perl - -# Adapted from: +#! /usr/bin/env python +# Copyright (C) 2005 Red Hat +# see file 'COPYING' for use and warranty information +# +# Audit2allow is a rewrite of prior perl script. +# +# Based off original audit2allow perl script: which credits # newrules.pl, Copyright (C) 2001 Justin R. Smith (jsmith@mcs.drexel.edu) +# 2003 Oct 11: Add -l option by Yuichi Nakamura(ynakam@users.sourceforge.jp) # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -17,142 +22,590 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # 02111-1307 USA -# 2003 Oct 11: Add -l option by Yuichi Nakamura(ynakam@users.sourceforge.jp) +# +# +import commands, sys, os, pwd, string, getopt, re, selinux + +obj="(\{[^\}]*\}|[^ \t:]*)" +allow_regexp="allow[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj) + +awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\ + IFACEFILE=FILENAME\n\ + IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\ + IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\ +}\n\ +\n\ +/^[[:blank:]]*allow[[:blank:]]+.*;[[:blank:]]*$/ {\n\ +\n\ + if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\ + ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\ + ALLOW = gensub(";[[:blank:]]*$","","g",$0)\n\ + print FILENAME "\\t" IFACENAME "\\t" ALLOW;\n\ + }\n\ +}\ +' + +class accessTrans: + def __init__(self): + self.dict={} + try: + fd=open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt") + except IOError, error: + raise IOError("Reference policy generation requires the policy development package.\n%s" % error) + records=fd.read().split("\n") + regexp="^define *\(`([^']*)' *, *` *\{([^}]*)}'" + for r in records: + m=re.match(regexp,r) + if m!=None: + self.dict[m.groups()[0]] = m.groups()[1].split() + fd.close() + def get(self, var): + l=[] + for v in var: + if v in self.dict.keys(): + l += self.dict[v] + else: + if v not in ("{", "}"): + l.append(v) + return l + +class interfaces: + def __init__(self): + self.dict={} + trans=accessTrans() + (input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null") + input.write(awk_script) + input.close() + records=output.read().split("\n") + input.close() + if len(records) > 0: + regexp="([^ \t]*)[ \t]+([^ \t]*)[ \t]+%s" % allow_regexp + for r in records: + m=re.match(regexp,r) + if m==None: + continue + else: + val=m.groups() + file=os.path.basename(val[0]).split(".")[0] + iface=val[1] + Scon=val[2].split() + Tcon=val[3].split() + Class=val[4].split() + Access=trans.get(val[5].split()) + for s in Scon: + for t in Tcon: + for c in Class: + if (s, t, c) not in self.dict.keys(): + self.dict[(s, t, c)]=[] + self.dict[(s, t, c)].append((Access, file, iface)) + def out(self): + keys=self.dict.keys() + keys.sort() + for k in keys: + print k + for i in self.dict[k]: + print "\t", i + + def match(self, Scon, Tcon, Class, Access): + keys=self.dict.keys() + ret=[] + if (Scon, Tcon, Class) in keys: + for i in self.dict[(Scon, Tcon, Class)]: + if Access in i[0]: + if i[2].find(Access) >= 0: + ret.insert(0, i) + else: + ret.append(i) + return ret + if ("$1", Tcon, Class) in keys: + for i in self.dict[("$1", Tcon, Class)]: + if Access in i[0]: + if i[2].find(Access) >= 0: + ret.insert(0, i) + else: + ret.append(i) + return ret + if (Scon, "$1", Class) in keys: + for i in self.dict[(Scon, "$1", Class)]: + if Access in i[0]: + if i[2].find(Access) >= 0: + ret.insert(0, i) + else: + ret.append(i) + return ret + else: + return ret + + +class serule: + def __init__(self, type, source, target, seclass): + self.type=type + self.source=source + self.target=target + self.seclass=seclass + self.avcinfo={} + self.iface=None + + def add(self, avc): + for a in avc[0]: + if a not in self.avcinfo.keys(): + self.avcinfo[a]=[] + + self.avcinfo[a].append(avc[1:]) + + def getAccess(self): + if len(self.avcinfo.keys()) == 1: + for i in self.avcinfo.keys(): + return i + else: + keys=self.avcinfo.keys() + keys.sort() + ret="{" + for i in keys: + ret=ret + " " + i + ret=ret+" }" + return ret + def out(self, verbose=0): + ret="" + ret=ret+"%s %s %s:%s %s;" % (self.type, self.source, self.gettarget(), self.seclass, self.getAccess()) + if verbose: + keys=self.avcinfo.keys() + keys.sort() + for i in keys: + for x in self.avcinfo[i]: + ret=ret+"\n\t#TYPE=AVC MSG=%s " % x[0] + if len(x[1]): + ret=ret+"COMM=%s " % x[1] + if len(x[2]): + ret=ret+"NAME=%s " % x[2] + ret=ret + " : " + i + return ret + + def gen_reference_policy(self, iface): + ret="" + Scon=self.source + Tcon=self.gettarget() + Class=self.seclass + Access=self.getAccess() + m=iface.match(Scon,Tcon,Class,Access) + if len(m)==0: + return self.out() + else: + file=m[0][1] + ret="\n#%s\n"% self.out() + ret += "optional_policy(`%s', `\n" % m[0][1] + first=True + for i in m: + if file != i[1]: + ret += "')\ngen_require(`%s', `\n" % i[1] + file = i[1] + first=True + if first: + ret += "\t%s(%s)\n" % (i[2], Scon) + first=False + else: + ret += "#\t%s(%s)\n" % (i[2], Scon) + ret += "');" + return ret + + def gettarget(self): + if self.source == self.target: + return "self" + else: + return self.target + +class seruleRecords: + def __init__(self, input, last_reload=0, verbose=0, te_ind=0): + self.last_reload=last_reload + self.seRules={} + self.seclasses={} + self.types=[] + self.roles=[] + self.load(input, te_ind) + self.gen_ref_policy = False + + def gen_reference_policy(self): + self.gen_ref_policy = True + self.iface=interfaces() + + def warning(self, error): + sys.stderr.write("%s: " % sys.argv[0]) + sys.stderr.write("%s\n" % error) + sys.stderr.flush() + + def load(self, input, te_ind=0): + VALID_CMDS=("allow", "dontaudit", "auditallow", "role") + + avc=[] + found=0 + line = input.readline() + if te_ind: + while line: + rec=line.split() + if len(rec) and rec[0] in VALID_CMDS: + self.add_terule(line) + line = input.readline() + + else: + while line: + rec=line.split() + for i in rec: + if i=="avc:" or i=="message=avc:" or i=="msg='avc:": + + found=1 + else: + avc.append(i) + if found: + self.add(avc) + found=0 + avc=[] + line = input.readline() + + + def get_target(self, i, rule): + target=[] + if rule[i][0] == "{": + for t in rule[i].split("{"): + if len(t): + target.append(t) + i=i+1 + for s in rule[i:]: + if s.find("}") >= 0: + for s1 in s.split("}"): + if len(s1): + target.append(s1) + i=i+1 + return (i, target) + + target.append(s) + i=i+1 + else: + if rule[i].find(";") >= 0: + for s1 in rule[i].split(";"): + if len(s1): + target.append(s1) + else: + target.append(rule[i]) + + i=i+1 + return (i, target) + + def rules_split(self, rules): + (idx, target ) = self.get_target(0, rules) + (idx, subject) = self.get_target(idx, rules) + return (target, subject) + + def add_terule(self, rule): + rc = rule.split(":") + rules=rc[0].split() + type=rules[0] + if type == "role": + print type + (sources, targets) = self.rules_split(rules[1:]) + rules=rc[1].split() + (seclasses, access) = self.rules_split(rules) + for scon in sources: + for tcon in targets: + for seclass in seclasses: + self.add_rule(type, scon, tcon, seclass,access) + + def add_rule(self, rule_type, scon, tcon, seclass, access, msg="", comm="", name=""): + self.add_seclass(seclass, access) + self.add_type(tcon) + self.add_type(scon) + if (rule_type, scon, tcon, seclass) not in self.seRules.keys(): + self.seRules[(rule_type, scon, tcon, seclass)]=serule(rule_type, scon, tcon, seclass) + + self.seRules[(rule_type, scon, tcon, seclass)].add((access, msg, comm, name )) + def add(self,avc): + scon="" + tcon="" + seclass="" + comm="" + name="" + msg="" + access=[] + if "security_compute_sid" in avc: + return + + if "load_policy" in avc and self.last_reload: + self.seRules={} -$load_policy_pattern="avc:.*granted.*{.*load_policy.*}"; + if "granted" in avc: + return + try: + for i in range (0, len(avc)): + if avc[i]=="{": + i=i+1 + while i>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 19:22:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5187116B38A for ; Tue, 16 May 2006 19:22:53 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0240C43D45 for ; Tue, 16 May 2006 19:22:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6939746CEF for ; Tue, 16 May 2006 15:22:46 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BF1F257D15; Tue, 16 May 2006 19:22:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B763616A4E7; Tue, 16 May 2006 19:22:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A1B516A425 for ; Tue, 16 May 2006 19:22:42 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB43D43D68 for ; Tue, 16 May 2006 19:22:41 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJMOmg079832 for ; Tue, 16 May 2006 19:22:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJMO1L079829 for perforce@freebsd.org; Tue, 16 May 2006 19:22:24 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:22:24 GMT Message-Id: <200605161922.k4GJMO1L079829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97287 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 19:22:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=97287 Change 97287 by millert@millert_p4 on 2006/05/16 19:22:16 Libsecompat, a compatibility shim to ease porting of SELinux components to SEBSD. Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/Makefile#19 edit .. //depot/projects/trustedbsd/sebsd/lib/libsecompat/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/lib/libsecompat/getline.c#1 add .. //depot/projects/trustedbsd/sebsd/lib/libsecompat/secompat.h#1 add .. //depot/projects/trustedbsd/sebsd/lib/libsecompat/strndup.c#1 add Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/Makefile#19 (text+ko) ==== @@ -37,7 +37,7 @@ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} \ - ${_libsebsd} ${_libsepol} + ${_libsecompat} ${_libsebsd} ${_libsepol} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -83,6 +83,7 @@ .endif .if !defined(NO_SEBSD) +_libsecompat= libsecompat _libsebsd= libsebsd _libsepol= libsepol .endif From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 19:27:26 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8394516A520 for ; Tue, 16 May 2006 19:27:26 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C37C543D55 for ; Tue, 16 May 2006 19:27:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2416046BFA for ; Tue, 16 May 2006 15:27:25 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 48AA25C6AD; Tue, 16 May 2006 19:26:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4148116A470; Tue, 16 May 2006 19:26:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C89E716A410 for ; Tue, 16 May 2006 19:26:47 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 546B343D46 for ; Tue, 16 May 2006 19:26:47 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJQU7G080043 for ; Tue, 16 May 2006 19:26:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJQTuo080040 for perforce@freebsd.org; Tue, 16 May 2006 19:26:30 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:26:30 GMT Message-Id: <200605161926.k4GJQTuo080040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97288 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 19:27:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=97288 Change 97288 by millert@millert_p4 on 2006/05/16 19:26:26 Replace libsebsd with libselinux and add libsemanage. Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/Makefile#20 edit .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/Makefile#8 delete .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/filecon.c#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/get_ordered_context_list.c#4 delete .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/getseccontext.c#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/query_user_context.c#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/sebsd.h#7 delete .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/sebsd_config.c#3 delete .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/security_change_context.c#3 delete .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/security_compute_av.c#5 delete .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/security_get_user_contexts.c#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/string_to_security_class.c#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/system.c#5 delete .. //depot/projects/trustedbsd/sebsd/lib/libselinux/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/lib/libsemanage/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/Makefile#20 (text+ko) ==== @@ -37,7 +37,7 @@ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} \ - ${_libsecompat} ${_libsebsd} ${_libsepol} + ${_libsecompat} ${_libselinux} ${_libsepol} ${_libsemanage} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -84,8 +84,9 @@ .if !defined(NO_SEBSD) _libsecompat= libsecompat -_libsebsd= libsebsd +_libselinux= libselinux _libsepol= libsepol +_libsemanage= libsemanage .endif .if ${MK_SENDMAIL} != "no" ==== //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#4 (text+ko) ==== @@ -2,21 +2,31 @@ # $FreeBSD: $ # -.PATH: ${.CURDIR} ${.CURDIR}/../../contrib/sebsd/libsepol/src ${.CURDIR}/../../contrib/sebsd/libsepol/include +.PATH: ${.CURDIR} ${.CURDIR}/../../contrib/sebsd/libsepol/src +.PATH: ${.CURDIR}/../../contrib/sebsd/libsepol/include +.PATH: ${.CURDIR}/../../contrib/sebsd/libsepol/man/man3 MAINTAINER= cboss@nai.com LIB= sepol CFLAGS+= -g -I${.CURDIR}/../../contrib/sebsd/libsepol/include -NOMAN= -SRCS= avtab.c conditional.c ebitmap.c genbools.c hashtab.c mls.c policydb.c \ - services.c sidtab.c symtab.c write.c +SRCS= assertion.c avrule_block.c avtab.c boolean_record.c booleans.c \ + conditional.c constraint.c context.c context_record.c debug.c \ + ebitmap.c expand.c genbools.c genusers.c handle.c hashtab.c \ + hierarchy.c iface_record.c interfaces.c link.c mls.c module.c \ + node_record.c nodes.c policydb.c policydb_convert.c \ + policydb_public.c port_record.c ports.c roles.c services.c \ + sidtab.c symtab.c user_record.c users.c util.c write.c INCSDIR=${INCLUDEDIR}/sepol -INCS= sepol/avtab.h sepol/conditional.h sepol/constraint.h sepol/context.h \ - sepol/ebitmap.h sepol/flask.h sepol/flask_types.h sepol/hashtab.h \ - sepol/mls.h sepol/mls_types.h sepol/policydb.h sepol/services.h \ - sepol/sidtab.h sepol/sepol.h sepol/symtab.h +INCS= sepol/boolean_record.h sepol/booleans.h sepol/context.h \ + sepol/context_record.h sepol/debug.h sepol/handle.h \ + sepol/iface_record.h sepol/interfaces.h sepol/module.h \ + sepol/node_record.h sepol/nodes.h sepol/policydb.h \ + sepol/port_record.h sepol/ports.h sepol/roles.h sepol/sepol.h \ + sepol/user_record.h sepol/users.h + +MAN= sepol_check_context.3 sepol_genbools.3 sepol_genusers.3 .include From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 19:37:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 63AE316A82F for ; Tue, 16 May 2006 19:37:28 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99E0C43D49 for ; Tue, 16 May 2006 19:37:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4E2CD46D0E for ; Tue, 16 May 2006 15:37:25 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4B3F055474; Tue, 16 May 2006 19:37:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 43C4D16A51A; Tue, 16 May 2006 19:37:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 063D916A518 for ; Tue, 16 May 2006 19:37:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEC1143D49 for ; Tue, 16 May 2006 19:37:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJb5Ki081303 for ; Tue, 16 May 2006 19:37:05 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJb5nk081300 for perforce@freebsd.org; Tue, 16 May 2006 19:37:05 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:37:05 GMT Message-Id: <200605161937.k4GJb5nk081300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97289 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 19:37:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=97289 Change 97289 by millert@millert_p4 on 2006/05/16 19:36:05 Build SEBSD userland components from the contrib dir. Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/Makefile#16 edit .. //depot/projects/trustedbsd/sebsd/sbin/restorecon/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.bin/Makefile#14 edit .. //depot/projects/trustedbsd/sebsd/usr.bin/checkmodule/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.bin/checkpolicy/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/usr.bin/chkcon/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.sbin/Makefile#16 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/avcstat/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.sbin/genhomedircon/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.sbin/load_policy/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.sbin/newrole/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_loadpolicy/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_loadpolicy/sebsd_loadpolicy.8#3 delete .. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_loadpolicy/sebsd_loadpolicy.c#3 delete .. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_newrole/Makefile#3 delete .. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_newrole/sebsd_newrole.1#2 delete .. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_newrole/sebsd_newrole.c#5 delete .. //depot/projects/trustedbsd/sebsd/usr.sbin/semodule/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.sbin/semodule_expand/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.sbin/semodule_link/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.sbin/semodule_package/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.sbin/setfiles/Makefile#1 add .. //depot/projects/trustedbsd/sebsd/usr.sbin/setsebool/Makefile#1 add Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/Makefile#16 (text+ko) ==== @@ -78,6 +78,7 @@ rcorder \ reboot \ restore \ + ${_restorecon} \ route \ routed \ rtsol \ @@ -117,6 +118,10 @@ _ping6= ping6 .endif +.if !defined(NO_SEBSD) +_restorecon= restorecon +.endif + .if ${MACHINE_ARCH} == "i386" .if ${MACHINE} == "i386" _fdisk= fdisk ==== //depot/projects/trustedbsd/sebsd/usr.bin/Makefile#14 (text+ko) ==== @@ -32,7 +32,9 @@ ${_catman} \ chat \ checknr \ + ${_checkmodule} \ ${_checkpolicy} \ + ${_chkcon} \ ${_chkey} \ chpass \ cksum \ @@ -328,7 +330,9 @@ .endif .if !defined(NO_SEBSD) -_checkpolicy= checkpolicy -.endif +_checkmodule= checkmodule +_checkpolicy= checkpolicy +_chkcon= chkcon +.endif .include ==== //depot/projects/trustedbsd/sebsd/usr.bin/checkpolicy/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/usr.sbin/Makefile#16 (text+ko) ==== @@ -155,8 +155,16 @@ rwhod \ sa \ ${_sendmail} \ - ${_sebsd_loadpolicy} \ - ${_sebsd_newrole} \ + ${_avcstat}\ + ${_genhomedircon}\ + ${_load_policy} \ + ${_newrole} \ + ${_setfiles} \ + ${_setsebool} \ + ${_semodule} \ + ${_semodule_expand} \ + ${_semodule_link} \ + ${_semodule_package} \ setpmac \ ${_sicontrol} \ sliplogin \ @@ -263,8 +271,16 @@ .endif .if !defined(NO_SEBSD) -_sebsd_loadpolicy= sebsd_loadpolicy -.sebsd_newrole= sebsd_newrole +_avcstat= avcstat +_genhomedircon= genhomedircon +_load_policy= load_policy +_newrole= newrole +_setfiles= setfiles +_setsebool= setsebool +_semodule= semodule +_semodule_expand= semodule_expand +_semodule_link= semodule_link +_semodule_package= semodule_package .endif .if ${MK_SENDMAIL} != "no" From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 20:00:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3480D16AA29 for ; Tue, 16 May 2006 20:00:54 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34BDA43D7B for ; Tue, 16 May 2006 20:00:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 11CAD46CEE for ; Tue, 16 May 2006 16:00:48 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 688E9579D1; Tue, 16 May 2006 19:58:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 60ABC16A9B2; Tue, 16 May 2006 19:58:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A53A16A99B for ; Tue, 16 May 2006 19:58:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 345E143D66 for ; Tue, 16 May 2006 19:58:53 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJwaIM082343 for ; Tue, 16 May 2006 19:58:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJwZTB082340 for perforce@freebsd.org; Tue, 16 May 2006 19:58:35 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:58:35 GMT Message-Id: <200605161958.k4GJwZTB082340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97293 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 20:00:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=97293 Change 97293 by millert@millert_p4 on 2006/05/16 19:58:00 change libsebsd -> libselinux add libsecompat and libsemanage Affected files ... .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.libnames.mk#14 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/share/mk/bsd.libnames.mk#14 (text+ko) ==== @@ -126,8 +126,10 @@ LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a -LIBSEBSD?= ${DESTDIR}${LIBDIR}/libsebsd.a +LIBSELINUX?= ${DESTDIR}${LIBDIR}/libselinux.a LIBSEPOL?= ${DESTDIR}${LIBDIR}/libsepol.a +LIBSECOMPAT?= ${DESTDIR}${LIBDIR}/libsecompat.a +LIBSEMANAGE?= ${DESTDIR}${LIBDIR}/libsemanage.a LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a LIBSSH?= ${DESTDIR}${LIBDIR}/libssh.a LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 20:00:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C4B916AA35 for ; Tue, 16 May 2006 20:00:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4DB443D72 for ; Tue, 16 May 2006 20:00:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D3A3946C6B for ; Tue, 16 May 2006 16:00:42 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 21C4F14C51E; Tue, 16 May 2006 19:57:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1615116AA1E; Tue, 16 May 2006 19:57:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75E1D16A944 for ; Tue, 16 May 2006 19:57:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71F8243D5A for ; Tue, 16 May 2006 19:57:51 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJvYXd082205 for ; Tue, 16 May 2006 19:57:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJvYBR082202 for perforce@freebsd.org; Tue, 16 May 2006 19:57:34 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:57:34 GMT Message-Id: <200605161957.k4GJvYBR082202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97292 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 20:00:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=97292 Change 97292 by millert@millert_p4 on 2006/05/16 19:56:59 Add semanage include dir Affected files ... .. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.include.dist#17 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.include.dist#17 (text+ko) ==== @@ -231,6 +231,8 @@ .. selinux .. + semanage + .. sepol .. sys From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 20:00:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65D8916A692 for ; Tue, 16 May 2006 20:00:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC67F43D73 for ; Tue, 16 May 2006 20:00:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A6B7246C58 for ; Tue, 16 May 2006 16:00:42 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4371456CD7; Tue, 16 May 2006 19:57:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F50D16A96D; Tue, 16 May 2006 19:57:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75A0A16A942 for ; Tue, 16 May 2006 19:57:51 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D0C243D55 for ; Tue, 16 May 2006 19:57:51 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GJvXuI082199 for ; Tue, 16 May 2006 19:57:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GJvXE0082196 for perforce@freebsd.org; Tue, 16 May 2006 19:57:33 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 19:57:33 GMT Message-Id: <200605161957.k4GJvXE0082196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97291 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 20:00:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=97291 Change 97291 by millert@millert_p4 on 2006/05/16 19:56:34 nftw(3) should not be limited by OPEN_MAN Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/libc/gen/ftw.3#3 edit .. //depot/projects/trustedbsd/sebsd/lib/libc/gen/nftw.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/libc/gen/ftw.3#3 (text+ko) ==== @@ -185,7 +185,10 @@ .It Bq Er EINVAL The .Fa maxfds -argument is less than 1. +argument is less than 1 or, in the case of +.Nm ftw +only, greater than +.Dv OPEN_MAX . .El .Sh SEE ALSO .Xr chdir 2 , ==== //depot/projects/trustedbsd/sebsd/lib/libc/gen/nftw.c#2 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, @@ -47,7 +46,7 @@ int error = 0, ftsflags, fnflag, postorder, sverrno; /* XXX - nfds is currently unused */ - if (nfds < 1 || nfds > OPEN_MAX) { + if (nfds < 1) { errno = EINVAL; return (-1); } From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 20:17:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C940A16A4F8 for ; Tue, 16 May 2006 20:17:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFA3D43D46 for ; Tue, 16 May 2006 20:17:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 324E946C6B for ; Tue, 16 May 2006 16:17:20 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 725CC55730; Tue, 16 May 2006 20:17:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B0FB16A52B; Tue, 16 May 2006 20:17:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 473A816A513 for ; Tue, 16 May 2006 20:17:18 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBED743D4C for ; Tue, 16 May 2006 20:17:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GKH0Gl084253 for ; Tue, 16 May 2006 20:17:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GKH0k1084248 for perforce@freebsd.org; Tue, 16 May 2006 20:17:00 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 20:17:00 GMT Message-Id: <200605162017.k4GKH0k1084248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97294 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 20:17:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=97294 Change 97294 by millert@millert_p4 on 2006/05/16 20:16:28 Update for new SEBSD userland Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.bin/login/Makefile#10 edit .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#13 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/Makefile#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.bin/login/Makefile#10 (text+ko) ==== @@ -16,13 +16,12 @@ .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 +DPADD+= ${LIBSELINUX} +LDADD+= -lselinux -lsepol -lsecompat .endif .include ==== //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#13 (text+ko) ==== @@ -68,9 +68,6 @@ #include #include #include -#ifdef SEBSD -#include -#endif #include #include #include @@ -84,6 +81,7 @@ #include #ifdef SEBSD #include +#include #include #endif @@ -467,7 +465,6 @@ label_string = login_getcapstr(lc, "ttylabel", NULL, NULL); if (label_string != NULL) { mac_t label; - int error; if (mac_from_text(&label, label_string) == 0) { if (pathconf(ttyn, _PC_MAC_PRESENT) > 0 && @@ -546,12 +543,11 @@ if (is_selinux_enabled()) { char *labeltext, *queried, *oldttylabeltext, *tty_queried=NULL, **contexts; - size_t ncontexts; mac_t newttylabel; - int n; + int n, ncontexts; - if (get_ordered_context_list(username, NULL, &contexts, - &ncontexts) != 0 || ncontexts == 0) + ncontexts = get_ordered_context_list(username, NULL, &contexts); + if (ncontexts <= 0) goto nosebsd; queried = NULL; @@ -578,10 +574,8 @@ } } - if (!queried) - if (query_user_context(pamh, contexts, ncontexts, - &queried) != 0) { - + if (queried == NULL && + query_user_context(contexts, &queried) != 0) { syslog(LOG_ERR, "Reading SEBSD domain from user:" " %m"); bail(NO_SLEEP_EXIT, 1); ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/Makefile#6 (text+ko) ==== @@ -12,8 +12,8 @@ .if !defined(NO_SEBSD) CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -DSEBSD -DPADD+= ${LIBSEBSD} -LDADD+= -lsebsd +DPADD+= ${LIBSELINUX} +LDADD+= -lselinux -lsepol -lsecompat .endif .include From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 20:24:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C29016A4C1 for ; Tue, 16 May 2006 20:24:43 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 467D843D45 for ; Tue, 16 May 2006 20:24:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4791946CF2 for ; Tue, 16 May 2006 16:24:40 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5136E63B4B; Tue, 16 May 2006 20:24:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A6C416AA61; Tue, 16 May 2006 20:24:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9EEDE16AA4F for ; Tue, 16 May 2006 20:24:27 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 621AC43D48 for ; Tue, 16 May 2006 20:24:27 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GKOAJp084545 for ; Tue, 16 May 2006 20:24:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GKOAnb084540 for perforce@freebsd.org; Tue, 16 May 2006 20:24:10 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 20:24:10 GMT Message-Id: <200605162024.k4GKOAnb084540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97295 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 20:24:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=97295 Change 97295 by millert@millert_p4 on 2006/05/16 20:23:30 Remove obsolete files Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/av_inherit.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/av_perm_to_string.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/class_to_string.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/include/selinux/common_perm_to_string.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man3/selinux_policyroot.3#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/man/man8/setsebool.8#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/src/helpers.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/deftype.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/execcon.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getcon.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/getenforcemode.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/mkdircon.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/selinuxconfig.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/selinuxdisable.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libselinux/utils/setsebool.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/avtab.h#5 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/conditional.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/constraint.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/ebitmap.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask_types.h#5 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/hashtab.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/mls.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/mls_types.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/services.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/sidtab.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/symtab.h#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/utils/genpolbools.c#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/policycoreutils.spec#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/fixfiles.8.gz#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policycoreutils/scripts/fixfiles.cron#3 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 16 20:42:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9249516A649 for ; Tue, 16 May 2006 20:42:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CF4243D48 for ; Tue, 16 May 2006 20:42:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 89EE146CE4 for ; Tue, 16 May 2006 16:42:52 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D399656418; Tue, 16 May 2006 20:40:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D8F1816A658; Tue, 16 May 2006 20:40:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B7BC16A63F for ; Tue, 16 May 2006 20:40:49 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FF7743D45 for ; Tue, 16 May 2006 20:40:49 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4GKeWGL085445 for ; Tue, 16 May 2006 20:40:32 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4GKeVgo085442 for perforce@freebsd.org; Tue, 16 May 2006 20:40:31 GMT (envelope-from millert@freebsd.org) Date: Tue, 16 May 2006 20:40:31 GMT Message-Id: <200605162040.k4GKeVgo085442@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97297 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2006 20:43:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=97297 Change 97297 by millert@millert_p4 on 2006/05/16 20:40:07 Update docs and add bootstrap procedure for installing SEBSD over stock FreeBSD. Affected files ... .. //depot/projects/trustedbsd/sebsd/Makefile#14 edit .. //depot/projects/trustedbsd/sebsd/SEBSD-Installation.txt#4 edit .. //depot/projects/trustedbsd/sebsd/SEBSD.txt#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/support/loader.conf.additions#1 add Differences ... ==== //depot/projects/trustedbsd/sebsd/Makefile#14 (text+ko) ==== @@ -304,3 +304,20 @@ @echo " (started ${STARTTIME})" @echo "--------------------------------------------------------------" .endif + +# Bootstrapping of SEBSD-specific bits +SEBSD_BOOTSTRAP_CHECK!= grep sebsd_bootstrap /boot/loader.conf +SEBSD_POLICYTYPE!= grep "TYPE" ${.CURDIR}/contrib/sebsd/refpolicy/build.conf | cut -d" " -f3 +sebsd_bootstrap: +.if exists(${.CURDIR}/contrib/sebsd) + @echo "Installing SEBSD policy" + (cd ${.CURDIR}/contrib/sebsd/refpolicy; gmake install-src) + (cd ${DESTDIR}/etc/security/sebsd/${SEBSD_POLICYTYPE}/src/policy; gmake install) +.if empty (BOOTSTRAP_CHECK) + @echo "Making modifications to /boot/loader.conf" + (cat ${.CURDIR}/contrib/sebsd/support/loader.conf.additions | sed s/\#SEBSD_POLICYTYPE\#/${SEBSD_POLICYTYPE}/ >> /boot/loader.conf) +.endif + + +.endif + ==== //depot/projects/trustedbsd/sebsd/SEBSD-Installation.txt#4 (text+ko) ==== @@ -2,109 +2,123 @@ SEBSD ships as a kernel loadable module that loads into a FreeBSD 6.0 kernel supporting the TrustedBSD MAC framework -(http://www.trustedbsd.org/). The SEBSD installation CD contains a -modified FreeBSD 6.0 distribution and a MAC kernel. The installation -process installs the FreeBSD operating system, including full source -code and MAC-aware programs. +(http://www.trustedbsd.org/). The SEBSD installation tarball contains a +modified FreeBSD 7.0 source tree. These instructions assume some familiarity with the FreeBSD operating -system installation, boot loader, kernel configuration, etc. The -sysinstall installation application used by SEBSD is nearly identical -to the one used by the FreeBSD project. A custom release was built to -install the SEBSD policy source files and to build a kernel with -TrustedBSD MAC Framework support. For more detailed information on -the FreeBSD operating system or the installation process, refer to the -FreeBSD handbook available at the project website: http://www.freebsd.org/. +system installation, boot loader, kernel configuration, use of the ports +collection etc. + +1. Install a FreeBSD 7.0 snapshot from CD. Our example system used + FreeBSD-7.0-SNAP013 from ftp.freebsd.org. For more information on + installing FreeBSD, see the FreeBSD Handbook at + http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ + Note: it is not required that you install any system source with your + FreeBSD 7.0 installation. The SEBSD source tarball contains an entire + set of system sources. You may want to install the FreeBSD ports + collection as there are some requirements for extra software not + included in the default FreeBSD installation. + +2. Install ports required for SEBSD. Since SEBSD uses policy ported from + SELinux, some additional tools are required for SEBSD to install and + function properly. You will need to install the following ports: + + - devel/gmake + - lang/gawk + - lang/python + + There are 2 methods of installing these ports. First is compilation + from the ports collection. This option is more reliable, but takes more + time due to compilation. Here is an example for gmake: + + # cd /usr/ports/devel/gmake + # make install + + The second option is installation of a pre-compiled binary package. + This option can be faster, but there is no guarantee that a binary + package of the proper version will be available. Here is an example + of this installation type for gmake. -1. Boot the FreeBSD 6.0-SEBSD installation CD; this CD will install - the complete operating system, including kernels, user - applications, and complete source code. A series of menus will - prompt the user how to proceed. + # pkg_add -r gmake - a. At the main menu, select an installation method, - typically, the standard installation is adequate. The - remainder of these instructions assume the standard - installation option was selected. +3. Install SEBSD sources. After downloading the sources from + http://www.trustedbsd.org/sebsd.html, untar them into /usr/src. - b. The next menu displays the disk partition manager. As - long as the installation machine will be dedicated to - SEBSD, allow the partition manager to use the entire disk - by selecting 'A'. Select 'Q' to exit the partition - manager. The installation program may print a warning - that this creates a dedicated machine. It will proceed to - ask which boot manager to install; select 'BootMgr' to - install the normal FreeBSD boot manager on this hard disk. + # cd /usr/src + # tar -zxf /path/to/sebsd-.tar.gz - c. The next menu will label the disk to create swap space and - individual file systems. Selecting 'A' will use the - default values. Select 'Q' to proceed to the next menu. +4. Build the SEBSD system. This process is similar to the canonical + building of world detailed in the FreeBSD Handbook, with a few + additional steps, and some re-arranging of the typical order. - d. The next menu selects the distributions to install. The - 'Developer' option is recommended. X Window support is - not included on this installation CD, and may be installed - later. Likewise, the optional ports collection is not - include on the SEBSD installation CD. + a. Build the system from sources and bootstrap SEBSD-specific + portions of the system. - e. On the next screen, Select CD/DVD from the installation - media menu. + # cd /usr/src + # make buildworld + # make buildkernel KERNCONF=MAC + # make installworld + # make sebsd_bootstrap + # make installkernel KERNCONF=MAC INSTKERNNAME=MAC - f. Confirm installation. WARNING: With the configuration - recommended in these instructions, all existing data on - the hard disk will be destroyed! + b. Edit /etc/fstab to mark filesystems as 'multilabel'. SEBSD requires + that mounted filesystems utilize the MAC Framework file labeling + support. Entries in your fstab should be edited to add the 'multilabel' + option. Below is an example fstab file: - g. SEBSD will be installed on the machine. Once complete, - the installation program will ask a series of questions to - help configure the new system. Answer these questions as - appropriate. +# Device Mountpoint FStype Options Dump Pass# +/dev/ad0s1b none swap sw 0 0 +/dev/ad0s1a / ufs rw,multilabel 1 1 +/dev/ad0s1e /usr ufs rw,multilabel 2 2 +/dev/ad0s1d /var ufs rw,multilabel 2 2 +/dev/acd0 /cdrom cd9660 ro,noauto 0 0 -2. Reboot the system when prompted. By default, the system will boot - the MAC kernel and load the SEBSD security module (with the - default policy). The file systems have not yet been labeled, so - many warnings will be printed to the system console. If it is - necessary to boot the generic FreeBSD kernel (without the MAC - framework), comment out the following lines in /boot/loader.conf: - kernel="MAC" - sebsd_load="YES" - Alternatively, the kernel and modules to load may be selected from - the FreeBSD boot loader. Refer to the FreeBSD handbook for more - information on the boot loader. + c. Reboot the system. By default, the system will boot + the MAC kernel and load the SEBSD security module (with the + default policy). The file systems have not yet been labeled, so + not many warnings will be printed to the system console. If it is + necessary to boot the generic FreeBSD kernel (without the MAC + framework), comment out the following lines in /boot/loader.conf: + kernel="MAC" + sebsd_load="YES" + Alternatively, the kernel and modules to load may be selected from + the FreeBSD boot loader. Refer to the FreeBSD handbook for more + information on the boot loader. -4. Inspect the SEBSD policy. The system comes pre-installed with a +5. Inspect the SEBSD policy. The system comes pre-installed with a sample policy, but local changes might be required. The policy - source is located in /etc/security/sebsd/policy and the compiled - (binary) version is installed in /etc/security/sebsd/policy/policy.bin by - default. Only the binary version is loaded by the SEBSD module at - boot time. An alternate location for the binary policy file may be - specified at the boot loader or in /boot/loader.conf. The boot loader - uses a symbolic link "policy.bin" in the same directory as policy.17, - in case a different policy file version is necessary. + source is located in /etc/security/sebsd/targeted/src/policy and the + compiled (binary) version is installed in + /etc/security/sebsd/targeted/policy/policy.20 by default. Only the + binary version is loaded by the SEBSD module at boot time. An alternate + location for the binary policy file may be specified at the boot loader + or in /boot/loader.conf. - Since SEBSD uses the same policy language as SELinux, the SELinux - report titled, "Configuring the SELinux Policy", (available at the - SELinux project web site: http://www.nsa.gov/selinux/) can provide - additional information. If you make changes to the policy source, - you must re-install the modified binary policy: + Since SEBSD uses a ported version of the SELinux reference policy + the SELinux Reference Policy site at Sourceforge + (http://refpolicy.sourceforge.net) can provide additional information. + If you make changes to the policy source, you must re-compile and install + the modified binary policy: - cd /etc/security/sebsd/policy && make install + # cd /etc/security/sebsd/targeted/src/policy && gmake && gmake install If changes were made to the policy, the modified version must be - loaded into the kernel. The /sbin/sebsd_loadpolicy program can be + loaded into the kernel. The /usr/sbin/load_policy program can be used instead of a reboot: - /sbin/sebsd_loadpolicy /etc/security/sebsd/policy/policy.bin + /usr/sbin/load_policy /etc/security/sebsd/targeted/policy/policy.20 - Note that policy.bin is installed by default as a symlink to another - file. If you plan to generate your own policy file then you might - need to adjust this. - -5. Label the file system. By default, extended attribute support was - enabled during the install, but the individual files were not +6. Label the file system. In step 4b, extended attribute support was + enabled in the fstab file , but the individual filesystems were not labeled. To label all file systems, login as root and run the following command: - cd /etc/security/sebsd/policy && make relabel + cd /etc/security/sebsd/targeted/src/policy && gmake relabel + + Note that you will see several errors during the relabel process as + well as many permission denials on the system console. This is normal. -6. Reboot the machine, so that applications can use the file labels +7. Reboot the machine, so that applications can use the file labels and will be started in the correct domains. At this point, the machine will be running SEBSD with the sample @@ -119,7 +133,10 @@ To disable: sysctl security.mac.sebsd.enforcing=0 Note that with the sample policy, only root running in the sysadm_r -role is permitted to toggle the enforcement state. +role is permitted to toggle the enforcement state. Also note that +the policy currently supplied is a very early port of the SELinux +reference policy, and will likely not function properly in enforcing +mode. If you would like the machine to default to enforcing mode at boot time, you may specify a default value for this sysctl in ==== //depot/projects/trustedbsd/sebsd/SEBSD.txt#2 (text+ko) ==== @@ -1,11 +1,11 @@ SEBSD - Security-Enhanced BSD SPARTA, Inc. -SEBSD is an experimnetal implementation of NSA's FLASK and Type Enforcement -technologies, ported from SELinux use the TrustedBSD MAC Framework. SEBSD +SEBSD is an experimental implementation of NSA's FLASK and Type Enforcement +technologies, ported from SELinux using the TrustedBSD MAC Framework. SEBSD consists of the following components: -- FreeBSD 6.x source tree. +- FreeBSD 7.x source tree. - SEBSD policy module (src/sys/security/sebsd/) - NSA's FLASK security architecture, including Access Vector Cache @@ -16,13 +16,13 @@ - Modified SELinux sample policy, capable of running (with some limitations) on SEBSD. (src/contrib/sebsd/policy/) -- Modifications to the FreeBSD 6.x kernel to extend the MAC Framework to +- Modifications to the FreeBSD 7.x kernel to extend the MAC Framework to support additional labeling and enforcement points required by SEBSD. (src/sys) -- Modifications to the FreeBSD 6.x user space to support transition-based +- Modifications to the FreeBSD 7.x user space to support transition-based labeling changes as part of user credential events. (src/) -- SELinux userland components, including libsepol, libselinux, newrole, +- SELinux userland components, including libsepol, libselinux, libsemanage, and policy tools. (src/contrib/sebsd/{checkpolicy,libselinux,libsepol, - policycoreutils}/) + libsemanage,policycoreutils}/) From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 12:48:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC44F16A440 for ; Wed, 17 May 2006 12:48:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E97943D58 for ; Wed, 17 May 2006 12:48:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 94FAA46C01 for ; Wed, 17 May 2006 08:48:52 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4BADA644DB; Wed, 17 May 2006 12:44:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E08A16A473; Wed, 17 May 2006 12:44:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A075316A440 for ; Wed, 17 May 2006 12:44:13 +0000 (UTC) (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 5714543D5E for ; Wed, 17 May 2006 12:44:13 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HChrmh088737 for ; Wed, 17 May 2006 12:43:53 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HChqA0088731 for perforce@freebsd.org; Wed, 17 May 2006 12:43:52 GMT (envelope-from wsalamon@computer.org) Date: Wed, 17 May 2006 12:43:52 GMT Message-Id: <200605171243.k4HChqA0088731@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 97338 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 12:48:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=97338 Change 97338 by wsalamon@vh1 on 2006/05/17 12:43:39 Add include of audit header because the audit pipe IOCTLs need access to the audit types. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/kdump/mkioctls#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/kdump/mkioctls#3 (text+ko) ==== @@ -38,6 +38,7 @@ print "#include " print "#include " print "#include " + print "#include " print "#include " print "#include " print "#include " From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 14:05:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 079D416A4CC for ; Wed, 17 May 2006 14:05:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BAD843D5C for ; Wed, 17 May 2006 14:05:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E0DB446D46 for ; Wed, 17 May 2006 10:05:33 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0D4EC729E9; Wed, 17 May 2006 13:57:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0716B16A474; Wed, 17 May 2006 13:57:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A428116A442 for ; Wed, 17 May 2006 13:57:45 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 700B243D45 for ; Wed, 17 May 2006 13:57:45 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HDvPfQ015476 for ; Wed, 17 May 2006 13:57:25 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HDvOIR015473 for perforce@freebsd.org; Wed, 17 May 2006 13:57:24 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 13:57:24 GMT Message-Id: <200605171357.k4HDvOIR015473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97341 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 14:05:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=97341 Change 97341 by millert@millert_p4 on 2006/05/17 13:56:25 include for get_default_context() prototype. Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#7 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/do_command.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#7 (text+ko) ==== @@ -33,6 +33,7 @@ #ifdef SEBSD #include +#include #include #include #endif ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/do_command.c#10 (text+ko) ==== @@ -35,6 +35,7 @@ #include #ifdef SEBSD #include +#include #endif From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 14:34:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A4DC916A6F2 for ; Wed, 17 May 2006 14:34:43 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8ADEA43D6D for ; Wed, 17 May 2006 14:34:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id DB58046D2A for ; Wed, 17 May 2006 10:34:34 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E9A1E5BA02; Wed, 17 May 2006 14:34:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CBD4316A6E9; Wed, 17 May 2006 14:34:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C33FE16A55C for ; Wed, 17 May 2006 14:34:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4F3243D6A for ; Wed, 17 May 2006 14:34:30 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HEYAvY018101 for ; Wed, 17 May 2006 14:34:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HEYAWJ018098 for perforce@freebsd.org; Wed, 17 May 2006 14:34:10 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 14:34:10 GMT Message-Id: <200605171434.k4HEYAWJ018098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97343 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 14:34:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=97343 Change 97343 by millert@millert_ibook on 2006/05/17 14:33:45 Remove cruft. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/console/panic_image.c.orig#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ppc/chud/chud_spr.h.orig#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ppc/chud/chud_spr.h.rej#3 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 18:40:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCA8216B86A for ; Wed, 17 May 2006 18:40:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8767F43D69 for ; Wed, 17 May 2006 18:40:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3908846D27 for ; Wed, 17 May 2006 14:40:28 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 96DE1643B6; Wed, 17 May 2006 18:40:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F61916B83A; Wed, 17 May 2006 18:40:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED59D16B81C for ; Wed, 17 May 2006 18:40:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89C6043D86 for ; Wed, 17 May 2006 18:39:43 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HIdLf6041549 for ; Wed, 17 May 2006 18:39:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HIdLYN041546 for perforce@freebsd.org; Wed, 17 May 2006 18:39:21 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 18:39:21 GMT Message-Id: <200605171839.k4HIdLYN041546@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97357 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 18:40:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=97357 Change 97357 by millert@millert_ibook on 2006/05/17 18:38:56 Use correct free function. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/avtab.c#8 (text+ko) ==== @@ -235,7 +235,7 @@ while (cur != NULL) { temp = cur; cur = cur->next; - kfree(temp); + zfree(avtab_node_cachep, (vm_offset_t)temp); } h->htable[i] = NULL; } From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 18:42:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A22D916B98C for ; Wed, 17 May 2006 18:42:50 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCDC143D72 for ; Wed, 17 May 2006 18:42:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 07CB446CFF for ; Wed, 17 May 2006 14:42:24 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4ABB27271B; Wed, 17 May 2006 18:42:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4273A16B853; Wed, 17 May 2006 18:42:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09AD416A9EA for ; Wed, 17 May 2006 18:42:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C223C43D8B for ; Wed, 17 May 2006 18:41:46 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HIfP56041858 for ; Wed, 17 May 2006 18:41:25 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HIfPRg041855 for perforce@freebsd.org; Wed, 17 May 2006 18:41:25 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 18:41:25 GMT Message-Id: <200605171841.k4HIfPRg041855@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97359 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 18:42:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=97359 Change 97359 by millert@millert_ibook on 2006/05/17 18:40:31 selinux_binary_policy_path() should return the policy path without a suffix. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/sedarwin_config.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/sedarwin_config.c#6 (text+ko) ==== @@ -62,7 +62,7 @@ const char * selinux_binary_policy_path(void) { - return (SEDARWIN_DIR "/policy/policy.bin"); + return (SEDARWIN_DIR "/policy/policy"); } hidden_def(selinux_binary_policy_path) From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 18:46:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C89916B9CE for ; Wed, 17 May 2006 18:46:44 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEF7E43D8D for ; Wed, 17 May 2006 18:46:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D5BBB46CFB for ; Wed, 17 May 2006 14:46:11 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DD3A1542D1; Wed, 17 May 2006 18:45:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8820F16B018; Wed, 17 May 2006 18:45:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4417416B01E for ; Wed, 17 May 2006 18:45:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8805143D9E for ; Wed, 17 May 2006 18:45:08 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HIiTHw042139 for ; Wed, 17 May 2006 18:44:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HIiTew042136 for perforce@freebsd.org; Wed, 17 May 2006 18:44:29 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 18:44:29 GMT Message-Id: <200605171844.k4HIiTew042136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97360 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 18:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=97360 Change 97360 by millert@millert_ibook on 2006/05/17 18:44:29 No longer need nftw.c in libsecompat Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/ftw.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/nftw.c#2 delete Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsecompat/Makefile#2 (text+ko) ==== @@ -9,7 +9,7 @@ LIBVERSION = 1 -SRCS= getline.c strndup.c nftw.c +SRCS= getline.c strndup.c LIBA=libsecompat.a OBJS= $(patsubst %.c,%.o,$(SRCS)) From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 18:48:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 08A1016A437 for ; Wed, 17 May 2006 18:48:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDAF643D5C for ; Wed, 17 May 2006 18:47:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A6F1D46D2D for ; Wed, 17 May 2006 14:47:23 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DBE3553FA1; Wed, 17 May 2006 18:47:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D11BD16B04E; Wed, 17 May 2006 18:47:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9014E16B04B for ; Wed, 17 May 2006 18:47:05 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73DBF43D6B for ; Wed, 17 May 2006 18:46:54 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HIkW4m042348 for ; Wed, 17 May 2006 18:46:32 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HIkW1x042345 for perforce@freebsd.org; Wed, 17 May 2006 18:46:32 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 18:46:32 GMT Message-Id: <200605171846.k4HIkW1x042345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97361 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 18:48:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=97361 Change 97361 by millert@millert_ibook on 2006/05/17 18:46:12 Remove userland sebsd.h Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getcon.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_migscs.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_policy.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/sebsd.h#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setcon.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getcon.c#4 (text+ko) ==== @@ -5,8 +5,6 @@ #include #include #include "policy.h" -#include -#include #include int getcon_raw(security_context_t *context) @@ -16,7 +14,7 @@ int error; int ret = 0; - error = mac_prepare(&label, SEBSD_ID_STRING); + error = mac_prepare(&label, "sebsd"); if (error) return -1; error = mac_get_proc(label); ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_migscs.c#2 (text+ko) ==== @@ -3,7 +3,6 @@ #include #include #include -#include int selinux_load_migscs(const char *path) @@ -23,5 +22,5 @@ if (fread(la.data, la.len, 1, fp) != 1) return (EIO); - return (mac_syscall(SEBSD_ID_STRING, SEBSDCALL_LOAD_MIGSCS, &la)); + return (mac_syscall("sebsd", SEBSDCALL_LOAD_MIGSCS, &la)); } ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_policy.c#3 (text+ko) ==== @@ -16,8 +16,6 @@ #include #include "policy.h" #include -#include -#include #include int security_load_policy(void *data, size_t len) @@ -26,7 +24,7 @@ la.len = len; la.data = data; - return mac_syscall(SEBSD_ID_STRING, SEBSDCALL_LOAD_POLICY, &la); + return mac_syscall("sebsd", SEBSDCALL_LOAD_POLICY, &la); } hidden_def(security_load_policy) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setcon.c#2 (text+ko) ==== @@ -7,15 +7,13 @@ #include #include "selinux_internal.h" #include -#include -#include int setcon_raw(security_context_t context) { mac_t label; int error; - error = mac_prepare(&label, SEBSD_ID_STRING); + error = mac_prepare(&label, "sebsd"); if (error) return -1; error = mac_from_text(&label, context); From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 18:58:22 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF6E116BB71 for ; Wed, 17 May 2006 18:58:22 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40B7C43D67 for ; Wed, 17 May 2006 18:58:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1BC7346BA1 for ; Wed, 17 May 2006 14:58:11 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 80F6772AF6; Wed, 17 May 2006 18:58:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7648D16B08D; Wed, 17 May 2006 18:58:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 350EC16B084 for ; Wed, 17 May 2006 18:58:10 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 011EB43D73 for ; Wed, 17 May 2006 18:58:10 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HIvmEb042801 for ; Wed, 17 May 2006 18:57:48 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HIvmom042798 for perforce@freebsd.org; Wed, 17 May 2006 18:57:48 GMT (envelope-from deker@FreeBSD.org) Date: Wed, 17 May 2006 18:57:48 GMT Message-Id: <200605171857.k4HIvmom042798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 97362 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 18:58:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=97362 Change 97362 by deker@sebsd_build on 2006/05/17 18:57:44 Update for new policy location Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/boot/forth/loader.conf#13 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/boot/forth/loader.conf#13 (text+ko) ==== @@ -384,7 +384,7 @@ sebsd_load="NO" # Security-Enhanced BSD module sebsdpolicy_load="NO" sebsdpolicy_type="sebsd_policy" -sebsdpolicy_name="/etc/security/sebsd/policy.bin" +sebsdpolicy_name="/etc/security/sebsd/targeted/policy/policy.20" ############################################################## ### Module loading syntax example ########################## From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 19:01:51 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E38216BB9A for ; Wed, 17 May 2006 19:01:51 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A72043D73 for ; Wed, 17 May 2006 19:01:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D177C46D27 for ; Wed, 17 May 2006 15:01:48 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D5E847333E; Wed, 17 May 2006 19:01:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CA92716B07F; Wed, 17 May 2006 19:01:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40F4016AA61 for ; Wed, 17 May 2006 19:01:15 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9048543D67 for ; Wed, 17 May 2006 19:01:14 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HJ0rbP043153 for ; Wed, 17 May 2006 19:00:53 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJ0rQU043150 for perforce@freebsd.org; Wed, 17 May 2006 19:00:53 GMT (envelope-from deker@FreeBSD.org) Date: Wed, 17 May 2006 19:00:53 GMT Message-Id: <200605171900.k4HJ0rQU043150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 97363 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:01:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=97363 Change 97363 by deker@sebsd_build on 2006/05/17 19:00:51 Remove old version policy install bits. Affected files ... .. //depot/projects/trustedbsd/sebsd/etc/Makefile#15 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/etc/Makefile#15 (text+ko) ==== @@ -141,10 +141,6 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSL} ${DESTDIR}/etc/ssl .endif -.if exists(${.CURDIR}/../contrib/sebsd) - (cd ${.CURDIR}/../contrib/sebsd/policy; cpio -p -R${BINOWN}:${BINGRP} ${DESTDIR}/etc/security/sebsd/policy < files.lst) - (cd ${DESTDIR}/etc/security/sebsd/policy; ${MAKE} install) -.endif .if ${MK_KERBEROS} != "no" cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 19:02:47 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67ACE16BAE0 for ; Wed, 17 May 2006 19:02:47 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27A4C43D70 for ; Wed, 17 May 2006 19:02:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 67F7B46CC7 for ; Wed, 17 May 2006 15:02:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DBC1F73373; Wed, 17 May 2006 19:02:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D065216B0D1; Wed, 17 May 2006 19:02:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D019316B0CC for ; Wed, 17 May 2006 19:02:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79FC043D53 for ; Wed, 17 May 2006 19:02:16 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HJ1tGi043287 for ; Wed, 17 May 2006 19:01:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJ1sMN043284 for perforce@freebsd.org; Wed, 17 May 2006 19:01:54 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 19:01:54 GMT Message-Id: <200605171901.k4HJ1sMN043284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97364 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:02:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=97364 Change 97364 by millert@millert_ibook on 2006/05/17 19:01:33 Update to libsepol version 1.12.4 Obtained from: selinux.sourceforge.net Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/ebitmap.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/expand.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/module.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/write.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,16 @@ +1.12.4 2006-03-29 + * Generalize test for bitmap overflow in ebitmap_set_bit. + +1.12.3 2006-03-27 + * Fixed attr_convert_callback and expand_convert_type_set + typemap bug. + +1.12.2 2006-03-24 + * Fixed avrule_block_write num_decls endian bug. + +1.12.1 2006-03-20 + * Fixed sepol_module_package_write buffer overflow bug. + 1.12 2006-03-14 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.12 +1.12.4 ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/ebitmap.c#3 (text+ko) ==== @@ -12,6 +12,7 @@ #include #include +#include "debug.h" #include "private.h" int ebitmap_or(ebitmap_t * dst, ebitmap_t * e1, ebitmap_t * e2) @@ -181,7 +182,13 @@ int ebitmap_set_bit(ebitmap_t * e, unsigned int bit, int value) { ebitmap_node_t *n, *prev, *new; + uint32_t startbit = bit & ~(MAPSIZE - 1); + uint32_t highbit = startbit + MAPSIZE; + if (highbit == 0) { + ERR(NULL, "bitmap overflow, bit 0x%x", bit); + return -EINVAL; + } prev = 0; n = e->node; @@ -226,12 +233,13 @@ return -ENOMEM; memset(new, 0, sizeof(ebitmap_node_t)); - new->startbit = bit & ~(MAPSIZE - 1); + new->startbit = startbit; new->map = (MAPBIT << (bit - new->startbit)); - if (!n) + if (!n) { /* this node will be the highest map within the bitmap */ - e->highbit = new->startbit + MAPSIZE; + e->highbit = highbit; + } if (prev) { new->next = prev->next; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/expand.c#2 (text+ko) ==== @@ -138,6 +138,8 @@ ebitmap_for_each_bit(&type->types, node, i) { if (!ebitmap_node_get_bit(node, i)) continue; + if (!state->typemap[i]) + continue; if (ebitmap_set_bit(&new_type->types, state->typemap[i]-1, 1)) { ERR (state->handle, "out of memory"); @@ -1441,6 +1443,8 @@ ebitmap_for_each_bit(&tmp, tnode, i) { if (!ebitmap_node_get_bit(tnode, i)) continue; + if (!typemap[i]) + continue; if (ebitmap_set_bit(types, typemap[i] - 1, 1)) return -1; } ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/module.c#2 (text+ko) ==== @@ -661,7 +661,7 @@ { struct policy_file *file = &spf->pf; policy_file_t polfile; - uint32_t buf[3], offsets[5], len, nsec = 0; + uint32_t buf[5], offsets[5], len, nsec = 0; int i; if (p->policy) { ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/write.c#3 (text+ko) ==== @@ -1340,7 +1340,7 @@ for (decl = cur->branch_list; decl != NULL; decl = decl->next) { num_decls++; } - buf[0] = num_decls; + buf[0] = cpu_to_le32(num_decls); if (put_entry(buf, sizeof(uint32_t), 1, fp) != 1) { return -1; } From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 19:05:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8A3316BBA1 for ; Wed, 17 May 2006 19:05:30 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E03D643D48 for ; Wed, 17 May 2006 19:05:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7233C46C6E for ; Wed, 17 May 2006 15:05:28 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BEA825BEBA; Wed, 17 May 2006 19:05:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B2EBF16B0DC; Wed, 17 May 2006 19:05:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F07F16A60D for ; Wed, 17 May 2006 19:05:21 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9580943D55 for ; Wed, 17 May 2006 19:05:20 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HJ4xnQ044571 for ; Wed, 17 May 2006 19:04:59 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJ4x71044568 for perforce@freebsd.org; Wed, 17 May 2006 19:04:59 GMT (envelope-from deker@FreeBSD.org) Date: Wed, 17 May 2006 19:04:59 GMT Message-Id: <200605171904.k4HJ4x71044568@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 97365 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:05:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=97365 Change 97365 by deker@sebsd_build on 2006/05/17 19:04:31 Delete hackish loader.conf update. Affected files ... .. //depot/projects/trustedbsd/sebsd/Makefile#15 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/support/loader.conf.additions#2 delete Differences ... ==== //depot/projects/trustedbsd/sebsd/Makefile#15 (text+ko) ==== @@ -306,18 +306,11 @@ .endif # Bootstrapping of SEBSD-specific bits -SEBSD_BOOTSTRAP_CHECK!= grep sebsd_bootstrap /boot/loader.conf -SEBSD_POLICYTYPE!= grep "TYPE" ${.CURDIR}/contrib/sebsd/refpolicy/build.conf | cut -d" " -f3 sebsd_bootstrap: .if exists(${.CURDIR}/contrib/sebsd) @echo "Installing SEBSD policy" (cd ${.CURDIR}/contrib/sebsd/refpolicy; gmake install-src) (cd ${DESTDIR}/etc/security/sebsd/${SEBSD_POLICYTYPE}/src/policy; gmake install) -.if empty (BOOTSTRAP_CHECK) - @echo "Making modifications to /boot/loader.conf" - (cat ${.CURDIR}/contrib/sebsd/support/loader.conf.additions | sed s/\#SEBSD_POLICYTYPE\#/${SEBSD_POLICYTYPE}/ >> /boot/loader.conf) -.endif - .endif From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 19:05:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CA4516BB96 for ; Wed, 17 May 2006 19:05:37 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF0E243D48 for ; Wed, 17 May 2006 19:05:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4C1AB46D2B for ; Wed, 17 May 2006 15:05:34 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E652A7309C; Wed, 17 May 2006 19:05:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E28716B0AD; Wed, 17 May 2006 19:05:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62B6916A66A for ; Wed, 17 May 2006 19:05:22 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E63743D5C for ; Wed, 17 May 2006 19:05:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HJ4xsY044577 for ; Wed, 17 May 2006 19:04:59 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJ4xoS044574 for perforce@freebsd.org; Wed, 17 May 2006 19:04:59 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 19:04:59 GMT Message-Id: <200605171904.k4HJ4xoS044574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97366 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:05:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=97366 Change 97366 by millert@millert_ibook on 2006/05/17 19:04:33 Properly label all tty and disk device nodes and add transitions for fsck, mount, etc. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/devfs#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#10 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/sebsd-relabel.sh#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/devfs#3 (text+ko) ==== @@ -9,6 +9,22 @@ genfscon devfs /random system_u:object_r:random_device_t genfscon devfs /urandom system_u:object_r:random_device_t genfscon devfs /ttyp system_u:object_r:devpts_t +genfscon devfs /ttyq system_u:object_r:devpts_t +genfscon devfs /ttyr system_u:object_r:devpts_t +genfscon devfs /ttys system_u:object_r:devpts_t +genfscon devfs /ttyt system_u:object_r:devpts_t +genfscon devfs /ttyu system_u:object_r:devpts_t +genfscon devfs /ttyv system_u:object_r:devpts_t +genfscon devfs /ttyw system_u:object_r:devpts_t genfscon devfs /ptyp system_u:object_r:devpts_t +genfscon devfs /ptyq system_u:object_r:devpts_t +genfscon devfs /ptyr system_u:object_r:devpts_t +genfscon devfs /ptys system_u:object_r:devpts_t +genfscon devfs /ptyt system_u:object_r:devpts_t +genfscon devfs /ptyu system_u:object_r:devpts_t +genfscon devfs /ptyv system_u:object_r:devpts_t +genfscon devfs /ptyw system_u:object_r:devpts_t +genfscon devfs /disk system_u:object_r:disk_device_t +#genfscon devfs /bpf system_u:object_r:bpf_device_t # FLASK ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#10 (text+ko) ==== @@ -32,6 +32,7 @@ type sysadm_devpts_t; type tmpfs_t; type device_t; +type disk_device_t; type memory_device_t; type null_device_t; type zero_device_t; @@ -62,6 +63,7 @@ type notifyd_d, domain, domain2; type mtest_d, domain, domain2; type diskarbitrationd_d, domain, domain2; +type fsadm_d, domain, domain2; type configd_d, domain, domain2; type pbs_exec_t, file; @@ -76,6 +78,7 @@ type notifyd_exec_t, file; type mtest_exec_t, file; type diskarbitrationd_exec_t, file; +type fsadm_exec_t, file; type configd_exec_t, file; role system_r types init_d; @@ -97,6 +100,7 @@ role system_r types notifyd_d; role system_r types mtest_d; role system_r types diskarbitrationd_d; +role system_r types fsadm_d; role system_r types configd_d; role system_r types security_t; role system_r types unlabeled_t; @@ -177,6 +181,8 @@ allow domain2 file:{file lnk_file sock_file fifo_file} {create_file_perms execute }; allow domain2 file:file execute_no_trans; allow domain2 file:dir { create_dir_perms }; +allow domain2 device_t:dir { read search getattr }; +allow domain2 {device_t disk_device_t}:{blk_file} { getattr }; allow domain2 {null_device_t console_device_t memory_device_t random_device_t zero_device_t device_t}:{file chr_file} create_file_perms; allow domain2 device_t:blk_file create_file_perms; allow domain2 {devpts_t user_devpts_t sysadm_devpts_t}:chr_file create_file_perms; @@ -212,6 +218,13 @@ # Transitions for mtest domain_auto_trans(user_secret_d,mtest_exec_t,mtest_d); +# Transitions for fsck* +domain_auto_trans(init_d,fsadm_exec_t,fsadm_d); +allow_mach_ipc(fsadm_d,mach_init_d); +allow_mach_ipc(fsadm_d,unlabeled_t); +allow fsadm_d device_t:dir { read search getattr }; +allow fsadm_d disk_device_t:blk_file { read write getattr }; + domain_auto_trans(systemstarter_d,windowserver_exec_t,windowserver_d); domain_auto_trans(systemstarter_d,securityserver_exec_t,securityserver_d); domain_auto_trans(systemstarter_d,coreservices_exec_t,coreservices_d); @@ -325,6 +338,7 @@ allow_mach_ipc(diskarbitrationd_d,lookupd_d); allow_mach_ipc(diskarbitrationd_d,securityserver_d); allow_mach_ipc(diskarbitrationd_d,systemstarter_d); +allow diskarbitrationd_d disk_device_t:blk_file { read write getattr }; # user_d rules allow_notify_ipc(user_d); ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/sebsd-relabel.sh#5 (text+ko) ==== @@ -12,6 +12,8 @@ $SETFMAC sebsd/system_u:object_r:bin_t /bin/* $SETFMAC sebsd/system_u:object_r:bin_t /usr/bin/* $SETFMAC sebsd/system_u:object_r:bin_t /usr/local/bin/* +$SETFMAC sebsd/system_u:object_r:fsadm_exec_t /sbin/fsck* +$SETFMAC sebsd/system_u:object_r:fsadm_exec_t /sbin/mount* $SETFMAC sebsd/system_u:object_r:shell_exec_t /bin/*sh $SETFMAC sebsd/system_u:object_r:login_exec_t /usr/bin/login $SETFMAC sebsd/system_u:object_r:sshd_exec_t /usr/sbin/sshd From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 19:06:33 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE1D016B0C8 for ; Wed, 17 May 2006 19:06:33 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9FD443D49 for ; Wed, 17 May 2006 19:06:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C173246D18 for ; Wed, 17 May 2006 15:06:28 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AD0B363E18; Wed, 17 May 2006 19:06:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 78E6416AA49; Wed, 17 May 2006 19:06:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74FB916A99B for ; Wed, 17 May 2006 19:06:24 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECF9543D5A for ; Wed, 17 May 2006 19:06:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HJ618p044787 for ; Wed, 17 May 2006 19:06:01 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJ61nP044784 for perforce@freebsd.org; Wed, 17 May 2006 19:06:01 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 19:06:01 GMT Message-Id: <200605171906.k4HJ61nP044784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97367 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:06:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=97367 Change 97367 by millert@millert_ibook on 2006/05/17 19:05:58 Use fts() not nftw() Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/restorecon/restorecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/setfiles/setfiles.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/restorecon/restorecon.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ #include #include #include +#include #include #include #include #include #include -#define __USE_XOPEN_EXTENDED 1 /* nftw */ -#include +#include static int change=1; static int verbose=0; @@ -46,8 +46,6 @@ static int errors=0; static int recurse=0; static int force=0; -#define STAT_BLOCK_SIZE 1 -static int pipe_fds[2] = { -1, -1 }; #define MAX_EXCLUDES 100 static int excludeCtr=0; @@ -118,7 +116,7 @@ "usage: %s [-FnrRv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n", name); exit(1); } -/* filename has trailing '/' removed by nftw or other calling code */ +/* filename has trailing '/' removed by fts or other calling code */ int restore(const char *filename) { int retcontext=0; security_context_t scontext=NULL; @@ -228,59 +226,47 @@ return errors; } -static int pre_stat(const char *file_unused __attribute__((unused)), - const struct stat *sb_unused __attribute__((unused)), - int flag_unused __attribute__((unused)), - struct FTW *s_unused __attribute__((unused))) +static int apply_spec(const char *file, const struct stat *sb) { - char buf[STAT_BLOCK_SIZE]; - if(write(pipe_fds[1], buf, STAT_BLOCK_SIZE) != STAT_BLOCK_SIZE) - { - fprintf(stderr, "Error writing to stat pipe, child exiting.\n"); - exit(1); - } - return 0; -} - -static int apply_spec(const char *file, - const struct stat *sb_unused __attribute__((unused)), - int flag, - struct FTW *s_unused __attribute__((unused))) -{ - char buf[STAT_BLOCK_SIZE]; - if(pipe_fds[0] != -1 && read(pipe_fds[0], buf, STAT_BLOCK_SIZE) != STAT_BLOCK_SIZE) - { - fprintf(stderr, "Read error on pipe.\n"); - pipe_fds[0] = -1; - } - if (flag == FTW_DNR) { - fprintf(stderr, "%s: unable to read directory %s\n", - progname, file); - return 0; - } - errors=errors+restore(file); + errors += restore(file); return 0; } void process(char *buf) { - int rc; if (recurse) { - if(pipe(pipe_fds) == -1) - rc = -1; + FTS *fts; + FTSENT *ftsent; + char *av[2] = {buf, NULL}; + + fts = fts_open(av, FTS_PHYSICAL | FTS_COMFOLLOW, NULL); + if (fts == NULL) { + fprintf(stderr, "%s: error while labeling files under %s\n", + progname, buf); + errors++; + } else - rc = fork(); - if(rc == 0) { - close(pipe_fds[0]); - nftw(buf, pre_stat, 1024, FTW_PHYS); - exit(1); - } - if(rc > 0) - close(pipe_fds[1]); - if(rc == -1 || rc > 0) { - if (nftw(buf, apply_spec, 1024, FTW_PHYS)) { - fprintf(stderr, "%s: error while labeling files under %s\n", - progname, buf); - errors++; + while ((ftsent = fts_read(fts)) != NULL) { + switch (ftsent->fts_info) { + case FTS_DEFAULT: + case FTS_D: + case FTS_F: + case FTS_SL: + case FTS_W: + apply_spec(ftsent->fts_path, ftsent->fts_statp); + break; + case FTS_DNR: + fprintf(stderr, "%s: unable to read directory %s\n", + progname, ftsent->fts_path); + break; + case FTS_NS: + fprintf(stderr, "%s: unable to stat file %s\n", + progname, ftsent->fts_path); + break; + case FTS_ERR: + fprintf(stderr, "%s: %s: %s\n", progname, ftsent->fts_path, + strerror(ftsent->fts_errno)); + break; + } } } } ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policycoreutils/setfiles/setfiles.c#2 (text+ko) ==== @@ -68,8 +68,7 @@ #include #include #include -#define __USE_XOPEN_EXTENDED 1 /* nftw */ -#include +#include #include #include #include @@ -79,8 +78,6 @@ static int add_assoc = 1; static FILE *outfile=NULL; static int force=0; -#define STAT_BLOCK_SIZE 1 -static int pipe_fds[2] = { -1, -1 }; #define MAX_EXCLUDES 100 static int excludeCtr=0; @@ -163,9 +160,8 @@ return 0; } -int match(const char *name, struct stat *sb, char **con) +int match(const char *name, mode_t mode, char **con) { - int ret; const char *fullname = name; /* fullname will be the real file that gets labeled @@ -184,18 +180,12 @@ return -1; } } - ret = lstat(fullname, sb); - if (ret) { - fprintf(stderr, "%s: unable to stat file %s\n", progname, - fullname); - return -1; - } if(rootpath != NULL && name[0]=='\0') /* this is actually the root dir of the alt root */ - return matchpathcon_index("/", sb->st_mode, con); + return matchpathcon_index("/", mode, con); else - return matchpathcon_index(name, sb->st_mode, con); + return matchpathcon_index(name, mode, con); } void usage(const char * const name) @@ -234,25 +224,15 @@ /* * Apply the last matching specification to a file. - * This function is called by nftw on each file during + * This function is called for each file during * the directory traversal. */ -static int apply_spec(const char *file, - const struct stat *sb_unused __attribute__((unused)), - int flag, - struct FTW *s_unused __attribute__((unused))) +static int apply_spec(const char *file, const struct stat *sb) { const char *my_file; - struct stat my_sb; int i, j, ret; char *context, *newcon; int user_only_changed=0; - char buf[STAT_BLOCK_SIZE]; - if(pipe_fds[0] != -1 && read(pipe_fds[0], buf, STAT_BLOCK_SIZE) != STAT_BLOCK_SIZE) - { - fprintf(stderr, "Read error on pipe.\n"); - pipe_fds[0] = -1; - } /* Skip the extra slash at the beginning, if present. */ if (file[0] == '/' && file[1] == '/') @@ -260,13 +240,7 @@ else my_file = file; - if (flag == FTW_DNR) { - fprintf(stderr, "%s: unable to read directory %s\n", - progname, my_file); - return 0; - } - - i = match(my_file, &my_sb, &newcon); + i = match(my_file, sb->st_mode, &newcon); if (i < 0) /* No matching specification. */ return 0; @@ -278,7 +252,7 @@ * then use the last matching specification. */ if (add_assoc) { - j = matchpathcon_filespec_add(my_sb.st_ino, i, my_file); + j = matchpathcon_filespec_add(sb->st_ino, i, my_file); if (j < 0) goto err; @@ -424,20 +398,6 @@ return !valid; } -static int pre_stat(const char *file_unused __attribute__((unused)), - const struct stat *sb_unused __attribute__((unused)), - int flag_unused __attribute__((unused)), - struct FTW *s_unused __attribute__((unused))) -{ - char buf[STAT_BLOCK_SIZE]; - if(write(pipe_fds[1], buf, STAT_BLOCK_SIZE) != STAT_BLOCK_SIZE) - { - fprintf(stderr, "Error writing to stat pipe, child exiting.\n"); - exit(1); - } - return 0; -} - int main(int argc, char **argv) { int opt, rc, i; @@ -580,26 +540,16 @@ if(lstat(buf, &sb)) fprintf(stderr, "File \"%s\" not found.\n", buf); else - { - int flag; - switch(sb.st_mode) - { - case S_IFDIR: - flag = FTW_D; - break; - case S_IFLNK: - flag = FTW_SL; - break; - default: - flag = FTW_F; - } - apply_spec(buf, &sb, flag, NULL); - } + apply_spec(buf, &sb); } } } else for (; optind < argc; optind++) { + FTS *fts; + FTSENT *ftsent; + char *pv[2] = { argv[optind], NULL }; + if (NULL != rootpath) { qprintf("%s: labeling files, pretending %s is /\n", argv[0], rootpath); @@ -608,31 +558,49 @@ qprintf("%s: labeling files under %s\n", argv[0], argv[optind]); - int rc; - if(pipe(pipe_fds) == -1) - rc = -1; - else - rc = fork(); - if(rc == 0) - { - close(pipe_fds[0]); - nftw(argv[optind], pre_stat, OPEN_MAX, FTW_PHYS); + fts = fts_open(pv, + FTS_PHYSICAL | FTS_XDEV | FTS_COMFOLLOW, NULL); + if (fts == NULL) { + fprintf(stderr, "%s: cannot traverse filesystem %s", + argv[0], pv[0]); exit(1); } - if(rc > 0) - close(pipe_fds[1]); - if(rc == -1 || rc > 0) { /* Walk the file tree, calling apply_spec on each file. */ - if (nftw - (argv[optind], apply_spec, OPEN_MAX, - FTW_PHYS | FTW_MOUNT)) { + while ((ftsent = fts_read(fts)) != NULL) { + switch (ftsent->fts_info) { + case FTS_DEFAULT: + case FTS_D: /* dir in pre-order */ + case FTS_F: /* file */ + case FTS_SL: /* symlink */ + case FTS_W: /* whiteout */ + apply_spec(ftsent->fts_path, ftsent->fts_statp); + break; + case FTS_DNR: + fprintf(stderr, + "%s: unable to read directory %s\n", + progname, ftsent->fts_path); + break; + case FTS_NS: + fprintf(stderr, + "%s: unable to stat file %s\n", + progname, ftsent->fts_path); + break; + case FTS_ERR: fprintf(stderr, - "%s: error while labeling files under %s\n", - argv[0], argv[optind]); - exit(1); + "%s: %s: %s\n", + progname, ftsent->fts_path, + strerror(ftsent->fts_errno)); + break; + case FTS_DP: /* skip post-order dir */ + case FTS_DC: /* skip dir cycle */ + case FTS_DOT: /* skip . and .. */ + case FTS_SLNONE: /* skip broken symlinks */ + default: + break; } } + fts_close(fts); /* * Evaluate the association hash table distribution for the From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 19:11:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 299D216A68C for ; Wed, 17 May 2006 19:11:38 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B4FA43D45 for ; Wed, 17 May 2006 19:11:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8A45C46CA0 for ; Wed, 17 May 2006 15:11:33 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0EFBC576C6; Wed, 17 May 2006 19:11:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0683416AA97; Wed, 17 May 2006 19:11:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B39CC16AA59 for ; Wed, 17 May 2006 19:11:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CBAF43D58 for ; Wed, 17 May 2006 19:11:30 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HJB8HU045056 for ; Wed, 17 May 2006 19:11:08 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJB8k8045053 for perforce@freebsd.org; Wed, 17 May 2006 19:11:08 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 19:11:08 GMT Message-Id: <200605171911.k4HJB8k8045053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97368 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:11:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=97368 Change 97368 by millert@millert_ibook on 2006/05/17 19:10:19 Update to checkpolicy 1.30.3 Obtained from: selinux.sourceforge.net Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkmodule.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.8#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.h#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/module_compiler.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_parse.y#7 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_scan.l#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,206 @@ +1.30.3 2006-03-28 + * Fixed checkmodule to call link_modules prior to expand_module + to handle optionals. + +1.30.2 2006-03-28 + * Fixed require_class to avoid shadowing permissions already defined + in an inherited common definition. + +1.30.1 2006-03-22 + * Moved processing of role and user require statements to 2nd pass. + +1.30 2006-03-14 + * Updated version for release. + +1.29.5 2006-03-09 + * Fixed bug in role dominance (define_role_dom). + +1.29.4 2006-02-14 + * Added a check for failure to declare each sensitivity in + a level definition. + +1.29.3 2006-02-13 + * Changed to clone level data for aliased sensitivities to + avoid double free upon sens_destroy. Bug reported by Kevin + Carr of Tresys Technology. + +1.29.2 2006-02-13 + * Merged optionals in base patch from Joshua Brindle. + +1.29.1 2006-02-01 + * Merged sepol_av_to_string patch from Joshua Brindle. + +1.28 2005-12-07 + * Updated version for release. + +1.27.20 2005-12-02 + * Merged checkmodule man page from Dan Walsh, and edited it. + +1.27.19 2005-12-01 + * Added error checking of all ebitmap_set_bit calls for out of + memory conditions. + +1.27.18 2005-12-01 + * Merged removal of compatibility handling of netlink classes + (requirement that policies with newer versions include the + netlink class definitions, remapping of fine-grained netlink + classes in newer source policies to single netlink class when + generating older policies) from George Coker. + +1.27.17 2005-10-25 + * Merged dismod fix from Joshua Brindle. + +1.27.16 2005-10-20 + * Removed obsolete cond_check_type_rules() function and call and + cond_optimize_lists() call from checkpolicy.c; these are handled + during parsing and expansion now. + +1.27.15 2005-10-19 + * Updated calls to expand_module for interface change. + +1.27.14 2005-10-19 + * Changed checkmodule to verify that expand_module succeeds + when building base modules. + +1.27.13 2005-10-19 + * Merged module compiler fixes from Joshua Brindle. + +1.27.12 2005-10-19 + * Removed direct calls to hierarchy_check_constraints() and + check_assertions() from checkpolicy since they are now called + internally by expand_module(). + +1.27.11 2005-10-18 + * Updated for changes to sepol policydb_index_others interface. + +1.27.10 2005-10-17 + * Updated for changes to sepol expand_module and link_modules interfaces. + +1.27.9 2005-10-13 + * Merged support for require blocks inside conditionals from + Joshua Brindle (Tresys). + +1.27.8 2005-10-06 + * Updated for changes to libsepol. + +1.27.7 2005-10-05 + * Merged several bug fixes from Joshua Brindle (Tresys). + +1.27.6 2005-10-03 + * Merged MLS in modules patch from Joshua Brindle (Tresys). + +1.27.5 2005-09-28 + * Merged error handling improvement in checkmodule from Karl MacMillan (Tresys). + +1.27.4 2005-09-26 + * Merged bugfix for dup role transition error messages from + Karl MacMillan (Tresys). + +1.27.3 2005-09-23 + * Merged policyver/modulever patches from Joshua Brindle (Tresys). + +1.27.2 2005-09-20 + * Fixed parse_categories handling of undefined category. + +1.27.1 2005-09-16 + * Merged bug fix for role dominance handling from Darrel Goeddel (TCS). + +1.26 2005-09-06 + * Updated version for release. + +1.25.12 2005-08-22 + * Fixed handling of validatetrans constraint expressions. + Bug reported by Dan Walsh for checkpolicy -M. + +1.25.11 2005-08-18 + * Merged use-after-free fix from Serge Hallyn (IBM). + Bug found by Coverity. + +1.25.10 2005-08-15 + * Fixed further memory leaks found by valgrind. + +1.25.9 2005-08-15 + * Changed checkpolicy to destroy the policydbs prior to exit + to allow leak detection. + * Fixed several memory leaks found by valgrind. + +1.25.8 2005-08-11 + * Updated checkpolicy and dispol for the new avtab format. + Converted users of ebitmaps to new inline operators. + Note: The binary policy format version has been incremented to + version 20 as a result of these changes. To build a policy + for a kernel that does not yet include these changes, use + the -c 19 option to checkpolicy. + +1.25.7 2005-08-11 + * Merged patch to prohibit use of "self" as a type name from Jason Tang (Tresys). + +1.25.6 2005-08-10 + * Merged patch to fix dismod compilation from Joshua Brindle (Tresys). + +1.25.5 2005-08-09 + * Fixed call to hierarchy checking code to pass the right policydb. + +1.25.4 2005-08-02 + * Merged patch to update dismod for the relocation of the + module read/write code from libsemanage to libsepol, and + to enable build of test subdirectory from Jason Tang (Tresys). + +1.25.3 2005-07-18 + * Merged hierarchy check fix from Joshua Brindle (Tresys). + +1.25.2 2005-07-06 + * Merged loadable module support from Tresys Technology. + +1.25.1 2005-06-24 + * Merged patch to prohibit the use of * and ~ in type sets + (other than in neverallow statements) and in role sets + from Joshua Brindle (Tresys). + +1.24 2005-06-20 + * Updated version for release. + +1.23.4 2005-05-19 + * Merged cleanup patch from Dan Walsh. + +1.23.3 2005-05-13 + * Added sepol_ prefix to Flask types to avoid namespace + collision with libselinux. + +1.23.2 2005-04-29 + * Merged identifier fix from Joshua Brindle (Tresys). + +1.23.1 2005-04-13 + * Merged hierarchical type/role patch from Tresys Technology. + * Merged MLS fixes from Darrel Goeddel of TCS. + +1.22 2005-03-09 + * Updated version for release. + +1.21.4 2005-02-17 + * Moved genpolusers utility to libsepol. + * Merged range_transition support from Darrel Goeddel (TCS). + +1.21.3 2005-02-16 + * Merged define_user() cleanup patch from Darrel Goeddel (TCS). + +1.21.2 2005-02-09 + * Changed relabel Makefile target to use restorecon. + +1.21.1 2005-01-26 + * Merged enhanced MLS support from Darrel Goeddel (TCS). + +1.20 2005-01-04 + * Merged typeattribute statement patch from Darrel Goeddel of TCS. + * Changed genpolusers to handle multiple user config files. + * Merged nodecon ordering patch from Chad Hanson of TCS. + +1.18 2004-10-07 + * MLS build fix. + * Fixed Makefile dependencies (Chris PeBenito). + * Merged fix for role dominance ordering issue from Chad Hanson of TCS. + * Preserve portcon ordering and apply more checking. + 1.16 2004-08-13 * Allow empty conditional clauses. * Moved genpolbools utility to libsepol. ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/Makefile#4 (text+ko) ==== @@ -2,12 +2,12 @@ PROG= checkpolicy -OBJS = checkpolicy.o y.tab.o policy_scan.o queue.o +OBJS = checkpolicy.o y.tab.o policy_scan.o queue.o module_compiler.o CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/libsepol/include CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/libselinux/include -LDADD+= -L$(SOURCE_ROOT)/sedarwin/libselinux/src -L$(SOURCE_ROOT)/sedarwin/libsepol/src -LDADD+= -lselinux -lsepol -lfl +LDADD+= -L$(SOURCE_ROOT)/sedarwin/libselinux/src -L$(SOURCE_ROOT)/sedarwin/libsepol/src -L$(SOURCE_ROOT)/sedarwin/libsecompat +LDADD+= -lselinux -lsepol -lsecompat -lfl all: $(PROG) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.16 +1.30.3 ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkmodule.c#2 (text+ko) ==== @@ -26,6 +26,7 @@ #include #include #include +#include #include "queue.h" #include "checkpolicy.h" @@ -271,6 +272,10 @@ fprintf(stderr, "%s: policydb_init failed\n", argv[0]); exit(1); } + if (link_modules(NULL, policydbp, NULL, 0, 0)) { + fprintf(stderr, "%s: link modules failed\n", argv[0]); + exit(1); + } if (expand_module(NULL, policydbp, &kernpolicydb, 0, 1)) { fprintf(stderr, "%s: expand module failed\n", argv[0]); exit(1); ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.8#4 (text+ko) ==== @@ -3,7 +3,7 @@ checkpolicy \- SELinux policy compiler .SH SYNOPSIS .B checkpolicy -.I "[-b] [-d] [-c policyvers] [-o output_file] [input_file]" +.I "[-b] [-d] [-M] [-c policyvers] [-o output_file] [input_file]" .br .SH "DESCRIPTION" This manual page describes the @@ -24,6 +24,9 @@ .B \-d Enter debug mode after loading the policy. .TP +.B \-M +Enable the MLS policy when checking and compiling the policy. +.TP .B \-o filename Write a binary policy file to the specified filename. .TP ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.c#6 (text+ko) ==== @@ -3,7 +3,12 @@ * Author : Stephen Smalley, */ -/* Updated: Karl MacMillan +/* + * Updated: Trusted Computer Solutions, Inc. + * + * Support for enhanced MLS infrastructure. + * + * Updated: Karl MacMillan * * Added conditional policy language extensions * @@ -11,7 +16,14 @@ * * Added IPv6 support. * - * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * Updated: Joshua Brindle + * Karl MacMillan + * Jason Tang + * + * Policy Module support. + * + * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. + * Copyright (C) 2003 - 2005 Tresys Technology, LLC * Copyright (C) 2003 Red Hat, Inc., James Morris * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -58,10 +70,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "queue.h" #include "checkpolicy.h" @@ -76,30 +91,36 @@ extern queue_t id_queue; extern unsigned int policydb_errors; extern unsigned long policydb_lineno; -extern unsigned long source_lineno; extern char source_file[]; -extern unsigned int pass; +extern int mlspol; extern FILE *yyin; +extern void init_parser(int); extern int yyparse(void); extern void yyrestart(FILE *); -char *txtfile = "policy.conf"; -char *binfile = "policy"; +static char *txtfile = "policy.conf"; +static char *binfile = "policy"; unsigned int policyvers = POLICYDB_VERSION_MAX; void usage(char *progname) { - printf("usage: %s [-b] [-d] [-c policyvers (%d-%d)] [-o output_file] [input_file]\n", + printf("usage: %s [-b] [-d] [-M] [-c policyvers (%d-%d)] [-o output_file] [input_file]\n", progname, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX); exit(1); } -static int print_sid(security_id_t sid, +#define FGETS(out, size, in) \ +if (fgets(out,size,in)==NULL) { \ + fprintf(stderr, "fgets failed at line %d: %s\n", __LINE__,\ + strerror(errno)); \ + exit(1);\ +} +static int print_sid(sepol_security_id_t sid, context_struct_t * context __attribute__ ((unused)), void *data __attribute__ ((unused))) { - security_context_t scontext; + sepol_security_context_t scontext; size_t scontext_len; int rc; @@ -133,16 +154,6 @@ return 0; } -static int type_attr_remove(hashtab_key_t key __attribute__ ((unused)), hashtab_datum_t datum, void *p __attribute__ ((unused))) -{ - type_datum_t *typdatum; - - typdatum = (type_datum_t *) datum; - if (typdatum->isattr) - return 1; - return 0; -} - #ifdef EQUIVTYPES static int insert_type_rule(avtab_key_t *k, avtab_datum_t *d, struct avtab_node *type_rules) @@ -270,100 +281,9 @@ } #endif -static void cond_check_type_rules_list(cond_av_list_t *list) -{ - cond_av_list_t *cur = list; - - while (cur) { - if (cur->node->datum.specified & AVTAB_TYPE) { - if (avtab_search(&policydbp->te_avtab, &cur->node->key, AVTAB_TYPE)) { - fprintf(stderr, "conditional type rule for (%s, %s : %s) conflicts with entry in base policy; " - "conditional rule discarded.\n", policydbp->p_type_val_to_name[cur->node->key.source_type-1], - policydbp->p_type_val_to_name[cur->node->key.target_type-1], - policydbp->p_class_val_to_name[cur->node->key.target_class-1]); - cur->node->parse_context = (void*)0; - } else { - cur->node->parse_context = (void*)1; - } - } else { - cur->node->parse_context = (void*)1; - } - cur = cur->next; - } -} - -/* check for duplicate type rules - this has to be done after all of - * the parsing is finished because the conditional and base type rules - * are collected in the same pass */ -static void cond_check_type_rules(void) -{ - cond_list_t *node; - - for (node = policydbp->cond_list; node != NULL; node = node->next) { - cond_check_type_rules_list(node->true_list); - cond_check_type_rules_list(node->false_list); - } -} +extern char *av_to_string(uint32_t tclass, sepol_access_vector_t av); -extern char *av_to_string(uint32_t tclass, access_vector_t av); -void check_assertion_helper(unsigned int stype, unsigned int ttype, ebitmap_t *tclasses, - access_vector_t *avp, unsigned long line) -{ - avtab_key_t avkey; - avtab_datum_t *avdatump; - unsigned int k; - - - for (k = ebitmap_startbit(tclasses); k < ebitmap_length(tclasses); k++) { - if (!ebitmap_get_bit(tclasses, k)) - continue; - avkey.source_type = stype + 1; - avkey.target_type = ttype + 1; - avkey.target_class = k + 1; - avdatump = avtab_search(&policydb.te_avtab, &avkey, AVTAB_AV); - if (!avdatump) - continue; - - if ((avdatump->specified & AVTAB_ALLOWED) && - (avtab_allowed(avdatump) & avp[k])) { - fprintf(stderr, "assertion on line %ld violated by allow %s %s:%s {%s };\n", line, policydb.p_type_val_to_name[stype], policydb.p_type_val_to_name[ttype], policydb.p_class_val_to_name[k], - av_to_string(k+1, - avtab_allowed(avdatump) & avp[k])); - policydb_errors++; - } - } -} - -void check_assertions(void) -{ - te_assert_t *a, *tmp; - unsigned int i, j; - - a = te_assertions; - while (a) { - for (i = ebitmap_startbit(&a->stypes); i < ebitmap_length(&a->stypes); i++) { - if (!ebitmap_get_bit(&a->stypes, i)) - continue; - if (a->self) { - check_assertion_helper(i, i, &a->tclasses, a->avp, a->line); - } - for (j = ebitmap_startbit(&a->ttypes); j < ebitmap_length(&a->ttypes); j++) { - if (!ebitmap_get_bit(&a->ttypes, j)) - continue; - check_assertion_helper(i, j, &a->tclasses, a->avp, a->line); - } - } - tmp = a; - a = a->next; - ebitmap_destroy(&tmp->stypes); - ebitmap_destroy(&tmp->ttypes); - ebitmap_destroy(&tmp->tclasses); - free(tmp->avp); - free(tmp); - } -} - int display_bools() { int i; @@ -435,12 +355,23 @@ return 0; } +static int check_level(hashtab_key_t key, hashtab_datum_t datum, void *arg) +{ + level_datum_t *levdatum = (level_datum_t *) datum; + + if (!levdatum->isalias && !levdatum->defined) { + fprintf(stderr, "Error: sensitivity %s was not used in a level definition!\n", key); + return -1; + } + return 0; +} + int main(int argc, char **argv) { - security_class_t tclass; - security_id_t ssid, tsid, *sids; - security_context_t scontext; - struct av_decision avd; + sepol_security_class_t tclass; + sepol_security_id_t ssid, tsid, *sids; + sepol_security_context_t scontext; + struct sepol_av_decision avd; class_datum_t *cladatum; char ans[80 + 1], *file = txtfile, *outfile = NULL, *path, *fstype; size_t scontext_len, pathlen; @@ -449,7 +380,7 @@ unsigned int binary = 0, debug = 0; struct val_to_name v; int ret, ch, fd; - unsigned int nel; + unsigned int nel, uret; struct stat sb; void *map; FILE *outfp = NULL; @@ -459,7 +390,7 @@ struct policy_file pf; - while ((ch = getopt(argc, argv, "o:dbVc:")) != EOF) { + while ((ch = getopt(argc, argv, "o:dbMVc:")) != EOF) { switch (ch) { case 'o': outfile = optarg; @@ -474,6 +405,9 @@ case 'V': show_version = 1; break; + case 'M': + mlspol = 1; + break; case 'c': { long int n = strtol(optarg, NULL, 10); if (errno) { @@ -497,11 +431,7 @@ } if (show_version) { -#ifdef CONFIG_SECURITY_SELINUX_MLS - printf("%d-mls (compatibility range %d-%d)\n", policyvers, POLICYDB_VERSION_MAX, POLICYDB_VERSION_MIN); -#else printf("%d (compatibility range %d-%d)\n", policyvers, POLICYDB_VERSION_MAX, POLICYDB_VERSION_MIN); -#endif exit(0); } @@ -540,63 +470,93 @@ pf.type = PF_USE_MEMORY; pf.data = map; pf.len = sb.st_size; + if (policydb_init(&policydb)) { + fprintf(stderr, "%s: policydb_init: Out of memory!\n", argv[0]); + exit(1); + } ret = policydb_read(&policydb, &pf, 1); if (ret) { fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); exit(1); } policydbp = &policydb; + + /* Check Policy Consistency */ + if (policydbp->mls) { + if (!mlspol) { + fprintf(stderr,"%s: MLS policy, but non-MLS" + " is specified\n", argv[0]); + exit(1); + } + } else { + if (mlspol) { + fprintf(stderr,"%s: non-MLS policy, but MLS" + " is specified\n", argv[0]); + exit(1); + } + } } else { - yyin = fopen(file, "r"); + policydb_t parse_policy; + + yyin = fopen(file, "r"); if (!yyin) { fprintf(stderr, "%s: unable to open %s\n", argv[0], file); exit(1); } - if (policydb_init(&policydb)) + if (policydb_init(&parse_policy)) exit(1); + /* We build this as a base policy first since that is all the parser understands */ + parse_policy.policy_type = POLICY_BASE; + /* Let sepol know if we are dealing with MLS support */ + parse_policy.mls = mlspol; + id_queue = queue_create(); if (!id_queue) { fprintf(stderr, "%s: out of memory\n", argv[0]); exit(1); } - policydbp = &policydb; - policydb_errors = 0; - pass = 1; + policydbp = &parse_policy; + init_parser(1); if (yyparse() || policydb_errors) { fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); exit(1); } rewind(yyin); - policydb_lineno = 1; + init_parser(2); source_file[0] = '\0'; - source_lineno = 1; yyrestart(yyin); - pass = 2; if (yyparse() || policydb_errors) { fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); exit(1); } queue_destroy(id_queue); - cond_check_type_rules(); - cond_optimize_lists(policydb.cond_list); + if (policydb_errors) + exit(1); + + if (hashtab_map(policydbp->p_levels.table, check_level, NULL)) + exit(1); - check_assertions(); - if (policydb_errors) + if (policydb_init(&policydb)) { + fprintf(stderr, "%s: policydb_init failed\n", argv[0]); exit(1); + } - if (policyvers >= POLICYDB_VERSION_NLCLASS && - policydb.p_classes.nprim < SECCLASS_NETLINK_DNRT_SOCKET) { - fprintf(stderr, "%s: policy lacks new netlink classes, unable to generate policy version %d\n", argv[0], policyvers); + /* Linking takes care of optional avrule blocks */ + if (link_modules(NULL, &parse_policy, NULL, 0, 0)) { + fprintf(stderr, "Error while resolving optionals\n"); exit(1); } - - /* remove type attributes */ - hashtab_map_remove_on_error(policydb.p_types.table, - type_attr_remove, 0, 0); + + if (expand_module(NULL, &parse_policy, &policydb, 0, 1)) { + fprintf(stderr, "Error while expanding policy\n"); + exit(1); + } + policydb_destroy(&parse_policy); + policydbp = &policydb; fclose(yyin); } @@ -614,7 +574,8 @@ exit(1); } - sepol_set_policyvers(policyvers); + policydb.policy_type = POLICY_KERN; + policydb.policyvers = policyvers; pf.type = PF_USE_STDIO; pf.fp = outfp; @@ -626,8 +587,10 @@ } fclose(outfp); } - if (!debug) + if (!debug) { + policydb_destroy(&policydb); exit(0); + } menu: printf("\nSelect an option:\n"); @@ -656,19 +619,19 @@ printf("q) Exit\n"); while (1) { printf("\nChoose: "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); switch (ans[0]) { case '0': printf("source sid? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ssid = atoi(ans); printf("target sid? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); tsid = atoi(ans); printf("target class? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); if (isdigit(ans[0])) { tclass = atoi(ans); if (!tclass || tclass > policydb.p_classes.nprim) { @@ -720,7 +683,7 @@ break; case '1': printf("sid? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ssid = atoi(ans); ret = sepol_sid_to_context(ssid, &scontext, &scontext_len); @@ -741,7 +704,7 @@ break; case '2': printf("scontext? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); scontext_len = strlen(ans); ans[scontext_len - 1] = 0; ret = sepol_context_to_sid(ans, scontext_len, @@ -766,14 +729,14 @@ ch = ans[0]; printf("source sid? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ssid = atoi(ans); printf("target sid? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); tsid = atoi(ans); printf("object class? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); if (isdigit(ans[0])) { tclass = atoi(ans); if (!tclass || tclass > policydb.p_classes.nprim) { @@ -816,7 +779,7 @@ break; case '7': printf("pathname? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); pathlen = strlen(ans); ans[pathlen - 1] = 0; printf("%s: loading policy configuration from %s\n", argv[0], ans); @@ -854,7 +817,7 @@ break; case '8': printf("fs kdevname? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; sepol_fs_sid(ans, &ssid, &tsid); printf("fs_sid %d default_file_sid %d\n", @@ -862,7 +825,7 @@ break; case '9': printf("protocol? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; if (!strcmp(ans, "tcp") || !strcmp(ans, "TCP")) protocol = IPPROTO_TCP; @@ -873,14 +836,14 @@ break; } printf("port? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); port = atoi(ans); sepol_port_sid(0, 0, protocol, port, &ssid); printf("sid %d\n", ssid); break; case 'a': printf("netif name? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; sepol_netif_sid(ans, &ssid, &tsid); printf("if_sid %d default_msg_sid %d\n", @@ -893,7 +856,7 @@ struct in6_addr addr6; printf("protocol family? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; if (!strcasecmp(ans, "ipv4")) family = AF_INET; @@ -905,7 +868,7 @@ } printf("node address? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; if (family == AF_INET) { @@ -927,10 +890,10 @@ } case 'c': printf("fstype? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; - sepol_fs_use(ans, &ret, &ssid); - switch (ret) { + sepol_fs_use(ans, &uret, &ssid); + switch (uret) { case SECURITY_FS_USE_XATTR: printf("use xattr\n"); break; @@ -951,15 +914,15 @@ break; case 'd': printf("fstype? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; fstype = strdup(ans); printf("path? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; path = strdup(ans); printf("object class? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); if (isdigit(ans[0])) { tclass = atoi(ans); if (!tclass || tclass > policydb.p_classes.nprim) { @@ -983,12 +946,12 @@ break; case 'e': printf("from SID? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; ssid = atoi(ans); printf("username? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; ret = sepol_get_user_sids(ssid, ans, &sids, &nel); @@ -1019,7 +982,7 @@ break; case 'h': printf("name? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; name = malloc((strlen(ans) + 1) * sizeof(char)); @@ -1031,7 +994,7 @@ printf("state? "); - fgets(ans, sizeof(ans), stdin); + FGETS(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; if (atoi(ans)) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.h#6 (text+ko) ==== @@ -1,14 +1,14 @@ #ifndef _CHECKPOLICY_H_ #define _CHECKPOLICY_H_ -#include +#include typedef struct te_assert { ebitmap_t stypes; ebitmap_t ttypes; ebitmap_t tclasses; int self; - access_vector_t *avp; + sepol_access_vector_t *avp; unsigned long line; struct te_assert *next; } te_assert_t; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/module_compiler.c#2 (text+ko) ==== @@ -656,40 +656,42 @@ /* now add each of the permissions to this class's requirements */ while ((perm_id = queue_remove(id_queue)) != NULL) { - if ((perm = malloc(sizeof(*perm))) == NULL) { - yyerror("Out of memory!"); - free(perm_id); - goto cleanup; - } - ret2 = hashtab_insert(datum->permissions.table, perm_id, perm); - switch (ret2) { - case HASHTAB_PRESENT: { - perm = hashtab_search(datum->permissions.table, perm_id); - assert(perm != NULL); /* reuse existing permission */ - free(perm_id); - perm_id = NULL; - break; - } - case HASHTAB_SUCCESS: { - perm->value = datum->permissions.nprim + 1; - break; - } - default: { - yyerror("Out of memory!"); - free(perm_id); - free(perm); - goto cleanup; - } - } + int allocated = 0; + + /* Is the permission already in the table? */ + perm = hashtab_search(datum->permissions.table, perm_id); + if (!perm && datum->comdatum) + perm = hashtab_search(datum->comdatum->permissions.table, perm_id); + if (perm) { + /* Yes, drop the name. */ + free(perm_id); + } else { + /* No - allocate and insert an entry for it. */ + allocated = 1; + if ((perm = malloc(sizeof(*perm))) == NULL) { + yyerror("Out of memory!"); + free(perm_id); + goto cleanup; + } + memset(perm, 0, sizeof(*perm)); + ret = hashtab_insert(datum->permissions.table, perm_id, perm); + if (ret) { + yyerror("Out of memory!"); + free(perm_id); + free(perm); + goto cleanup; + } + perm->value = datum->permissions.nprim + 1; + } + if (add_perm_to_class(perm->value, datum->value) == -1) { yyerror("Out of memory!"); - free(perm_id); - free(perm); goto cleanup; } - if (ret2 == HASHTAB_SUCCESS) { + + /* Update number of primitives if we allocated one. */ + if (allocated) datum->permissions.nprim++; - } } return 0; cleanup: @@ -702,7 +704,7 @@ char *id = queue_remove(id_queue); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 19:13:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B67716A66C for ; Wed, 17 May 2006 19:13:06 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B799643D66 for ; Wed, 17 May 2006 19:12:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CAA9C46CEC for ; Wed, 17 May 2006 15:12:54 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B8D1664494; Wed, 17 May 2006 19:12:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AFC1A16AA5A; Wed, 17 May 2006 19:12:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B561816B0E4 for ; Wed, 17 May 2006 19:12:32 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A64543D64 for ; Wed, 17 May 2006 19:12:32 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HJCAe1045168 for ; Wed, 17 May 2006 19:12:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJCAgG045165 for perforce@freebsd.org; Wed, 17 May 2006 19:12:10 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 19:12:10 GMT Message-Id: <200605171912.k4HJCAgG045165@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97369 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:13:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=97369 Change 97369 by millert@millert_ibook on 2006/05/17 19:11:53 Missing change from last newrole update Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/Makefile#5 (text+ko) ==== @@ -1,13 +1,22 @@ include ../../../Makeconfig +POLICYCOREUTILS=../../policycoreutils +VPATH = $(POLICYCOREUTILS)/newrole + PROG= newrole -MAN1= newrole.1 +MAN1= $(POLICYCOREUTILS)/newrole/newrole.1 OBJS= newrole.o -CFLAGS+= $(DARWIN_HDRS) -CFLAGS+= -I$(SOURCE_ROOT)/sedarwin -LDADD+= -L$(SOURCE_ROOT)/sedarwin/libselinux/src -lselinux $(LIBMAC) -lpam +CFLAGS+= -DPACKAGE="\"policycoreutils\"" -DVERSION="\"1.30\"" +CFLAGS+= -DUSE_PAM +CFLAGS+= -I$(EXPORT_HDRS)/bsd -idirafter $(EXPORT_HDRS)/osfmk +CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/libselinux/include +LDADD+= -L$(SOURCE_ROOT)/sedarwin/libselinux/src +LDADD+= -L$(SOURCE_ROOT)/sedarwin/libsepol/src +LDADD+= -L$(SOURCE_ROOT)/sedarwin/libsecompat +LDADD+= -lselinux -lsepol -lsecompat -lsecompat $(LIBMAC) -lpam + all: $(PROG) From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 19:22:22 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9B7316A6EA for ; Wed, 17 May 2006 19:22:22 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1231443D46 for ; Wed, 17 May 2006 19:22:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7447946C6E for ; Wed, 17 May 2006 15:22:21 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 21B4A557CC; Wed, 17 May 2006 19:21:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AC0516A66D; Wed, 17 May 2006 19:21:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB36916A5B7 for ; Wed, 17 May 2006 19:21:43 +0000 (UTC) (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 A15D443D46 for ; Wed, 17 May 2006 19:21:43 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HJLMvW045537 for ; Wed, 17 May 2006 19:21:22 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJLMHL045534 for perforce@freebsd.org; Wed, 17 May 2006 19:21:22 GMT (envelope-from wsalamon@computer.org) Date: Wed, 17 May 2006 19:21:22 GMT Message-Id: <200605171921.k4HJLMHL045534@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 97370 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:22:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=97370 Change 97370 by wsalamon@vh1 on 2006/05/17 19:21:06 Include mount.h, needed for VFS locking macros. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#15 (text+ko) ==== @@ -30,6 +30,7 @@ */ #include +#include #include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 19:26:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D2C916B12F for ; Wed, 17 May 2006 19:26:59 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 45EB443D45 for ; Wed, 17 May 2006 19:26:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D7A7346C3D for ; Wed, 17 May 2006 15:26:55 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0817E58FEC; Wed, 17 May 2006 19:26:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A9916A6E3; Wed, 17 May 2006 19:26:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF0D016A6AB for ; Wed, 17 May 2006 19:26:52 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6172C43D70 for ; Wed, 17 May 2006 19:26:50 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HJQSXY045741 for ; Wed, 17 May 2006 19:26:28 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJQSmi045738 for perforce@freebsd.org; Wed, 17 May 2006 19:26:28 GMT (envelope-from deker@FreeBSD.org) Date: Wed, 17 May 2006 19:26:28 GMT Message-Id: <200605171926.k4HJQSmi045738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 97371 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:27:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=97371 Change 97371 by deker@sebsd_build on 2006/05/17 19:26:06 Add back unintentionally removed line Affected files ... .. //depot/projects/trustedbsd/sebsd/Makefile#16 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/Makefile#16 (text+ko) ==== @@ -306,6 +306,7 @@ .endif # Bootstrapping of SEBSD-specific bits +SEBSD_POLICYTYPE!= grep "TYPE" ${.CURDIR}/contrib/sebsd/refpolicy/build.conf | cut -d" " -f3 sebsd_bootstrap: .if exists(${.CURDIR}/contrib/sebsd) @echo "Installing SEBSD policy" From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 19:37:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 020CB16A6A2 for ; Wed, 17 May 2006 19:37:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40CB943D4C for ; Wed, 17 May 2006 19:37:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id DC40646B42 for ; Wed, 17 May 2006 15:37:09 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CC5B658C81; Wed, 17 May 2006 19:32:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C412C16A6AF; Wed, 17 May 2006 19:32:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8711916A575 for ; Wed, 17 May 2006 19:32:58 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EC3543D45 for ; Wed, 17 May 2006 19:32:58 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HJWasf046005 for ; Wed, 17 May 2006 19:32:36 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJWak1046002 for perforce@freebsd.org; Wed, 17 May 2006 19:32:36 GMT (envelope-from deker@FreeBSD.org) Date: Wed, 17 May 2006 19:32:36 GMT Message-Id: <200605171932.k4HJWak1046002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 97372 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:37:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=97372 Change 97372 by deker@sebsd_build on 2006/05/17 19:32:05 Update loader.conf.sebsd for the proper policy path Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/boot/forth/loader.conf.sebsd#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/boot/forth/loader.conf.sebsd#5 (text+ko) ==== @@ -9,4 +9,5 @@ sebsdpolicy_load="YES" # Default SEBSD policy location: -sebsdpolicy_name="/etc/security/sebsd/policy/policy.bin" +# Note: This ONLY supports the default targeted policy. +sebsdpolicy_name="/etc/security/sebsd/targeted/policy/policy.20" From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 19:40:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F6EA16A5CE for ; Wed, 17 May 2006 19:40:44 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49FAD43D6E for ; Wed, 17 May 2006 19:40:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A793946C72 for ; Wed, 17 May 2006 15:40:36 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id F167B72AA3; Wed, 17 May 2006 19:39:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EAD2D16A6C7; Wed, 17 May 2006 19:39:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD1B416A6C5 for ; Wed, 17 May 2006 19:39:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67A5D43D45 for ; Wed, 17 May 2006 19:39:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HJcjRn046185 for ; Wed, 17 May 2006 19:38:45 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJcj4W046182 for perforce@freebsd.org; Wed, 17 May 2006 19:38:45 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 19:38:45 GMT Message-Id: <200605171938.k4HJcj4W046182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97373 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 19:40:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=97373 Change 97373 by millert@millert_ibook on 2006/05/17 19:38:14 Now auto-generated Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sedarwin.kmodinfo#3 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 20:24:00 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8473516A583 for ; Wed, 17 May 2006 20:24:00 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A01B43D4C for ; Wed, 17 May 2006 20:23:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 41B1246D34 for ; Wed, 17 May 2006 16:23:57 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AAB545647B; Wed, 17 May 2006 20:23:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 99EDC16A42B; Wed, 17 May 2006 20:23:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6553216A40B for ; Wed, 17 May 2006 20:23:03 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F73743D45 for ; Wed, 17 May 2006 20:23:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HKMfZD049484 for ; Wed, 17 May 2006 20:22:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HKMfvb049481 for perforce@freebsd.org; Wed, 17 May 2006 20:22:41 GMT (envelope-from millert@freebsd.org) Date: Wed, 17 May 2006 20:22:41 GMT Message-Id: <200605172022.k4HKMfvb049481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97377 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 20:24:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=97377 Change 97377 by millert@millert_g5tower on 2006/05/17 20:22:05 Missed in the loadpolicy -> load_policy change Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/load_policy/Makefile#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu May 18 14:44:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EAF7E16A43C for ; Thu, 18 May 2006 14:44:05 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15DA543D49 for ; Thu, 18 May 2006 14:44:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3BE1946D51 for ; Thu, 18 May 2006 10:44:02 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7877856167; Thu, 18 May 2006 14:44:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 727A916A42F; Thu, 18 May 2006 14:44:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0BE6D16A40E for ; Thu, 18 May 2006 14:44:00 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC8CE43D45 for ; Thu, 18 May 2006 14:43:59 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4IEhY3W070988 for ; Thu, 18 May 2006 14:43:34 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4IEhYqY070985 for perforce@freebsd.org; Thu, 18 May 2006 14:43:34 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 18 May 2006 14:43:34 GMT Message-Id: <200605181443.k4IEhYqY070985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 97406 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 May 2006 14:44:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=97406 Change 97406 by deker@sebsd_build on 2006/05/18 14:43:32 Update to point to sedarwin.org Affected files ... .. //depot/projects/trustedbsd/www/sedarwin.page#4 edit Differences ... ==== //depot/projects/trustedbsd/www/sedarwin.page#4 (text+ko) ==== @@ -36,7 +36,7 @@ - $P4: //depot/projects/trustedbsd/www/sedarwin.page#3 $ + $P4: //depot/projects/trustedbsd/www/sedarwin.page#4 $ @@ -53,23 +53,18 @@

    SEDarwin is a port of the TrustedBSD MAC - Framework access controle extension framework to Apple's - Darwin operating system platform, along with ports of a number - of policy modules including mac_biba, mac_mls, and the - SEBSD policy. - SEDarwin is highly experimental, but current sufficiently + Framework access control extension framework to Apple's + Darwin operating system platform, along with a port of the + SEBSD policy module. + SEDarwin is highly experimental, but is currently sufficiently functional to allow the enforcement of mandatory process and file protections under Mac OS 10.3.8 and Darwin 7.3 on a variety of Apple PowerPC hardware. - The current prototype software may be downloaded using - cvsup, and commits to the prototype implementation may - be followed on the trustedbsd-cvs mailing list. - As the prototype evolves, more information will be posted - here, including bootstrapping instructions and technical - reports.

    -

    2006-02-08 SEDarwin (Darwin 7.8) snapshot: Download tarball.

    + The SEDarwin project has recently moved to it's own website at + www.sedarwin.org. More + information and current versions of SEDarwin can be found there. +

    The Darwin Security Extension Project (DSEP) complements the SEDarwin work, but has a different goal. DSEP is primarily concerned @@ -80,14 +75,8 @@ have the newest FLASK and SELinux components; they will be migrated to the Tiger platform soon.

    -

    2006-02-13 DSEP (Darwin 8.4) snapshot: Download tarball.

    - -

    2005-05-31 DSEP7 drop 20050331: Download tarball.

    - -

    2005-02-04 DSEP73 drop 5: Download tarball.

    +

    The DSEP sources have also recently moved to + To: arun@freebsd.org In-Reply-To: MIME-Version: 1.0 References: X-Mailman-Approved-At: Wed, 24 May 2006 12:27:12 +0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Subject: Project Validate X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 05:06:50 -0000 Hi, I would like to download the project http://cvsup.pt.freebsd.org/cgi-bin/cvsweb/cvsweb.cgi/projects/validate/ which is imported from Linux Test Project, modified to suit to free bsd. Want to know more details on this. Please provide pointers so that i can collect more info abt this. Also from where i can download the same . Thanks, Ashok TM From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 24 16:01:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62EA116A83C for ; Wed, 24 May 2006 16:01:59 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D767A43D73 for ; Wed, 24 May 2006 16:01:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2E45A46C43 for ; Wed, 24 May 2006 12:01:50 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8C54E56728; Wed, 24 May 2006 16:01:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 86B1116A763; Wed, 24 May 2006 16:01:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9FCB416A66E for ; Wed, 24 May 2006 16:01:46 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6213043D6E for ; Wed, 24 May 2006 16:01:43 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4OG0pgC020657 for ; Wed, 24 May 2006 16:00:51 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4OG0p22020654 for perforce@freebsd.org; Wed, 24 May 2006 16:00:51 GMT (envelope-from millert@freebsd.org) Date: Wed, 24 May 2006 16:00:51 GMT Message-Id: <200605241600.k4OG0p22020654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97738 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 16:02:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=97738 Change 97738 by millert@millert_g4tower on 2006/05/24 16:00:05 No longer need queue.[ch] Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/queue.c#7 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/queue.h#4 delete Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#9 (text+ko) ==== @@ -6,8 +6,8 @@ POLICY_SRCS= sebsd.c sebsd_alloc.c sebsd_syscall.c sebsd_sysctl.c POLICY_SRCS+= ss/avtab.c ss/conditional.c ss/ebitmap.c ss/hashtab.c \ - ss/init.c ss/mach_av.c ss/mls.c ss/policydb.c ss/queue.c \ - ss/services.c ss/sidtab.c ss/symtab.c + ss/init.c ss/mach_av.c ss/mls.c ss/policydb.c ss/services.c \ + ss/sidtab.c ss/symtab.c POLICY_SRCS+= avc/avc.c avc/avc_audit.c CFLAGS+= -DSEFOS_DEBUG -I.. From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 24 16:05:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 259DF16A7A7 for ; Wed, 24 May 2006 16:05:29 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C8D743D49 for ; Wed, 24 May 2006 16:05:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A224746C26 for ; Wed, 24 May 2006 12:05:27 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 380E491B19; Wed, 24 May 2006 16:03:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D56016A77D; Wed, 24 May 2006 16:03:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0814316A75C for ; Wed, 24 May 2006 16:03:47 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C703643D46 for ; Wed, 24 May 2006 16:03:46 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4OG2tmi020856 for ; Wed, 24 May 2006 16:02:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4OG2ts4020853 for perforce@freebsd.org; Wed, 24 May 2006 16:02:55 GMT (envelope-from millert@freebsd.org) Date: Wed, 24 May 2006 16:02:55 GMT Message-Id: <200605241602.k4OG2ts4020853@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97740 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 16:05:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=97740 Change 97740 by millert@millert_g4tower on 2006/05/24 16:02:18 remove queue.c here too Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/Makefile#3 (text+ko) ==== @@ -16,8 +16,8 @@ EXPINC_SUBDIRS_I386 = ${EXPINC_SUBDIRS} EXPORT_ONLY_FILES = \ - mls.h security.h services.h policydb.h global.h context.h queue.h \ - hashtab.h symtab.h avtab.h sidtab.h ebitmap.h mls_types.h constraint.h + mls.h security.h services.h policydb.h global.h context.h hashtab.h \ + symtab.h avtab.h sidtab.h ebitmap.h mls_types.h constraint.h INSTALL_MI_LIST = From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 24 16:07:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E8E6316A6AE for ; Wed, 24 May 2006 16:07:08 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DADA843D6B for ; Wed, 24 May 2006 16:06:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 447F846C2D for ; Wed, 24 May 2006 12:06:57 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 82C565C47E; Wed, 24 May 2006 16:06:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BAD216A95E; Wed, 24 May 2006 16:06:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E117316A95A for ; Wed, 24 May 2006 16:06:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AFB943D53 for ; Wed, 24 May 2006 16:06:51 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4OG5x5q022290 for ; Wed, 24 May 2006 16:05:59 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4OG5xnS022287 for perforce@freebsd.org; Wed, 24 May 2006 16:05:59 GMT (envelope-from millert@freebsd.org) Date: Wed, 24 May 2006 16:05:59 GMT Message-Id: <200605241605.k4OG5xnS022287@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 97743 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 16:07:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=97743 Change 97743 by millert@millert_g4tower on 2006/05/24 16:05:51 Fix type of devfs_type_to_security_class param Add some more debugging to vnode_has_perm() Add all missing entrypoints that are not either network or vfs related, or where there is no appropriate selinux permission or capability. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#41 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#41 (text+ko) ==== @@ -93,6 +93,28 @@ return (ss_initialized); } +static int +signal_to_av(int signum) +{ + int perm; + + switch (signum) { + case SIGCHLD: + perm = PROCESS__SIGCHLD; + break; + case SIGKILL: + perm = PROCESS__SIGKILL; + break; + case SIGSTOP: + perm = PROCESS__SIGSTOP; + break; + default: + perm = PROCESS__SIGNAL; + break; + } + return perm; +} + static void sebsd_init(struct mac_policy_conf *mpc) { @@ -135,6 +157,13 @@ return (avc_has_perm(task->sid, task->sid, SECCLASS_CAPABILITY, cap, &ad)); } +#else +static int +cred_has_capability(struct ucred *cred, unsigned int cap) +{ + + return (0); +} #endif static int @@ -247,7 +276,7 @@ } static __inline u_int16_t -devfs_type_to_security_class(int type) +devfs_type_to_security_class(devfstype_t type) { switch (type) { @@ -309,20 +338,38 @@ ad.u.fs.vp = vp; #if 0 - if (file->sclass == 0) { + { + u_int16_t sclass; struct vattr va; struct proc *p = current_proc(); VOP_GETATTR(vp, &va, p->p_ucred, p); - printf("vnode_has_perm:: ERROR, sid=%d, sclass=0, v_type=%d," - " inode=%ld, fsid=%d, fstype=%s, mnt=%s\n", - file->sid, vp->v_type, va.va_fileid, va.va_fsid, - vp->v_mount->mnt_vfc->vfc_name, - vp->v_mount->mnt_stat.f_mntonname); - file->sclass = vnode_type_to_security_class(vp->v_type); - if (file->sclass == 0) { + sclass = vnode_type_to_security_class(vp->v_type); + if (sclass == 0) { + printf("%s:: ERROR, sid=%d, sclass=0, v_type=%d," + " inode=%ld, fsid=%d, fstype=%s, mnt=%s\n", + __func__, file->sid, vp->v_type, va.va_fileid, + va.va_fsid, vp->v_mount->mnt_vfc->vfc_name, + vp->v_mount->mnt_stat.f_mntonname); printf("vnode_has_perm:: Giving up\n"); return (1); /* TBD: debugging */ } + if (file->sclass != 0 && sclass != file->sclass) { + printf("%s:: ERROR, sid=%d, sclass=%d(%d), perm=0x%x, " + "v_type=%d, inode=%ld, fsid=%d", + __func__, file->sid, sclass, file->sclass, perm, + vp->v_type, va.va_fileid, va.va_fsid); + if (vp->v_mount) { + if (vp->v_mount->mnt_vfc && + vp->v_mount->mnt_vfc->vfc_name) + printf(" %s", + vp->v_mount->mnt_vfc->vfc_name); + if (vp->v_mount->mnt_stat.f_mntonname) + printf(" %s", + vp->v_mount->mnt_stat.f_mntonname); + printf("\n"); + } + } + file->sclass = sclass; } #else @@ -440,6 +487,16 @@ } static void +sebsd_init_posix_label(struct label *label) +{ + struct ipc_security_struct *new; + + new = sebsd_malloc(sizeof(*new), M_SEBSD, M_ZERO | M_WAITOK); + new->sid = SECINITSID_UNLABELED; + SLOT(label) = new; +} + +static void sebsd_init_devfs_label(struct label *label) { struct vnode_security_struct *vsec; @@ -495,6 +552,20 @@ vsec->sclass = dsec->sclass; } +static void +sebsd_update_devfsdirent(struct mount *mp, struct devnode *de, + struct label *delabel, struct vnode *vp, struct label *vlabel) +{ + struct vnode_security_struct *vsec, *dsec; + + vsec = SLOT(vlabel); + dsec = SLOT(delabel); + + dsec->sid = vsec->sid; + dsec->task_sid = vsec->task_sid; + dsec->sclass = vsec->sclass; +} + static int sebsd_associate_vnode_extattr(struct mount *mp, struct label *fslabel, struct vnode *vp, struct label *vlabel) @@ -707,6 +778,33 @@ psec->sid = SECINITSID_KERNEL; } +static void +sebsd_create_posix_sem(struct ucred *cred, struct pseminfo *psem, + struct label *psemlabel, char *name) +{ + struct task_security_struct *tsec; + struct ipc_security_struct *ipcsec; + + tsec = SLOT(cred->cr_label); + ipcsec = SLOT(psemlabel); + + ipcsec->sid = tsec->sid; + ipcsec->sclass = SECCLASS_SEM; +} + +static void +sebsd_create_posix_shm(struct ucred *cred, struct pshminfo *pshm, + struct label *pshmlabel, char *name) +{ + struct task_security_struct *tsec; + struct ipc_security_struct *ipcsec; + + tsec = SLOT(cred->cr_label); + ipcsec = SLOT(pshmlabel); + + ipcsec->sid = tsec->sid; + ipcsec->sclass = SECCLASS_SHM; +} static void sebsd_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr, @@ -736,6 +834,9 @@ ipcsec->sclass = SECCLASS_SHM; } +/* + * NOTE: on Darwin mp will always be NULLL for sebsd_create_devfs_device + */ static void sebsd_create_devfs_device(struct ucred *cr, struct mount *mp, dev_t dev, struct devnode *devfs_dirent, struct label *label, @@ -786,48 +887,50 @@ sebsd_free(path, M_SEBSD); } -#if 0 +/* + * NOTE: on Darwin mp will always be NULLL for sebsd_create_devfs_directory + */ static void sebsd_create_devfs_directory(struct mount *mp, char *dirname, - int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label, + int dirnamelen, struct devnode *de, struct label *label, const char *fullpath) { char *path; int rc; u_int32_t newsid; - struct mount_security_struct *sbsec; struct vnode_security_struct *dirent; dirent = SLOT(label); - sbsec = SLOT(mp->mnt_mntlabel); /* Default to the filesystem SID. */ - dirent->sid = sbsec->sid; + dirent->sid = SECINITSID_DEVFS; dirent->task_sid = SECINITSID_KERNEL; - dirent->sclass = SECCLASS_DIR; + dirent->sclass = devfs_type_to_security_class(de->dn_type); /* Obtain a SID based on the fstype, path, and class. */ path = sebsd_malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); path[0] = '/'; strcpy(&path[1], fullpath); - rc = security_genfs_sid(mp->mnt_vfc->vfc_name, path, dirent->sclass, - &newsid); + rc = security_genfs_sid("devfs", path, dirent->sclass, &newsid); if (rc == 0) dirent->sid = newsid; /* TBD: debugging */ if (sebsd_verbose > 1) { - printf("%s(%s): sbsid=%d, mountpoint=%s, " - "rc=%d, sclass=%d, computedsid=%d, dirent=%d\n", - __func__, path, sbsec->sid, mp->mnt_stat.f_mntonname, rc, - dirent->sclass, newsid, dirent->sid); + printf("%s(%s): mountpoint=devfs, rc=%d, sclass=%d, " + "computedsid=%d, dirent=%d\n", + __func__, path, rc, dirent->sclass, newsid, dirent->sid); } sebsd_free(path, M_SEBSD); } +#if 0 +/* + * The create_devfs_symlink entrypoint is not implemented on Darwin. + */ static void sebsd_create_devfs_symlink(struct ucred *cred, struct mount *mp, - struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, + struct devnode *dd, struct label *ddlabel, struct devnode *de, struct label *delabel, const char *fullpath) { char *path; @@ -835,13 +938,11 @@ u_int32_t newsid; struct vnode_security_struct *lnksec; struct vnode_security_struct *dirsec; - struct mount_security_struct *sbsec; /* TBD: Should probably be checking MAY_LINK/MAY_CREATE perms here */ dirsec = SLOT(ddlabel); lnksec = SLOT(delabel); - sbsec = SLOT(mp->mnt_mntlabel); /* Default to the filesystem SID. */ lnksec->sid = dirsec->sid; @@ -852,20 +953,18 @@ path = sebsd_malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); path[0] = '/'; strcpy(&path[1], fullpath); - rc = security_genfs_sid(mp->mnt_vfc->vfc_name, path, lnksec->sclass, - &newsid); + rc = security_genfs_sid("devfs", path, lnksec->sclass, &newsid); if (rc == 0) lnksec->sid = newsid; if (sebsd_verbose > 1) { - printf("%s(%s): sbsid=%d, mountpoint=%s, rc=%d, sclass=%d, " + printf("%s(%s): mountpoint=devfs, rc=%d, sclass=%d, " "computedsid=%d, dirent=%d\n", __func__, path, - sbsec->sid, mp->mnt_stat.f_mntonname, rc, - lnksec->sclass, newsid, lnksec->sid); + rc, lnksec->sclass, newsid, lnksec->sid); } sebsd_free(path, M_SEBSD); } -#endif /* HAS_DEVFS_DIRENT */ +#endif #ifdef HAS_PIPES /* @@ -1323,11 +1422,10 @@ } #endif /* HAS_PIPES */ -#if 0 /* XXX */ static int sebsd_check_proc_debug(struct ucred *cred, struct proc *proc) { - + return (cred_has_perm(cred, proc, PROCESS__PTRACE)); } @@ -1337,7 +1435,6 @@ return (cred_has_perm(cred, proc, PROCESS__SETSCHED)); } -#endif static int sebsd_check_proc_setlcid(struct proc *p0, struct proc *p, pid_t pid, pid_t lcid) @@ -1401,21 +1498,19 @@ { u_int32_t perm; - switch (signum) { - case SIGCHLD: - perm = PROCESS__SIGCHLD; - break; - case SIGKILL: - perm = PROCESS__SIGKILL; - break; - case SIGSTOP: - perm = PROCESS__SIGSTOP; - break; - default: - perm = PROCESS__SIGNAL; - break; - } + perm = signal_to_av(signum); + return (cred_has_perm(cred, proc, perm)); +} + +static int +sebsd_check_proc_wait(struct ucred *cred, struct proc *proc) +{ + u_int32_t perm, exit_status; + + exit_status = proc->p_xstat; // (promote to 32 btis) + exit_status &= 0177; + perm = signal_to_av(exit_status); return (cred_has_perm(cred, proc, perm)); } @@ -2143,8 +2238,38 @@ return (vnode_has_perm(cred, vp, FILE__GETATTR)); } +static int +sebsd_check_system_acct(struct ucred *cred, struct vnode *v, + struct label *vl) +{ + + return (cred_has_capability(cred, CAPABILITY__SYS_PACCT)); +} + +static int +sebsd_check_system_audit(struct ucred *cred, void *record, int len) +{ + + return (cred_has_capability(cred, CAPABILITY__AUDIT_WRITE)); +} + +static int +sebsd_check_system_auditctl(struct ucred *cred, struct vnode *v, + struct label *vlabel) +{ + + return (cred_has_capability(cred, CAPABILITY__AUDIT_CONTROL)); +} + +static int +sebsd_check_system_auditon(struct ucred *cred, int cmd) +{ + + return (cred_has_capability(cred, CAPABILITY__AUDIT_CONTROL)); +} + /* - * TBD: LSM/SELinux doesn't have a nfsd hook + * TBD: LSM/SELinux doesn't have a nfsd hook or relevant permission */ static int sebsd_check_system_nfsd(struct ucred *cred) @@ -2169,16 +2294,18 @@ return (vnode_has_perm(cred, vp, FILE__SWAPON)); } -/* - * TBD: Sysctl access control is not currently implemented - */ +static int +sebsd_check_system_reboot(struct ucred *cred, int how) +{ + + return (cred_has_capability(cred, CAPABILITY__SYS_BOOT)); +} + static int -sebsd_check_system_sysctl(struct ucred *cred, int *name, - u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, - size_t newlen) +sebsd_check_system_settime(struct ucred *cred) { - return (0); + return (cred_has_capability(cred, CAPABILITY__SYS_TIME)); } static int @@ -2477,7 +2604,7 @@ case GETALL: perm = SEM__READ; break; - case SETVAL: + case SETVAL: case SETALL: perm = SEM__WRITE; break; @@ -2550,6 +2677,12 @@ case IPC_SET: perm = SHM__SETATTR; break; +#if 0 + case SHM_LOCK: + case SHM_UNLOCK: + perm = SHM__LOCK; + break; +#endif case IPC_STAT: perm = SHM__GETATTR | SHM__ASSOCIATE; break; @@ -2569,6 +2702,100 @@ return (ipc_has_perm(cred, shmseglabel, SHM__ASSOCIATE)); } +static int +sebsd_check_posix_sem_create(struct ucred *cred, const char *name) +{ + + struct task_security_struct *t; + + t = SLOT(cred->cr_label); + return (avc_has_perm(t->sid, t->sid, SECCLASS_SEM, SEM__CREATE, NULL)); +} + +static int +sebsd_check_posix_sem_open(struct ucred *cred, struct pseminfo *psem, + struct label *psemlabel) +{ + + return (ipc_has_perm(cred, psemlabel, SEM__ASSOCIATE)); +} + +static int +sebsd_check_posix_sem_post(struct ucred *cred, struct pseminfo *psem, + struct label *psemlabel) +{ + + return (ipc_has_perm(cred, psemlabel, SEM__READ | SEM__WRITE)); +} + +static int +sebsd_check_posix_sem_unlink(struct ucred *cred, struct pseminfo *psem, + struct label *psemlabel, const char *name) +{ + + return (ipc_has_perm(cred, psemlabel, SEM__DESTROY)); +} + +static int +sebsd_check_posix_sem_wait(struct ucred *cred, struct pseminfo *psem, + struct label *psemlabel) +{ + + return (ipc_has_perm(cred, psemlabel, SEM__READ | SEM__WRITE)); +} + +static int +sebsd_check_posix_shm_create(struct ucred *cred, const char *name) +{ + struct task_security_struct *t; + + t = SLOT(cred->cr_label); + return (avc_has_perm(t->sid, t->sid, SECCLASS_SHM, SHM__CREATE, + NULL)); +} + +static int +sebsd_check_posix_shm_mmap(struct ucred *cred, struct pshminfo *ps, + struct label *pshmlabel, int prot, int flags) +{ + + return(ipc_has_perm(cred, pshmlabel, SHM__READ | SHM__WRITE)); +} + + +static int +sebsd_check_posix_shm_open(struct ucred *cred, struct pshminfo *pshm, + struct label *pshmlabel) +{ + + return (ipc_has_perm(cred, pshmlabel, SHM__ASSOCIATE)); +} + +static int +sebsd_check_posix_shm_stat(struct ucred *cred, struct pshminfo *pshm, + struct label *pshmlabel) +{ + + return (ipc_has_perm(cred, pshmlabel, SHM__GETATTR)); +} + +static int +sebsd_check_posix_shm_truncate(struct ucred *cred, struct pshminfo *pshm, + struct label *pshmlabel, size_t len) +{ + + /* XXX: The perm here is just a guess */ + return (ipc_has_perm(cred, pshmlabel, SHM__SETATTR | SHM__WRITE)); +} + +static int +sebsd_check_posix_shm_unlink(struct ucred *cred, struct pshminfo *pshm, + struct label *pshmlabel, const char *name) +{ + + return (ipc_has_perm(cred, pshmlabel, SHM__DESTROY)); +} + static struct mac_policy_ops sebsd_ops = { /* Init Labels */ .mpo_init = sebsd_init, @@ -2611,6 +2838,8 @@ .mpo_create_task = sebsd_create_task, .mpo_create_kernel_task = sebsd_create_kernel_task, .mpo_create_devfs_device = sebsd_create_devfs_device, + .mpo_create_devfs_directory = sebsd_create_devfs_directory, + // .mpo_create_devfs_symlink = sebsd_create_devfs_symlink, .mpo_create_proc0 = sebsd_create_proc0, .mpo_create_proc1 = sebsd_create_proc1, .mpo_create_vnode_extattr = sebsd_create_vnode_extattr, @@ -2619,6 +2848,7 @@ .mpo_associate_vnode_singlelabel = sebsd_associate_vnode_singlelabel, .mpo_associate_vnode_extattr = sebsd_associate_vnode_extattr, .mpo_associate_vnode_devfs = sebsd_associate_vnode_devfs, + .mpo_update_devfsdirent = sebsd_update_devfsdirent, .mpo_request_object_label = sebsd_request_label, @@ -2641,8 +2871,21 @@ .mpo_check_port_hold_send = sebsd_check_port_hold_send, .mpo_check_port_hold_send_once = sebsd_check_port_hold_send_once, .mpo_check_port_hold_receive = sebsd_check_port_hold_recv, + .mpo_check_proc_debug = sebsd_check_proc_debug, + .mpo_check_proc_sched = sebsd_check_proc_sched, .mpo_check_proc_setlcid = sebsd_check_proc_setlcid, .mpo_check_proc_signal = sebsd_check_proc_signal, + .mpo_check_proc_wait = sebsd_check_proc_wait, + .mpo_check_system_acct = sebsd_check_system_acct, + .mpo_check_system_audit = sebsd_check_system_audit, + .mpo_check_system_auditctl = sebsd_check_system_auditctl, + .mpo_check_system_auditon = sebsd_check_system_auditon, + .mpo_check_system_nfsd = sebsd_check_system_nfsd, + .mpo_check_system_swapon = sebsd_check_system_swapon, + .mpo_check_system_swapoff = sebsd_check_system_swapon, + .mpo_check_system_reboot = sebsd_check_system_reboot, + .mpo_check_system_settime = sebsd_check_system_settime, + .mpo_check_vnode_access = sebsd_check_vnode_access, .mpo_check_vnode_chdir = sebsd_check_vnode_chdir, .mpo_check_vnode_chroot = sebsd_check_vnode_chroot, @@ -2681,6 +2924,8 @@ .mpo_check_vnode_stat = sebsd_check_vnode_stat, .mpo_check_vnode_write = sebsd_check_vnode_write, + + /* Mount Points */ .mpo_init_mount_label = sebsd_init_mount_label, .mpo_init_mount_fs_label = sebsd_init_mount_fs_label, @@ -2711,6 +2956,26 @@ .mpo_check_ipc_method = sebsd_check_ipc_method, + /* POSIX IPC Entry Points */ + .mpo_init_posix_sem_label = sebsd_init_posix_label, + .mpo_create_posix_sem = sebsd_create_posix_sem, + .mpo_destroy_posix_sem_label = sebsd_destroy_label, + .mpo_check_posix_sem_create = sebsd_check_posix_sem_create, + .mpo_check_posix_sem_open = sebsd_check_posix_sem_open, + .mpo_check_posix_sem_post = sebsd_check_posix_sem_post, + .mpo_check_posix_sem_unlink = sebsd_check_posix_sem_unlink, + .mpo_check_posix_sem_wait = sebsd_check_posix_sem_wait, + + .mpo_init_posix_shm_label = sebsd_init_posix_label, + .mpo_create_posix_shm = sebsd_create_posix_shm, + .mpo_destroy_posix_shm_label = sebsd_destroy_label, + .mpo_check_posix_shm_create = sebsd_check_posix_shm_create, + .mpo_check_posix_shm_open = sebsd_check_posix_shm_open, + .mpo_check_posix_shm_mmap = sebsd_check_posix_shm_mmap, + .mpo_check_posix_shm_stat = sebsd_check_posix_shm_stat, + .mpo_check_posix_shm_truncate = sebsd_check_posix_shm_truncate, + .mpo_check_posix_shm_unlink = sebsd_check_posix_shm_unlink, + .mpo_syscall = sebsd_syscall }; From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 24 16:14:26 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F10216A821 for ; Wed, 24 May 2006 16:14:26 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69A0443D5F for ; Wed, 24 May 2006 16:14:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9374746C44 for ; Wed, 24 May 2006 12:14:12 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 99396585E1; Wed, 24 May 2006 16:13:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 93BBF16A81F; Wed, 24 May 2006 16:13:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E9A016A809 for ; Wed, 24 May 2006 16:13:00 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DC8643D46 for ; Wed, 24 May 2006 16:12:59 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4OGC7d3022550 for ; Wed, 24 May 2006 16:12:07 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4OGC7Z7022547 for perforce@freebsd.org; Wed, 24 May 2006 16:12:07 GMT (envelope-from deker@FreeBSD.org) Date: Wed, 24 May 2006 16:12:07 GMT Message-Id: <200605241612.k4OGC7Z7022547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 97745 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 16:14:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=97745 Change 97745 by deker@sebsd_build on 2006/05/24 16:12:02 Add patch from pleblanc with the following comments: Added the same classes of missing entry points to sebsd as were added to sedarwin. Specifically: mpo_check_system_* acct reboot settime mpo_check_proc_* wait setuid seteuid setgid setegid setreuid setregid setresuid setresgid All supported SYSV and POSIX IPC syscalls are already implemented, and the BSD MAC Framework doesn't have audit hooks yet. This builds & boots; works during brief normal usage at least. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#43 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#43 (text+ko) ==== @@ -97,6 +97,28 @@ panic("sebsd_destroy"); } +static int +signal_to_av(int signum) +{ + uint32_t perm; + + switch (signum) { + case SIGCHLD: + perm = PROCESS__SIGCHLD; + break; + case SIGKILL: + perm = PROCESS__SIGKILL; + break; + case SIGSTOP: + perm = PROCESS__SIGSTOP; + break; + default: + perm = PROCESS__SIGNAL; + break; + } + return perm; +} + /* * Check whether a task is allowed to use a capability. */ @@ -1116,27 +1138,73 @@ return (cred_has_perm(cred, proc, PROCESS__SETSCHED)); } +/* + * TBD: The SETGID and SETUID capabilities are currently used for + * all functions in those families. + */ +static int +sebsd_check_proc_setgid(struct ucred *cred, gid_t gid) +{ + + return (cred_has_capability(cred, CAPABILITY__SETGID)); +} + +static int +sebsd_check_proc_setregid(struct ucred *cred, gid_t rgid, gid_t egid) +{ + + return (cred_has_capability(cred, CAPABILITY__SETGID)); +} + +static int +sebsd_check_proc_setresgid(struct ucred *cred, gid_t rgid, gid_t egid, + gid_t sgid) +{ + + return (cred_has_capability(cred, CAPABILITY__SETGID)); +} + +static int +sebsd_check_proc_setuid(struct ucred *cred, uid_t uid) +{ + + return (cred_has_capability(cred, CAPABILITY__SETUID)); +} + +static int +sebsd_check_proc_setreuid(struct ucred *cred, uid_t ruid, uid_t euid) +{ + + return (cred_has_capability(cred, CAPABILITY__SETUID)); +} + +static int +sebsd_check_proc_setresuid(struct ucred *cred, uid_t ruid, uid_t euid, + uid_t suid) +{ + + return (cred_has_capability(cred, CAPABILITY__SETUID)); +} + static int sebsd_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) { u_int32_t perm; - switch (signum) { - case SIGCHLD: - perm = PROCESS__SIGCHLD; - break; - case SIGKILL: - perm = PROCESS__SIGKILL; - break; - case SIGSTOP: - perm = PROCESS__SIGSTOP; - break; - default: - perm = PROCESS__SIGNAL; - break; - } + perm = signal_to_av(signum); + return (cred_has_perm(cred, proc, perm)); +} + +static int +sebsd_check_proc_wait(struct ucred *cred, struct proc *proc) +{ + u_int32_t perm, exit_status; + + exit_status = proc->p_xstat; // (promote to 32 btis) + exit_status &= 0177; - return (cred_has_perm(cred, proc, perm)); + perm = signal_to_av(exit_status); + return (cred_has_perm(cred, proc, perm)); } static void @@ -1812,6 +1880,14 @@ return (vnode_has_perm(cred, vp, FILE__GETATTR)); } +static int +sebsd_check_system_acct(struct ucred *cred, struct vnode *c, + struct label *vl) +{ + + return (cred_has_capability(cred, CAPABILITY__SYS_PACCT)); +} + /* * TBD: LSM/SELinux doesn't have a nfsd hook */ @@ -1823,6 +1899,20 @@ } static int +sebsd_check_system_reboot(struct ucred *cred, int how) +{ + + return (cred_has_capability(cred, CAPABILITY__SYS_BOOT)); +} + +static int +sebsd_check_system_settime(struct ucred *cred) +{ + + return (cred_has_capability(cred, CAPABILITY__SYS_TIME)); +} + +static int sebsd_check_system_swapon(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { @@ -2488,11 +2578,11 @@ .mpo_check_mount = sebsd_check_mount, .mpo_check_umount = sebsd_check_umount, .mpo_check_remount = sebsd_check_remount, + .mpo_check_sysv_msgmsq = sebsd_check_sysv_msgmsq, .mpo_check_sysv_msgrcv = sebsd_check_sysv_msgrcv, .mpo_check_sysv_msgrmid = sebsd_check_sysv_msgrmid, .mpo_check_sysv_msqget = sebsd_check_sysv_msqget, .mpo_check_sysv_msqsnd = sebsd_check_sysv_msqsnd, - .mpo_check_sysv_msgmsq = sebsd_check_sysv_msgmsq, .mpo_check_sysv_msqrcv = sebsd_check_sysv_msqrcv, .mpo_check_sysv_msqctl = sebsd_check_sysv_msqctl, .mpo_check_sysv_semctl = sebsd_check_sysv_semctl, @@ -2520,8 +2610,20 @@ .mpo_check_proc_debug = sebsd_check_proc_debug, .mpo_check_proc_sched = sebsd_check_proc_sched, + .mpo_check_proc_setuid = sebsd_check_proc_setuid, + .mpo_check_proc_seteuid = sebsd_check_proc_setuid, + .mpo_check_proc_setgid = sebsd_check_proc_setgid, + .mpo_check_proc_setegid = sebsd_check_proc_setgid, + .mpo_check_proc_setreuid = sebsd_check_proc_setreuid, + .mpo_check_proc_setregid = sebsd_check_proc_setregid, + .mpo_check_proc_setresuid = sebsd_check_proc_setresuid, + .mpo_check_proc_setresgid = sebsd_check_proc_setresgid, .mpo_check_proc_signal = sebsd_check_proc_signal, + .mpo_check_proc_wait = sebsd_check_proc_wait, + .mpo_check_system_acct = sebsd_check_system_acct, .mpo_check_system_nfsd = sebsd_check_system_nfsd, + .mpo_check_system_reboot = sebsd_check_system_reboot, + .mpo_check_system_settime = sebsd_check_system_settime, .mpo_check_system_swapon = sebsd_check_system_swapon, .mpo_check_system_swapoff = sebsd_check_system_swapoff, .mpo_check_system_sysctl = sebsd_check_system_sysctl, From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 24 18:33:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AED5416A68C for ; Wed, 24 May 2006 18:33:05 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F3D443D48 for ; Wed, 24 May 2006 18:33:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9988A46C0F for ; Wed, 24 May 2006 14:33:04 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A4A9D570A0; Wed, 24 May 2006 18:33:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A133816A6F3; Wed, 24 May 2006 18:33:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57CBD16A576 for ; Wed, 24 May 2006 18:33:02 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21EC843D45 for ; Wed, 24 May 2006 18:33:02 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4OIWAgc044920 for ; Wed, 24 May 2006 18:32:10 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4OIW9Tx044917 for perforce@freebsd.org; Wed, 24 May 2006 18:32:09 GMT (envelope-from deker@FreeBSD.org) Date: Wed, 24 May 2006 18:32:09 GMT Message-Id: <200605241832.k4OIW9Tx044917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 97761 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 18:33:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=97761 Change 97761 by deker@sebsd_build on 2006/05/24 18:31:30 Add pre-parsed policy.conf for bootstrapping and fix Makefile to support new bootstrap method. Affected files ... .. //depot/projects/trustedbsd/sebsd/Makefile#17 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/support/policy.conf#1 add Differences ... ==== //depot/projects/trustedbsd/sebsd/Makefile#17 (text+ko) ==== @@ -310,8 +310,17 @@ sebsd_bootstrap: .if exists(${.CURDIR}/contrib/sebsd) @echo "Installing SEBSD policy" - (cd ${.CURDIR}/contrib/sebsd/refpolicy; gmake install-src) - (cd ${DESTDIR}/etc/security/sebsd/${SEBSD_POLICYTYPE}/src/policy; gmake install) +.if exists(${DESTDIR}/usr/bin/checkpolicy) + +.if !exists(${DESTDIR}/etc/security/sebsd/targeted/policy/policy.20) + (${DESTDIR}/usr/bin/checkpolicy -o ${DESTDIR}/etc/security/sebsd/targeted/policy/policy.20 ${.CURDIR}/contrib/sebsd/support/policy.conf) +.else + @echo "Binary policy file found. Not overwriting." +.endif + +.else + @echo /usr/bin/checkpolicy not found. Did you run 'make installworld'? +.endif .endif From owner-trustedbsd-cvs@FreeBSD.ORG Sat May 27 19:51:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D440416CAA7 for ; Sat, 27 May 2006 19:51:54 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C951143D4C for ; Sat, 27 May 2006 19:51:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EEC8F46C8A for ; Sat, 27 May 2006 15:51:50 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B7DE455A1B; Sat, 27 May 2006 19:51:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id ADFD116B8F3; Sat, 27 May 2006 19:51:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2ECDC16B8E4 for ; Sat, 27 May 2006 19:51:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD13943D48 for ; Sat, 27 May 2006 19:51:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4RJodSx009458 for ; Sat, 27 May 2006 19:50:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4RJocFd009455 for perforce@freebsd.org; Sat, 27 May 2006 19:50:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 27 May 2006 19:50:38 GMT Message-Id: <200605271950.k4RJocFd009455@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 97963 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 May 2006 19:52:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=97963 Change 97963 by rwatson@rwatson_sesame on 2006/05/27 19:49:48 - Replace a 'trail' flag for the audit pipe with a preselection mode, making it easier to fit future preselection modes into a reasonable API. We now support two defined operating modes -- trail mode, which tracks the global audit trail preselection, and local mode, which defines a set of local trail paramaters based on the global model, but specific to the current pipe. We provide two operations -- one to set the mode, and the other to query it. Support this using a new preselection mode flag on the pipe rather than a flag in the pipe flags. - Fix or expand a number of comments, and add new ones. - Flag audit pipes as MPSAFE. - Slightly refactor audit_pipe_flush() and audit_pipe_free(): detach the pipe from the global list in free rather than flush, as we may call flush at other points, and this would otherwise result in the pipe no longer receiving audit records after a flush. Assert the mutex in audit_pipe_free(). - Annotate why providing partial reads in the context of parallelism is tricky. I'm not yet sure if I think implementing it is worth the complexity. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#11 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#22 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#11 (text+ko) ==== @@ -44,6 +44,15 @@ }; /* + * Possible modes of operation for audit pipe preselection. + */ +#define AUDITPIPE_PRESELECT_MODE_TRAIL 1 /* Global audit trail. */ +#define AUDITPIPE_PRESELECT_MODE_LOCAL 2 /* Local audit trail. */ +#ifdef NOTYET +#define AUDITPIPE_PRESELECT_MODE_PRIORITY 3 /* Prioritized trail. */ +#endif + +/* * Ioctls to read and control the behavior of individual audit pipe devices. */ #define AUDITPIPE_GET_QLEN _IOR(AUDITPIPE_IOBASE, 1, u_int) @@ -61,8 +70,8 @@ struct auditpipe_ioctl_preselect) #define AUDITPIPE_DELETE_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 12, au_id_t) #define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 13) -#define AUDITPIPE_GET_PRESELECT_TRAIL _IOR(AUDITPIPE_IOBASE, 14, int) -#define AUDITPIPE_SET_PRESELECT_TRAIL _IOW(AUDITPIPE_IOBASE, 15, int) +#define AUDITPIPE_GET_PRESELECT_MODE _IOR(AUDITPIPE_IOBASE, 14, int) +#define AUDITPIPE_SET_PRESELECT_MODE _IOW(AUDITPIPE_IOBASE, 15, int) #define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 16) /* ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#22 (text+ko) ==== @@ -88,8 +88,12 @@ * Audit pipes allow processes to express "interest" in the set of records * that are delivered via the pipe. They do this in a similar manner to the * mechanism for audit trail configuration, by expressing two global masks, - * and optionally expressing per-auid masks. The following data structures - * define by the global masks for each pipe, and a list of per-auid masks. + * and optionally expressing per-auid masks. The following data structure is + * the per-auid mask description. The global state is stored in the audit + * pipe data structure. + * + * We may want to consider a more space/time-efficient data structure once + * usage patterns for per-auid specifications are clear. */ struct audit_pipe_preselect { au_id_t app_auid; @@ -103,7 +107,6 @@ */ #define AUDIT_PIPE_ASYNC 0x00000001 #define AUDIT_PIPE_NBIO 0x00000002 -#define AUDIT_PIPE_TRAIL 0x00000004 /* Use trail preselection. */ struct audit_pipe { int ap_open; /* Device open? */ u_int ap_flags; @@ -124,12 +127,13 @@ * processes (attributable, non-attributable), and a list of specific * interest specifications by auid. */ + int ap_preselect_mode; au_mask_t ap_preselect_flags; au_mask_t ap_preselect_naflags; TAILQ_HEAD(, audit_pipe_preselect) ap_preselect_list; /* - * Record list. + * Current pending record list. */ TAILQ_HEAD(, audit_pipe_entry) ap_queue; @@ -140,15 +144,16 @@ }; /* - * Global list of audit pipes, mutex to protect it and the pipes. Finder + * Global list of audit pipes, mutex to protect it and the pipes. Finer * grained locking may be desirable at some point. */ static TAILQ_HEAD(, audit_pipe) audit_pipe_list; static struct mtx audit_pipe_mtx; /* - * This CV is used to wakeup on an audit record write. Eventually, it should - * probably be per-pipe. + * This CV is used to wakeup on an audit record write. Eventually, it might + * be per-pipe to avoid unnecessary wakeups when several pipes with different + * preselection masks are present. */ static struct cv audit_pipe_cv; @@ -170,7 +175,7 @@ static struct cdevsw audit_pipe_cdevsw = { .d_version = D_VERSION, - .d_flags = D_PSEUDO, + .d_flags = D_PSEUDO | D_NEEDGIANT, .d_open = audit_pipe_open, .d_close = audit_pipe_close, .d_read = audit_pipe_read, @@ -215,6 +220,9 @@ return (NULL); } +/* + * Query the per-pipe mask for a specific auid. + */ static int audit_pipe_preselect_get(struct audit_pipe *ap, au_id_t auid, au_mask_t *maskp) @@ -233,6 +241,10 @@ return (error); } +/* + * Set the per-pipe mask for a specific auid. Add a new entry if needed; + * otherwise, update the current entry. + */ static void audit_pipe_preselect_set(struct audit_pipe *ap, au_id_t auid, au_mask_t mask) { @@ -257,6 +269,9 @@ free(app_new, M_AUDIT_PIPE_PRESELECT); } +/* + * Delete a per-auid mask on an audit pipe. + */ static int audit_pipe_preselect_delete(struct audit_pipe *ap, au_id_t auid) { @@ -276,6 +291,9 @@ return (error); } +/* + * Delete all per-auid masks on an audit pipe. + */ static void audit_pipe_preselect_flush(struct audit_pipe *ap) { @@ -294,9 +312,9 @@ * properties. Algorithm is as follows: * * - If the pipe is configured to track the default trail configuration, then - * use that. + * use the results of global preselection matching. * - If not, search for a specifically configured auid entry matching the - * event. If it is found, use that. + * event. If an entry is found, use that. * - Otherwise, use the default flags or naflags configured for the pipe. */ static int @@ -307,24 +325,33 @@ mtx_assert(&audit_pipe_mtx, MA_OWNED); - if ((ap->ap_flags & AUDIT_PIPE_TRAIL) && trail_preselect) - return (1); + switch (ap->ap_preselect_mode) { + case AUDITPIPE_PRESELECT_MODE_TRAIL: + return (trail_preselect); + + case AUDITPIPE_PRESELECT_MODE_LOCAL: + app = audit_pipe_preselect_find(ap, auid); + if (app == NULL) { + if (auid == AU_DEFAUDITID) + return (au_preselect(event, class, + &ap->ap_preselect_naflags, sorf)); + else + return (au_preselect(event, class, + &ap->ap_preselect_flags, sorf)); + } else + return (au_preselect(event, class, &app->app_mask, + sorf)); + + default: + panic("audit_pipe_preselect_check: mode %d", + ap->ap_preselect_mode); + } - app = audit_pipe_preselect_find(ap, auid); - if (app == NULL) { - if (auid == AU_DEFAUDITID) - return (au_preselect(event, class, - &ap->ap_preselect_naflags, sorf)); - else - return (au_preselect(event, class, - &ap->ap_preselect_flags, sorf)); - } else - return (au_preselect(event, class, &app->app_mask, sorf)); return (0); } /* - * Determine whether there exists a pipe interested in a record with these + * Determine whether there exists a pipe interested in a record with specific * properties. */ int @@ -346,7 +373,7 @@ } /* - * Apparent individual record to a queue -- allocate queue-local buffer, and + * Append individual record to a queue -- allocate queue-local buffer, and * add to the queue. We try to drop from the head of the queue so that more * recent events take precedence over older ones, but if allocation fails we * do drop the new event. @@ -449,7 +476,7 @@ /* - * Read the next record off of an audit pipe. + * Pop the next record off of an audit pipe. */ static struct audit_pipe_entry * audit_pipe_pop(struct audit_pipe *ap) @@ -487,15 +514,15 @@ /* * Default flags, naflags, and auid-specific preselection settings to - * 0. Initialize the AUDIT_PIPE_TRAIL flag so that if praudit(1) is - * run on /dev/auditpipe, it sees events associated with the default - * trail. Pipe-aware application can clear the flag, set custom - * masks, and flush the pipe as needed. + * 0. Initialize the mode to the global trail so that if praudit(1) + * is run on /dev/auditpipe, it sees events associated with the + * default trail. Pipe-aware application can clear the flag, set + * custom masks, and flush the pipe as needed. */ bzero(&ap->ap_preselect_flags, sizeof(ap->ap_preselect_flags)); bzero(&ap->ap_preselect_naflags, sizeof(ap->ap_preselect_naflags)); - ap->ap_flags |= AUDIT_PIPE_TRAIL; TAILQ_INIT(&ap->ap_preselect_list); + ap->ap_preselect_mode = AUDITPIPE_PRESELECT_MODE_TRAIL; TAILQ_INSERT_HEAD(&audit_pipe_list, ap, ap_list); audit_pipe_count++; @@ -505,7 +532,7 @@ } /* - * Flush all records from an audit pipe; assume mutex is held. + * Flush all records currently present in an audit pipe; assume mutex is held. */ static void audit_pipe_flush(struct audit_pipe *ap) @@ -514,7 +541,6 @@ mtx_assert(&audit_pipe_mtx, MA_OWNED); - TAILQ_REMOVE(&audit_pipe_list, ap, ap_list); while ((ape = TAILQ_FIRST(&ap->ap_queue)) != NULL) { TAILQ_REMOVE(&ap->ap_queue, ape, ape_queue); audit_pipe_entry_free(ape); @@ -524,14 +550,20 @@ } /* - * Free an audit pipe. Assumes mutex is held, audit_pipe is still on the - * global list. Frees any audit pipe entries in the queue. + * Free an audit pipe; this means freeing all preselection state and all + * records in the pipe. Assumes mutex is held to prevent any new records + * from being inserted during the free, and that the audit pipe is still on + * the global list. */ static void audit_pipe_free(struct audit_pipe *ap) { + mtx_assert(&audit_pipe_mtx, MA_OWNED); + + audit_pipe_preselect_flush(ap); audit_pipe_flush(ap); + TAILQ_REMOVE(&audit_pipe_list, ap, ap_list); free(ap, M_AUDIT_PIPE); audit_pipe_count--; } @@ -629,8 +661,8 @@ struct auditpipe_ioctl_preselect *aip; struct audit_pipe *ap; au_mask_t *maskp; + int error, mode; au_id_t auid; - int error; ap = dev->si_drv1; KASSERT(ap != NULL, ("audit_pipe_ioctl: ap == NULL")); @@ -765,21 +797,27 @@ error = 0; break; - case AUDITPIPE_GET_PRESELECT_TRAIL: + case AUDITPIPE_GET_PRESELECT_MODE: mtx_lock(&audit_pipe_mtx); - *(int *)data = (ap->ap_flags & AUDIT_PIPE_TRAIL) ? 1 : 0; + *(int *)data = ap->ap_preselect_mode; mtx_unlock(&audit_pipe_mtx); error = 0; break; - case AUDITPIPE_SET_PRESELECT_TRAIL: - mtx_lock(&audit_pipe_mtx); - if (*(int *)data) - ap->ap_flags |= AUDIT_PIPE_TRAIL; - else - ap->ap_flags &= ~AUDIT_PIPE_TRAIL; - mtx_unlock(&audit_pipe_mtx); - error = 0; + case AUDITPIPE_SET_PRESELECT_MODE: + mode = *(int *)data; + switch (mode) { + case AUDITPIPE_PRESELECT_MODE_TRAIL: + case AUDITPIPE_PRESELECT_MODE_LOCAL: + mtx_lock(&audit_pipe_mtx); + ap->ap_preselect_mode = mode; + mtx_unlock(&audit_pipe_mtx); + error = 0; + break; + + default: + error = EINVAL; + } break; case AUDITPIPE_FLUSH: @@ -818,6 +856,17 @@ /* * Audit pipe read. Pull one record off the queue and copy to user space. * On error, the record is dropped. + * + * Providing more sophisticated behavior, such as partial reads, is tricky + * due to the potential for parallel I/O. If partial read support is + * required, it will require a per-pipe "current record being read" along + * with an offset into that trecord which has already been read. Threads + * performing partial reads will need to allocate per-thread copies of the + * data so that if another thread completes the read of the record, it can be + * freed without adding reference count logic. If this is added, a flag to + * indicate that only atomic record reads are desired would be useful, as if + * different threads are all waiting for records on the pipe, they will want + * independent record reads, which is currently the behavior. */ static int audit_pipe_read(struct cdev *dev, struct uio *uio, int flag) From owner-trustedbsd-cvs@FreeBSD.ORG Sat May 27 19:52:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD60516CB19 for ; Sat, 27 May 2006 19:52:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13C3E43D48 for ; Sat, 27 May 2006 19:52:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4A52D46CCA for ; Sat, 27 May 2006 15:52:54 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B214155E92; Sat, 27 May 2006 19:52:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A731116B569; Sat, 27 May 2006 19:52:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F09D116A97C for ; Sat, 27 May 2006 19:52:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DBB243D46 for ; Sat, 27 May 2006 19:52:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4RJpfme009559 for ; Sat, 27 May 2006 19:51:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4RJpfsp009556 for perforce@freebsd.org; Sat, 27 May 2006 19:51:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 27 May 2006 19:51:41 GMT Message-Id: <200605271951.k4RJpfsp009556@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 97964 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 May 2006 19:53:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=97964 Change 97964 by rwatson@rwatson_sesame on 2006/05/27 19:51:38 Update audit pipe man page: - Fix title, a number of typos. - Refactor and rewrite the section on audit pipe preselection. Document the revised interfaces, but also break the ioctls out into sections, document why/how this is useful, that flushing after a preselection change may be desirable, etc. - Document potential future fixes/features. Affected files ... .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" .Dd May 5, 2006 .Os -.Vt AUDITPIPE 4 +.Dt AUDITPIPE 4 .Sh NAME .Nm auditpipe .Nd Pseudo-device for live audit event tracking @@ -54,29 +54,27 @@ .Qq tee of the audit event stream. As the device is clonable, more than one instance of the device may be opened -at a time; each device instance will provide access to all records. +at a time; each device instance will provide independent access to all +records. .Pp -The audit pipe device provides discreet BSM audit records; if the read buffer +The audit pipe device provides discrete BSM audit records; if the read buffer passed by the application is too small to hold the next record in the sequence, it will be dropped. Unlike audit data written to the audit trail, the reliability of record delivery is not guaranteed. In particular, when an audit pipe queue fills, records will be dropped. Audit pipe devices are blocking by default, but support non-blocking I/O, -asynchronous I/O using SIGIO, and support for polled operation via +asynchronous I/O using SIGIO, and polled operation via .Xr select 2 and .Xr poll 2 . -.Ss Preselection -By default, the audit pipe facility configures pipes to present records -matched by the system-wide audit trail, configured by -.Xr auditd 8 . -However, the preselection mechanism for audit pipes can be configured using -alternative criteria, including pipe-local flags and naflags settings, as -well as auid-specific selection masks. -.Ss Ioctls -These properties are configured using ioctls on the open audit pipe device. -.Bl -tag -width AUDITPIPE_DELETE_PRESELECT_AUID +.Pp +Applications may choose to track the global audit trail, or configure local +preselection parameters independent of the global audit trail parameters. +.Ss Audit Pipe Queue Ioctls +The following ioctls retrieve and set various audit pipe record queue +properties: +.Bl -tag -width AUDITPIPE_GET_QLIMIT_MIN .It AUDITPIPE_GET_QLEN Query the current number of records available for reading on the pipe. .It AUDITPIPE_GET_QLIMIT @@ -93,6 +91,56 @@ .It AUDITPIPE_GET_QLIMIT_MAX Query the highest possible maximum number of records that may be queued for reading on the pipe. +.It AUDITPIPE_FLUSH +Flush all outstanding records on the audit pipe; useful after setting initial +preselection properties to delete records queued during the configuration +process which may not match the interests of the user process. +.El +.Ss Audit Pipe Preselection Mode Ioctls +By default, the audit pipe facility configures pipes to present records +matched by the system-wide audit trail, configured by +.Xr auditd 8 . +However, the preselection mechanism for audit pipes can be configured using +alternative criteria, including pipe-local flags and naflags settings, as +well as auid-specific selection masks. +This allows applications to track events not captured in the global audit +trail, as well as limit records presented to those of specific interest to +the application. +.Pp +The following ioctls configure the preselection mode on an audit pipe: +.Bl -tag -width AUDITPIPE_GET_PRESELECT_MODE +.It AUDITPIPE_GET_PRESELECT_MODE +Return the current preselect mode on the audit pipe. +The ioctl argument should be of type +.Vt int . +.It AUDITPIPE_SET_PRESELECT_MODE +Set the current preselection mode on the audit pipe. +The ioctl argument should be of type +.Vt int . +.El +.Pp +Possible preselection mode values are: +.Bl -tag -width AUDITPIPE_PRESELECT_MODE_TRAIL +.It AUDITPIPE_PRESELECT_MODE_TRAIL +Use the global audit trail preselection parameters to select records for the +audit pipe. +.It AUDITPIPE_PRESELECT_MODE_LOCAL +Use local audit pipe preselection; this model is similar to the global audit +trail configuration model, consisting of global flags and naflags paramaters, +as well as a set of per-auid masks. +These parameters are configured using further ioctls. +.El +.Pp +After changing the audit pipe preselection mode, records selected under +earlier preselection configuration may still be in the audit pipe queue. +The application may flush the current record queue after changing the +configuration to remove possibly undesired records. +.Ss Audit Pipe Local Preselection Mode Ioctls +The following ioctls configure the preselection paramaters used when an audit +pipe is configured for the +.Dv AUDITPIPE_PRESELECT_MODE_LOCAL +preselection mode. +.Bl -tag -width AUDITPIPE_GET_PRESELECT_NAFLAGS .It AUDITPIPE_GET_PRESELECT_FLAGS Retrieve the current default preselection flags for attributable events on the pipe. @@ -135,7 +183,9 @@ .Vt struct auditpipe_preselect . The auid to query is specified via the .Va ap_auid -field; the mask will be returned via +field of type +.Vt au_id_t ; +the mask will be returned via .Va ap_mask of type .Vt au_mask_t . @@ -150,26 +200,10 @@ Delete the current preselection mask for a specific auid on the pipe. Once called, events associated with the specified auid will use the default flags mask. +The ioctl argument should be of type +.Vt au_id_t . .It AUDITPIPE_FLUSH_PRESELECT_AUID Delete all auid specific preselection specifications. -.It AUDITPIPE_GET_PRESELECT_TRAIL -Return the current value of the preselection trail flag on the audit pipe; -this flag indicates that the system audit trail preselection masks are to be -used in selecting which events can be read from the audit pipe. -If the value is 1, the trail masks are used; if the value is 0, then the -pipe preselection masks will be used. -The ioctl argument should be of type -.Vt int . -.It AUDITPIPE_SET_PRESELECT_TRAIL -Set the current value of the preselection trail flag on the audit pipe, with -values as described for -.Dv AUDITPIPE_GET_PRESELECT_TRAIL. -The ioctl argument should be of type -.Vt int . -.It AUDITPIPE_FLUSH -Flush all outstanding records on the audit pipe; useful after setting initial -preselection properties to delete records queued during the configuration -process which may not match the interests of the user process. .El .Sh EXAMPLES .Xr praudit 1 @@ -184,7 +218,7 @@ .Xr audit 8 , .Xr auditd 8 .Sh AUTHORS -The audit pipe facility was created by +The audit pipe facility was designed and implemented by .An Robert Watson Aq rwatson@FreeBSD.org . .Pp The Basic Security Module (BSM) interface to audit records and audit event @@ -201,3 +235,15 @@ See the .Xr audit 4 manual page for information on audit-related bugs and limitations. +.Pp +The configurable preselection mechanism mirrors the selection model present +for the global audit trail. +It might be desirable to provided a more flexible selection model. +.Pp +The per-pipe audit event queue is fifo, with drops occuring if either the +user thread provides in sufficient for the record on the queue head, or on +enqueue if there is insufficient room. +It might be desirable to support partial reads of records, which would be +more compatible with buffered I/O as implemented in system libraries, and to +allow applications to select which records are dropped, possibly in the style +of preselection. From owner-trustedbsd-cvs@FreeBSD.ORG Sun May 28 04:05:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B9BFF16B47B for ; Sun, 28 May 2006 04:04:13 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39D4643D46 for ; Sun, 28 May 2006 04:04:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id ABB2B46B0E for ; Sun, 28 May 2006 00:04:12 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8481A55A36; Sun, 28 May 2006 04:04:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 314DE16B79C; Sun, 28 May 2006 04:03:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4FE9016B873 for ; Sun, 28 May 2006 03:56:53 +0000 (UTC) (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 1D14443D46 for ; Sun, 28 May 2006 03:56:53 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4S3tkBP061157 for ; Sun, 28 May 2006 03:55:46 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4S3tkQp061154 for perforce@freebsd.org; Sun, 28 May 2006 03:55:46 GMT (envelope-from csjp@freebsd.org) Date: Sun, 28 May 2006 03:55:46 GMT Message-Id: <200605280355.k4S3tkQp061154@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 97988 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 May 2006 04:06:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=97988 Change 97988 by csjp@csjp_xor on 2006/05/28 03:55:13 Instead of zeroing out termid, resulting in a bogus origin, use getaudit instead. This will allow remote host information to be propagated through to the subject token. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#23 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#23 $ */ #ifdef __APPLE__ @@ -62,12 +62,12 @@ int reterr, const char *fmt, ...) { char text[MAX_AUDITSTRING_LEN]; - au_tid_t termid; token_t *token; long acond; va_list ap; pid_t pid; int error, afd; + struct auditinfo ai; if (auditon(A_GETCOND, &acond, sizeof(acond)) < 0) { /* @@ -92,11 +92,16 @@ errno = error; return (-1); } - /* XXX what should we do for termid? */ - bzero(&termid, sizeof(termid)); + if (getaudit(&ai) < 0) { + error = errno; + syslog(LOG_AUTH | LOG_ERR, "audit: getaudit failed: %s", + strerror(errno)); + errno = error; + return (-1); + } pid = getpid(); token = au_to_subject32(auid, geteuid(), getegid(), - getuid(), getgid(), pid, pid, &termid); + getuid(), getgid(), pid, pid, &ai.ai_termid); if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "audit: unable to build subject token"); From owner-trustedbsd-cvs@FreeBSD.ORG Sun May 28 10:46:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 970E916B013 for ; Sun, 28 May 2006 10:44:46 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A98143D6A for ; Sun, 28 May 2006 10:44:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id AF30446C14 for ; Sun, 28 May 2006 06:44:18 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 50C7E730E0; Sun, 28 May 2006 10:44:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 79EF116A871; Sun, 28 May 2006 10:39:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C160416AD09 for ; Sun, 28 May 2006 10:36:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E54BA43D5F for ; Sun, 28 May 2006 10:36:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4SAZCNA005065 for ; Sun, 28 May 2006 10:35:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4SAXIrL004540 for perforce@freebsd.org; Sun, 28 May 2006 10:33:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 28 May 2006 10:33:18 GMT Message-Id: <200605281033.k4SAXIrL004540@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 98005 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 May 2006 10:46:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=98005 Change 98005 by rwatson@rwatson_zoo on 2006/05/28 10:32:26 Integrate TrustedBSD base branch from FreeBSD CVS HEAD: - doxygen - !pcvt - !ip6fw - !alpha - !lnc - scc(4) - openbsd nc version - cached - resolver update - libc version bump - 6.1 release note - mount_ext2fs, mount_linprocfs, mount_procfs, mount_reiserfs no longer needed - ipfw tagging - acpi_dock - linsysfs - device_get_sysctl.9, sysctl.9 - timezone update - rs232x - more arm - linux emulation device numbe translation - midi retrofit - iwi retrofit - early tty retrofit rumblings - usb cleanup - aio locking - variable maximum multicast subscription list - udp6_append - usual plethora of locking fixes and enhancements for sockets, networking, vm, vfs, ... - mpsafe nfs client - ntp update TrustedBSD-related: - Loop back audit of exec argument Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#37 integrate .. //depot/projects/trustedbsd/base/Makefile#44 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#72 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#9 integrate .. //depot/projects/trustedbsd/base/UPDATING#66 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.1#11 integrate .. //depot/projects/trustedbsd/base/bin/sh/input.c#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/atomicio.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/atomicio.h#1 branch .. //depot/projects/trustedbsd/base/contrib/netcat/nc.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/netcat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/socks.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.X#8 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.8#6 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_namespace.h#1 branch .. //depot/projects/trustedbsd/base/etc/Makefile#49 integrate .. //depot/projects/trustedbsd/base/etc/bluetooth/hcsecd.conf#3 integrate .. //depot/projects/trustedbsd/base/etc/cached.conf#1 branch .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#19 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#53 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.root.dist#13 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#41 integrate .. //depot/projects/trustedbsd/base/etc/nsswitch.conf#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/security/600.ip6fwdenied#6 delete .. //depot/projects/trustedbsd/base/etc/periodic/security/650.ip6fwlimit#7 delete .. //depot/projects/trustedbsd/base/etc/periodic/security/Makefile#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#38 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cached#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/ip6fw#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/isdnd#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mdconfig#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/mdconfig2#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/moused#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nsswitch#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pcvt#5 delete .. //depot/projects/trustedbsd/base/etc/rc.d/syscons#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sysctl#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.firewall6#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#26 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#50 integrate .. //depot/projects/trustedbsd/base/include/arpa/nameser.h#5 integrate .. //depot/projects/trustedbsd/base/include/glob.h#4 integrate .. //depot/projects/trustedbsd/base/include/netdb.h#13 integrate .. //depot/projects/trustedbsd/base/include/nsswitch.h#4 integrate .. //depot/projects/trustedbsd/base/include/res_update.h#2 integrate .. //depot/projects/trustedbsd/base/include/resolv.h#10 integrate .. //depot/projects/trustedbsd/base/include/rpc/rpcent.h#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libroken/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/csu/common/crtbegin.c#3 delete .. //depot/projects/trustedbsd/base/lib/csu/common/crtend.c#2 delete .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#20 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libatm/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#23 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/SYS.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getgrent.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/gethostname.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpwent.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/glob.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/glob.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/signal.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/syslog.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_watch.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/isc/list.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/include/nscache.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/include/nscachedcli.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/nameser/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/nameser/ns_samedomain.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Makefile.inc#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gai_strerror.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#24 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyht.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyname.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbynis.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostnamadr.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnameinfo.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetnamadr.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getproto.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getprotoent.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getprotoname.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservbyname.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/net/getservbyport.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/net/getservent.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#23 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/netdb_private.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/nscache.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/nscachedcli.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/nsdispatch.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/nsparser.y#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_mkupdate.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/net/res_update.c#5 delete .. //depot/projects/trustedbsd/base/lib/libc/resolv/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/resolv/h_errno.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_findzonecut.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_mkupdate.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_state.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_update.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/rpc/getrpcent.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/a64l.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#26 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtol.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtoul.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chflags.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/wait.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libcam/camlib.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ssh/Makefile#15 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/thr_getcontext.S#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/pthread.map#14 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_symbols.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/pthread.map#7 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_attr.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_getschedparam.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutexattr.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#19 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setschedparam.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libpthread_db.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libpthread_db.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libthr_db.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libutil/Makefile#14 integrate .. //depot/projects/trustedbsd/base/lib/libutil/kld.c#2 integrate .. //depot/projects/trustedbsd/base/release/Makefile#75 integrate .. //depot/projects/trustedbsd/base/release/doc/README#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/Makefile#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/Makefile#4 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml#3 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#30 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#67 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/Makefile#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml#3 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/install.sgml#18 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/Makefile#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#5 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#100 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#22 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#9 integrate .. //depot/projects/trustedbsd/base/release/doc/share/examples/Makefile.relnotesng#10 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#13 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#8 integrate .. //depot/projects/trustedbsd/base/release/i386/mkisoimages.sh#7 integrate .. //depot/projects/trustedbsd/base/release/picobsd/build/picobsd#12 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#34 integrate .. //depot/projects/trustedbsd/base/sbin/adjkerntz/adjkerntz.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/ip6fw/Makefile#4 delete .. //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.8#13 delete .. //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.c#11 delete .. //depot/projects/trustedbsd/base/sbin/ip6fw/sample.sh#2 delete .. //depot/projects/trustedbsd/base/sbin/ipf/ipf/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#45 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#38 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.8#22 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#21 integrate .. //depot/projects/trustedbsd/base/sbin/mount_std/mount_std.8#11 integrate .. //depot/projects/trustedbsd/base/sbin/rcorder/rcorder.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/setkey/setkey.8#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#22 integrate .. //depot/projects/trustedbsd/base/secure/libexec/sftp-server/Makefile#10 integrate .. //depot/projects/trustedbsd/base/secure/libexec/ssh-keysign/Makefile#5 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/scp/Makefile#9 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/sftp/Makefile#10 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-add/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-agent/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-keygen/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-keyscan/Makefile#7 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh/Makefile#15 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#20 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/README.examples#5 integrate .. //depot/projects/trustedbsd/base/share/examples/kld/cdev/module/cdevmod.c#5 integrate .. //depot/projects/trustedbsd/base/share/examples/mdoc/example.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#66 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#25 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi_dock.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/aha.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ahb.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ahc.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ahd.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/arcmsr.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ath.4#21 integrate .. //depot/projects/trustedbsd/base/share/man/man4/atkbd.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ciss.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/dc.4#15 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ddb.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fdc.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fxp.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man4/geom.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/hptmv.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ida.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ip.4#16 integrate .. //depot/projects/trustedbsd/base/share/man/man4/isp.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ispfw.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/kbdmux.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/lmc.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/Makefile#22 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/lnc.4#9 delete .. //depot/projects/trustedbsd/base/share/man/man4/mlx.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mly.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mpt.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_etf.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pcvt.4#7 delete .. //depot/projects/trustedbsd/base/share/man/man4/pst.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/rr232x.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/sio.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/smp.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/splash.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/trm.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/twa.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/twe.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vkbd.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wi.4#25 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#23 integrate .. //depot/projects/trustedbsd/base/share/man/man5/devfs.5#6 integrate .. //depot/projects/trustedbsd/base/share/man/man5/ext2fs.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/linprocfs.5#8 integrate .. //depot/projects/trustedbsd/base/share/man/man5/linsysfs.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#41 integrate .. //depot/projects/trustedbsd/base/share/man/man5/nsswitch.conf.5#8 integrate .. //depot/projects/trustedbsd/base/share/man/man5/periodic.conf.5#19 integrate .. //depot/projects/trustedbsd/base/share/man/man5/procfs.5#11 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#58 integrate .. //depot/projects/trustedbsd/base/share/man/man5/reiserfs.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/src.conf.5#2 integrate .. //depot/projects/trustedbsd/base/share/man/man7/build.7#12 integrate .. //depot/projects/trustedbsd/base/share/man/man7/hier.7#27 integrate .. //depot/projects/trustedbsd/base/share/man/man7/security.7#16 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#50 integrate .. //depot/projects/trustedbsd/base/share/man/man9/bus_dma.9#14 integrate .. //depot/projects/trustedbsd/base/share/man/man9/crypto.9#7 integrate .. //depot/projects/trustedbsd/base/share/man/man9/device_get_sysctl.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/make_dev.9#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/suser.9#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sysctl.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/sysctl_add_oid.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sysctl_ctx_init.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/zero_copy.9#9 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#28 integrate .. //depot/projects/trustedbsd/base/share/misc/iso3166#8 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#14 integrate .. //depot/projects/trustedbsd/base/share/syscons/fonts/iso15-8x14.fnt#3 integrate .. //depot/projects/trustedbsd/base/share/syscons/fonts/iso15-8x16.fnt#3 integrate .. //depot/projects/trustedbsd/base/share/syscons/fonts/iso15-8x8.fnt#3 integrate .. //depot/projects/trustedbsd/base/share/syscons/fonts/iso15-thin-8x16.fnt#3 integrate .. //depot/projects/trustedbsd/base/share/termcap/termcap.src#19 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/africa#6 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/antarctica#6 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/asia#11 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/australasia#10 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/backward#8 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/etcetera#3 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/europe#11 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/factory#2 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/leapseconds#10 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/northamerica#11 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/southamerica#12 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/systemv#3 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/yearistype.sh#3 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/zone.tab#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/api_up1000.c#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/atomic.s#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/autoconf.c#12 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/busdma_machdep.c#20 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/busspace.c#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/clock.c#17 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/clock_if.m#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/cpuconf.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_disasm.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_instruction.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_interface.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_trace.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_1000a.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_2100_a50.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_2100_a500.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_3000_300.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_3000_500.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_axppci_33.c#10 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_eb164.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_eb64plus.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_kn20aa.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_kn300.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_kn8ae.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_st550.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_st6600.c#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/divrem.m4#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dump_machdep.c#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/elf_machdep.c#15 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/exception.s#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/fp_emulate.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/gdb_machdep.c#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/genassym.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/ieee_float.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/in_cksum.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/interrupt.c#23 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/locore.s#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#44 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mem.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mp_machdep.c#23 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pal.s#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#48 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/prom.c#11 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/prom_disp.s#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/promcons.c#15 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/sgmap.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/support.s#11 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/swtch.s#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/sys_machdep.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#32 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/uio_machdep.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/uma_machdep.c#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#32 delete .. //depot/projects/trustedbsd/base/sys/alpha/compile/.cvsignore#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/.cvsignore#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/DEFAULTS#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#41 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC.hints#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/MAC#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/Makefile#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/NOTES#10 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/_bus.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/_inttypes.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/_limits.h#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/_stdint.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/_types.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/alpha_cpu.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/asm.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/atomic.h#13 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/bootinfo.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/bus.h#18 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/bus_dma.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/bwx.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/chipset.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/clock.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/clockvar.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/cpu.h#13 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/cpuconf.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/cpufunc.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/db_machdep.h#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/elf.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/endian.h#11 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/exec.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/float.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/floatingpoint.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/fpu.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/frame.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/gdb_machdep.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ieee.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ieeefp.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/in_cksum.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/inst.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/intr.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/intrcnt.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ioctl_bt848.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ioctl_meteor.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/kdb.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/limits.h#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/md_var.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/memdev.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/mutex.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pal.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/param.h#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pc/bios.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pc/display.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pc/vesa.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pcb.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pcpu.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pmap.h#19 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pmc_mdep.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ppireg.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/proc.h#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/profile.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/prom.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pte.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ptrace.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/reg.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/reloc.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/resource.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/rpb.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/runq.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/setjmp.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/sf_buf.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/sgmap.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/sigframe.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/signal.h#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/smp.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/stdarg.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/swiz.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/sysarch.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/timerreg.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ucontext.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/varargs.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/vmparam.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/isa/isa.c#13 delete .. //depot/projects/trustedbsd/base/sys/alpha/isa/isa_dma.c#11 delete .. //depot/projects/trustedbsd/base/sys/alpha/isa/isavar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/isa/mcclock_isa.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_dummy.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_genassym.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_locore.s#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_machdep.c#15 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_proto.h#19 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_syscall.h#18 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysent.c#18 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysvec.c#20 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/syscalls.conf#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/syscalls.master#18 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcbus.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcbusreg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcbusvar.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcmem.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcpcia.c#15 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcpciareg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcpciavar.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/Makefile#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/exec_ecoff.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/imgact_osf1.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_ioctl.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_misc.c#26 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_mount.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_proto.h#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_signal.c#19 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_signal.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_syscall.h#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_sysent.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_sysvec.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_util.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/syscalls.conf#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/syscalls.master#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/alphapci_if.m#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/apecs.c#11 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/apecs_pci.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/apecsreg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/apecsvar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/bwx.c#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/cia.c#12 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/cia_pci.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/ciareg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/ciavar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/irongate.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/irongate_pci.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/irongatereg.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/irongatevar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/lca.c#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/lca_pci.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/lcareg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/lcavar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/pci_eb164_intr.s#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/pci_eb64plus_intr.s#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/pcibus.c#10 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/pcibus.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/swiz.c#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/t2.c#12 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/t2_pci.c#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/t2reg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/t2var.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunami.c#10 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunami_pci.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunamireg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/dwlpx.c#12 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/dwlpxreg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/dwlpxvar.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/gbus.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/kftxx.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/kftxxreg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/mcclock_tlsb.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsb.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsbcpu.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsbmem.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsbreg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsbvar.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/zs_tlsb.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/amd64/apic_vector.S#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#25 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#20 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#28 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#22 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/apicvar.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/clock.h#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/cpu.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/mutex.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pmap.h#19 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/smp.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/specialreg.h#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/KB920X#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SIMICS#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SKYEYE#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/_types.h#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/atomic.h#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/cpu.h#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#11 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0_io.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0_reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_cpu_sa1110.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_dev_sa1110.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_space.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq80321.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/Makefile#15 integrate .. //depot/projects/trustedbsd/base/sys/boot/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/Makefile.inc#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/boot1/Makefile#8 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/boot1/boot1.c#5 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/cdboot/Makefile#5 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/cdboot/version#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/Makefile.common#7 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/conf.c#6 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/help.alpha#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/ldscript#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/main.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/Makefile#5 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/OSFpal.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/alpha_copy.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/alpha_module.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/bootinfo.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/common.h#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/delay.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/devicename.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/elf_freebsd.c#6 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/getsecs.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/libalpha.h#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/prom.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/reboot.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/srmdisk.c#5 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/srmnet.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/time.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/loader/Makefile#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/loader/version#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/netboot/Makefile#5 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/netboot/version#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/include/arcfuncs.h#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/include/arctypes.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/include/libarc.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/Makefile#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/abort.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arcconsole.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arcdisk.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/bootinfo.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/delay.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/devicename.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/elf_freebsd.c#6 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/module.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/prom.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/setjmperr.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/time.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/loader/Makefile#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/loader/conf.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/loader/help.alpha#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/loader/main.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/loader/version#2 delete .. //depot/projects/trustedbsd/base/sys/boot/common/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/load_elf.c#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/loader.8#32 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/bootinfo.c#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/ficl/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sys/boot/ficl/alpha/sysdep.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/ficl/alpha/sysdep.h#4 delete .. //depot/projects/trustedbsd/base/sys/boot/ficl/loader.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.4th#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#30 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot0/boot0.S#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/bootinfo.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/conf.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/io.c#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/powerpc/loader/conf.c#4 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_ccb.h#8 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_debug.h#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_periph.c#19 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_target.c#18 integrate .. //depot/projects/trustedbsd/base/sys/coda/cnode.h#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#31 integrate .. //depot/projects/trustedbsd/base/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#24 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#35 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.h#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#40 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_signal.c#13 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_socket.c#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#26 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_util.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_util.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_hal.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ntoskrnl.c#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.alpha#17 delete .. //depot/projects/trustedbsd/base/sys/conf/NOTES#71 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#100 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.alpha#30 delete .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#28 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#62 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#53 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.mk#13 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#47 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#42 integrate .. //depot/projects/trustedbsd/base/sys/conf/ldscript.alpha#5 delete .. //depot/projects/trustedbsd/base/sys/conf/options#71 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.alpha#13 delete .. //depot/projects/trustedbsd/base/sys/conf/options.amd64#14 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#8 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#35 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#36 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/oltr/if_oltr.c#17 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_ioctl.c#13 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_ps.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdSchedule.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#48 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pci.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_resource.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advansys.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_linux.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amrvar.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/arl/if_arl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/arl/if_arl_isa.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#53 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#44 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath_pci.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbdc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfe.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfereg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#53 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_os.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/cnw/if_cnw.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/cpufreq/ichss.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ct/bshw_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ctau/if_ct.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/cx/if_cx.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons_os.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/de/if_de.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/dec/mc146818reg.h#3 delete .. //depot/projects/trustedbsd/base/sys/dev/dec/mcclock.c#4 delete .. //depot/projects/trustedbsd/base/sys/dev/dec/mcclock_if.m#3 delete .. //depot/projects/trustedbsd/base/sys/dev/dec/mcclockvar.h#3 delete .. //depot/projects/trustedbsd/base/sys/dev/digi/digi.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_scsi.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_drv.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/mga_drv.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r300_cmdbuf.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_cbus.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_pccard.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/boot_font.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/gfb.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/tga.c#7 delete .. //depot/projects/trustedbsd/base/sys/dev/fb/tga.h#3 delete .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#52 integrate .. //depot/projects/trustedbsd/base/sys/dev/gfb/gfb_pci.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/hptmv/entry.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/hptmv/osbsd.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_alpha.c#2 delete .. //depot/projects/trustedbsd/base/sys/dev/ic/ns16550.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/idt/idt.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ie/if_ie_isa.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir_pci.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ips/ips.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_tpublic.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwireg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwivar.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgb/if_ixgb.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgb/if_ixgb_osdep.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/am7990.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/am79900.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/if_le_cbus.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/if_le_isa.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/lance.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/lancereg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/lancevar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lgereg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/lmc/if_lmc.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc.c#21 delete .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc_cbus.c#11 delete .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc_isa.c#10 delete .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc_pci.c#12 delete .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lncreg.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lncvar.h#5 delete .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_linux.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ciphy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/e1000phy.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/mii_physubr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/miivar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/nsgphy.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/tdkphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ukphy_subr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_debug.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mse/mse.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mse/mse_cbus.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mse/mse_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ncv/ncr53c500.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_ngereg.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/nsp/nsp.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/nve/if_nve.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/ofw_console.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/pbio/pbio.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#47 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbvar.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/fixup_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#47 integrate .. //depot/projects/trustedbsd/base/sys/dev/pdq/pdq_freebsd.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/pdq/pdqvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/vpoio.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppc/ppc.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppc/ppc_puc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_ebus.c#9 delete .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_pccard.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_pci.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_sbus.c#10 delete .. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/pucvar.h#12 delete .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/README#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/array.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/him.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/list.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/safe/safe.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/safe/safevar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sbsh/if_sbsh.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio_puc.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/es1888.c#6 delete .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/gusc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/midi.c#8 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/midi.h#7 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/midiq.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/mpu401.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/mpu401.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/mpu_if.m#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/mpufoi_if.m#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/sequencer.c#9 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/sequencer.h#4 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/synth_if.m#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/cmi.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10k1.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/stg/tmc18c30.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/apm/apm_saver.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/scterm-sc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/scvesactl.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/scvgarndr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/tga/tga_pci.c#11 delete .. //depot/projects/trustedbsd/base/sys/dev/tga/tga_pci.h#3 delete .. //depot/projects/trustedbsd/base/sys/dev/trm/trm.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl_cam.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/txp/if_txp.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus_puc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_core.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_cpu_alpha.c#7 delete .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dbg.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_ns8250.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_z8530.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_tty.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsecvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehcivar.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axereg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohcireg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohcivar.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/sl811hs.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci_pci.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhcivar.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_mem.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#51 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdivar.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/wds/wd7000.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#53 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/zs/zs.c#16 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Dependencies#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-cam#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-geom#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-kern#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-linux#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-vm#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/README#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/common-Doxyfile#1 branch .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vfsops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#32 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#25 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.h#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_subr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#24 integrate .. //depot/projects/trustedbsd/base/sys/gdb/gdb.h#3 integrate .. //depot/projects/trustedbsd/base/sys/gdb/gdb_cons.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gdb/gdb_main.c#6 integrate .. //depot/projects/trustedbsd/base/sys/gdb/gdb_packet.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#33 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#14 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#13 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Mon May 29 17:09:02 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E240616AE82 for ; Mon, 29 May 2006 17:09:02 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C79C43D5E for ; Mon, 29 May 2006 17:08:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A0ABF46C39 for ; Mon, 29 May 2006 13:08:57 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6FEB763109; Mon, 29 May 2006 17:08:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 69B7216AE9B; Mon, 29 May 2006 17:08:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4135516AE7F for ; Mon, 29 May 2006 17:08:56 +0000 (UTC) (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 0B78A43D46 for ; Mon, 29 May 2006 17:08:56 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TH7g2i081633 for ; Mon, 29 May 2006 17:07:42 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TH7geA081630 for perforce@freebsd.org; Mon, 29 May 2006 17:07:42 GMT (envelope-from csjp@freebsd.org) Date: Mon, 29 May 2006 17:07:42 GMT Message-Id: <200605291707.k4TH7geA081630@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 98080 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 17:09:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=98080 Change 98080 by csjp@csjp_xor on 2006/05/29 17:06:58 Add a note to the audit_submit man page informing users that how the terminal ID portion of the subject token will be set. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#7 (text+ko) ==== @@ -26,7 +26,7 @@ .\" 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. -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#7 $ .Dd April 11, 2006 .Dt audit_submit 3 .Os @@ -65,6 +65,18 @@ If .Fa format is NULL, then no text token is created in the audit record. +.Pp +It should be noted that +.Nm +assumes that +.Xr setaudit 2 , +or +.Xr setaudit_addr 2 +has already been called. As a direct result, the terminal ID for the +subject will be retrieved from the kernel via +.Xr getaudit 2 , +or +.Xr getaudit_addr 2 . .Sh EXAMPLES .Bd -literal -offset indent #include @@ -96,6 +108,7 @@ .Ed .Sh SEE ALSO .Xr auditon 2 , +.Xr getaudit 2 , .Xr libbsm 3 , .Xr stdarg 3 .Sh HISTORY From owner-trustedbsd-cvs@FreeBSD.ORG Mon May 29 20:23:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D794616A916 for ; Mon, 29 May 2006 20:23:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FE4F43D70 for ; Mon, 29 May 2006 20:23:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7C69846C4F for ; Mon, 29 May 2006 16:23:20 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0F35A72B35; Mon, 29 May 2006 20:23:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0664916A6DD; Mon, 29 May 2006 20:23:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5783316A71C for ; Mon, 29 May 2006 20:23:19 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC52543D78 for ; Mon, 29 May 2006 20:23:17 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TKM3x1010133 for ; Mon, 29 May 2006 20:22:03 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TKM3Vc010130 for perforce@freebsd.org; Mon, 29 May 2006 20:22:03 GMT (envelope-from brueffer@freebsd.org) Date: Mon, 29 May 2006 20:22:03 GMT Message-Id: <200605292022.k4TKM3Vc010130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 98091 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 20:23:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=98091 Change 98091 by brueffer@brueffer_serenity on 2006/05/29 20:21:40 Cleanup. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#8 (text+ko) ==== @@ -26,8 +26,10 @@ .\" 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. -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#7 $ -.Dd April 11, 2006 +.\" +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#8 $ +.\" +.Dd May 29, 2006 .Dt audit_submit 3 .Os .Sh NAME @@ -44,12 +46,12 @@ .Nm function provides a generic programming interface for audit record submission. This audit record will contain a header, subject token, an optional text token, -return token, and a trailer. The header will contain the event class specified -by +return token, and a trailer. +The header will contain the event class specified by .Fa au_event . The subject token will be generated based on .Fa au_ctx . -The return token of is dependant on the +The return token is dependant on the .Fa status and .Fa reterr @@ -72,7 +74,8 @@ .Xr setaudit 2 , or .Xr setaudit_addr 2 -has already been called. As a direct result, the terminal ID for the +has already been called. +As a direct result, the terminal ID for the subject will be retrieved from the kernel via .Xr getaudit 2 , or @@ -114,7 +117,7 @@ .Sh HISTORY The .Nm -first appeared in OpenBSM version 1.0. +function first appeared in OpenBSM version 1.0. OpenBSM 1.0 was introduced in FreeBSD 7.0. .Sh AUTHORS The From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 30 09:09:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A219F16A42A for ; Tue, 30 May 2006 09:09:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1063343D53 for ; Tue, 30 May 2006 09:09:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3E32546D12 for ; Tue, 30 May 2006 05:09:54 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9922056196; Tue, 30 May 2006 09:09:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9216116A486; Tue, 30 May 2006 09:09:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 39D7C16A46C for ; Tue, 30 May 2006 09:09:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC06243D53 for ; Tue, 30 May 2006 09:09:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4U98aGM020337 for ; Tue, 30 May 2006 09:08:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4U96iAe019108 for perforce@freebsd.org; Tue, 30 May 2006 09:06:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 30 May 2006 09:06:44 GMT Message-Id: <200605300906.k4U96iAe019108@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 98120 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 09:09:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=98120 Change 98120 by rwatson@rwatson_zoo on 2006/05/30 09:05:17 Integrate TrustedBSD audit3 branch from TrustedBSD base branch; see change @98005 for a summar of feature changes. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#7 integrate .. //depot/projects/trustedbsd/audit3/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#9 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#5 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#10 integrate .. //depot/projects/trustedbsd/audit3/bin/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/bin/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/bin/chflags/chflags.1#6 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/bin/ed/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/bin/getfacl/getfacl.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/getfacl/getfacl.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/cmp.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/extern.h#3 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/ls.1#6 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/ls.c#6 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/ls.h#3 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/print.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/util.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/pax/pax.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/ps/keyword.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/rm/rm.c#6 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/TOUR#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/builtins.def#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/eval.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/exec.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/exec.h#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/input.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/mkbuiltins#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/options.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/show.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/trap.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/var.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/amd/fixmount/fixmount.8#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FREEBSD-Upgrade#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/TODO#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/config.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/config.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/csup.1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/fattr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/globtree.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/idcache.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/idcache.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/lister.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/misc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/misc.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/proto.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/token.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/token.l#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/updater.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/aes.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/config.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/config.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/config_types.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/defconfig#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/driver.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_pax.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_psk.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd_cli.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd_ctrl.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd_ctrl.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/logwatch/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/logwatch/hostapd#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/md5.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/tls.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wired.conf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa_ctrl.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa_ctrl.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/CHANGELOG#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/CHANGES#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/INSTALL#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/MANIFEST#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/NEWS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/README#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/bind.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/callback.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/chardefs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/complete.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/config.h.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/configure#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/configure.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/display.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/readline.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/histexamp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlcat.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/ChangeLog#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/config.h.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/configure#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/configure.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/extern.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/os.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/pty.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/rlfe.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/screen.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlptytest.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rltest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlversion.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/funmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/histexpand.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/history.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/input.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/macro.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/mbutil.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/misc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/readline.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/readline.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rldefs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rlmbutil.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rlprivate.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rltty.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/search.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/shell.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/shlib/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/signals.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/support/config.guess#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/support/shlib-install#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/support/shobj-conf#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/support/wcwidth.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/libreadline/terminal.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/text.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/tilde.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/tilde.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/undo.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/util.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/vi_keymap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/netcat/atomicio.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/netcat/atomicio.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/netcat/nc.1#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/netcat/netcat.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/netcat/socks.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/libngatm.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/uniaddr.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/unifunc.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/unimsg.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/unisap.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/unistruct.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_user#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_warn#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/opie/opiepasswd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/authpf/authpf.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pflogd/pflogd.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/PGPKEYS#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/README#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/RELEASE_NOTES#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/README#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/knecht.mc#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/submit.cf#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/dnsbl.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/mtamark.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/proto.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/version.m4#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/ostype/darwin.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/sendmail.schema#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/contrib/dnsblaccess.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/doc/op/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/doc/op/op.me#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/libmilter/mfdef.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/conf.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/ldap.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/time.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/README#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_helo.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/libmilter.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/listener.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/signal.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/smfi.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/b-strcmp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/b-strl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/clock.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/fclose.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/fflush.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/fopen.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/fpos.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/fseek.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/ldap.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/local.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/memstat.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/refill.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/shm.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/signal.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/stdio.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/strio.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-event.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-memstat.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/ungetc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/vfprintf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/vfscanf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/README#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/TRACEFLAGS#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/collect.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/conf.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/conf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/daemon.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/deliver.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/envelope.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/headers.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/helpfile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/map.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mci.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/milter.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mime.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/parseaddr.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/queue.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/readcf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/savemail.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sendmail.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sfsasl.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sfsasl.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/srvrsmtp.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/tls.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/udb.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/usersmtp.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/util.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/version.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/top/top.X#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/top/top.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/traceroute/traceroute.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/traceroute/traceroute.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/base64.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/base64.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config_file.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config_types.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto_gnutls.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/developer.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_hostap.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_wired.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_pax.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/events.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/hostap_common.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/hostapd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/main.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/preauth.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/preauth.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_gnutls.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_schannel.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_i.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ChangeLog#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/README#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/README.platform#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/README.tun#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/acconfig.h#4 delete .. //depot/projects/trustedbsd/audit3/crypto/openssh/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-krb5.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-options.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-options.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-pam.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth2-gss.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth2.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/bufaux.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/buildpkg.sh.in#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/canohost.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/channels.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/channels.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/cipher-ctr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/cipher.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/clientloop.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/config.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/configure.ac#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/defines.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/dns.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/dns.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/entropy.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/entropy.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/envpass.sh#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssh/gss-genr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/gss-serv-krb5.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/gss-serv.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/hostfile.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/includes.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kex.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kex.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexdh.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexdhc.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexdhs.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexgex.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexgexc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/loginrec.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/misc.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/misc.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor_wrap.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/base64.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/basename.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bindresvport.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-asprintf.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-closefrom.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-misc.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/dirname.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/getcwd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/getgrouplist.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/getopt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/getrrsetbyname.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/glob.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/glob.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/inet_aton.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/inet_ntoa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/inet_ntop.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/mktemp.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/openbsd-compat.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/port-tun.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/port-tun.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/readpassphrase.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/readpassphrase.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/realpath.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/rresvport.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/setenv.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/sigact.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/sigact.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strlcat.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strlcpy.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strmode.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strsep.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strtoll.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strtonum.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strtoul.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/sys-queue.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/sys-tree.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/vis.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/vis.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/opensshd.init.in#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/packet.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/progressmeter.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/readconf.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/readconf.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/README.regress#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/agent-getpeereid.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/forwarding.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/multiplex.sh#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/reconfigure.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/scp-ssh-wrapper.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/scp.sh#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/test-exec.sh#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/try-ciphers.sh#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/yes-head.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/scp.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/scp.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/servconf.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/servconf.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/serverloop.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/session.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp-client.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp-common.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp-server.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-add.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-agent.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keygen.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keygen.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keyscan.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keyscan.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keysign.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh_config#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh_config.5#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh_namespace.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect1.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect2.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd.8#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd_config#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd_config.5#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/version.h#4 integrate .. //depot/projects/trustedbsd/audit3/etc/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/etc/bluetooth/hcsecd.conf#3 integrate .. //depot/projects/trustedbsd/audit3/etc/cached.conf#1 branch .. //depot/projects/trustedbsd/audit3/etc/defaults/devfs.rules#2 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/periodic.conf#7 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#11 integrate .. //depot/projects/trustedbsd/audit3/etc/devd.conf#6 integrate .. //depot/projects/trustedbsd/audit3/etc/etc.sparc64/ttys#6 integrate .. //depot/projects/trustedbsd/audit3/etc/gettytab#4 integrate .. //depot/projects/trustedbsd/audit3/etc/hosts.allow#4 integrate .. //depot/projects/trustedbsd/audit3/etc/isdn/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#8 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.root.dist#7 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.usr.dist#5 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.x11-4.dist#7 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/etc/network.subr#7 integrate .. //depot/projects/trustedbsd/audit3/etc/nsswitch.conf#1 branch .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/440.status-mailq#3 integrate .. //depot/projects/trustedbsd/audit3/etc/periodic/security/600.ip6fwdenied#2 delete .. //depot/projects/trustedbsd/audit3/etc/periodic/security/650.ip6fwlimit#2 delete .. //depot/projects/trustedbsd/audit3/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/trustedbsd/audit3/etc/periodic/security/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.bsdextended#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/SERVERS#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/amd#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/cached#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/ike#4 delete .. //depot/projects/trustedbsd/audit3/etc/rc.d/ip6fw#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/isdnd#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/jail#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/kernel#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/mdconfig#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/mdconfig2#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/moused#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/named#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/nsswitch#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ntpd#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pcvt#3 delete .. //depot/projects/trustedbsd/audit3/etc/rc.d/serial#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/sshd#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/syscons#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/sysctl#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.firewall6#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.subr#7 integrate .. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.mc#3 integrate .. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/trustedbsd/audit3/games/factor/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#11 integrate .. //depot/projects/trustedbsd/audit3/games/random/random.c#5 integrate .. //depot/projects/trustedbsd/audit3/games/random/randomize_fd.c#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libdialog/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libg2c/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libgcc/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libgcov/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libobjc/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libreadline/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libreadline/config.h#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/bc/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/gdbserver/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/gdbserver/low-fbsd.c#2 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cc_tools/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cvs/cvs/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/dialog/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/gdbserver/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/gdbserver/fbsd-low.c#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/gdbserver/fbsd-low.h#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/gdbserver/reg-i386.c#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/libgdb/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/include/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/include/arpa/inet.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/arpa/nameser.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/glob.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/malloc_np.h#1 branch .. //depot/projects/trustedbsd/audit3/include/netdb.h#4 integrate .. //depot/projects/trustedbsd/audit3/include/nsswitch.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/res_update.h#1 branch .. //depot/projects/trustedbsd/audit3/include/resolv.h#5 integrate .. //depot/projects/trustedbsd/audit3/include/rpc/rpcent.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/stdio.h#4 integrate .. //depot/projects/trustedbsd/audit3/include/stdlib.h#5 integrate .. //depot/projects/trustedbsd/audit3/include/time.h#4 integrate .. //depot/projects/trustedbsd/audit3/kerberos5/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/kerberos5/lib/libgssapi/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/kerberos5/lib/libroken/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/bind/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/bind9/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/config.mk#5 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/dns/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/isc/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/isccc/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/isccfg/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/lwres/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/csu/common/crtbegin.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/csu/common/crtend.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libarchive/INSTALL#2 delete .. //depot/projects/trustedbsd/audit3/lib/libarchive/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/Makefile.am#4 delete .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive.h.in#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.h#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_extract.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_cpio.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tp.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_pax.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/configure.ac.in#5 delete .. //depot/projects/trustedbsd/audit3/lib/libarchive/tar.5#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libatm/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/Versions.def#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/arm/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/SYS.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/db/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/db/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/db/man/dbm.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gdtoa/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/gen/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/gen/_pthread_stubs.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/_spinlock_stub.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/gethostname.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/getpwent.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/glob.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/glob.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/signal.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/syslog.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/tls.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/vis.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/wordexp.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gmon/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gmon/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/i386/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/i386/sys/i386_set_watch.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/isc/eventlib.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/isc/list.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/libc_private.h#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/include/namespace.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/include/nscache.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/nscachedcli.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/port_after.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/port_before.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/resolv_mt.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/un-namespace.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/inet/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_addr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_cidr_pton.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_lnaof.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_makeaddr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_net_ntop.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_net_pton.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_neta.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_netof.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_network.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_ntoa.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_ntop.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_pton.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/nsap_addr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/isc/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/isc/ev_streams.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/isc/ev_timers.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/isc/eventlib_p.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/locale/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/locale/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/locale/utf8.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_name.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_netint.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_parse.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_print.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_samedomain.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_ttl.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/net/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/net/gai_strerror.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getaddrinfo.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gethostbydns.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gethostbyht.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gethostbyname.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gethostbynis.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gethostnamadr.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getnameinfo.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getnetbydns.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getnetbyht.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getnetbynis.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getnetnamadr.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getproto.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getprotoent.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getprotoname.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getservbyname.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/getservbyport.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/getservent.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/herror.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_addr.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_lnaof.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_makeaddr.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_net_ntop.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_net_pton.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_neta.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_netof.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_network.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_ntoa.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_ntop.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_pton.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/name6.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/netdb_private.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/ns_name.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/ns_netint.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/ns_parse.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/ns_print.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/ns_ttl.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/nsap_addr.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/nscache.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/net/nscachedcli.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/nsparser.y#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_comp.c#4 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_config.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_data.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_debug.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_init.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_mkquery.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_mkupdate.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_query.c#4 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_send.c#4 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_send_private.h#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_update.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/nls/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/nls/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/posix1e/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/posix1e/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/quad/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/quad/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/regex/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/regex/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/h_errno.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/herror.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/mtctxres.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_comp.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_data.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_debug.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_debug.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_findzonecut.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_init.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_mkquery.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_mkupdate.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_private.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_query.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_send.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_state.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_update.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/softfloat/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/softfloat/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/fpu/fpu_qp.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/fclose.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/fcloseall.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/local.h#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/vfprintf.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/vfscanf.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/vfwprintf.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/vfwscanf.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/xprintf.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/a64l.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/strtol.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/strtonum.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/strtonum.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/strtoul.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdtime/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdtime/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/string/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/string/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/sys/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/sys/chflags.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/getsockopt.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mmap.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mq.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/sys/recv.2#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/wait.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/write.2#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/uuid/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/uuid/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/xdr/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/xdr/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/yp/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/yp/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc_r/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libcam/camlib.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libcrypt/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libdisk/disk.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libfetch/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libgpib/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libio/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_amd64.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_i386.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_minidump_amd64.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_minidump_i386.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_private.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libmilter/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libncp/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libncurses/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/modules.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_login_access/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_login_access/login.access.5#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_login_access/pam_login_access.8#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_nologin/pam_nologin.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_ssh/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_unix/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpcap/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmc.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmclog.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/i386/i386/thr_getcontext.S#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/pthread.map#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/sys/thr_error.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_accept.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_atfork.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_attr_destroy.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 30 11:33:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0942316A42D for ; Tue, 30 May 2006 11:33:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B29B43D55 for ; Tue, 30 May 2006 11:33:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7731646CF7 for ; Tue, 30 May 2006 07:33:54 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AD0995555A; Tue, 30 May 2006 11:33:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A4A1516A424; Tue, 30 May 2006 11:33:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8166A16A421 for ; Tue, 30 May 2006 11:33:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3217043D46 for ; Tue, 30 May 2006 11:33: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.6/8.13.6) with ESMTP id k4UBWasu057976 for ; Tue, 30 May 2006 11:32:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UBWZKY057973 for perforce@freebsd.org; Tue, 30 May 2006 11:32:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 30 May 2006 11:32:35 GMT Message-Id: <200605301132.k4UBWZKY057973@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 98124 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 11:33:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=98124 Change 98124 by rwatson@rwatson_zoo on 2006/05/30 11:31:58 Re-merge. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#11 (text+ko) ==== @@ -8,7 +8,6 @@ CFLAGS+=-DLOGALL DPADD= ${LIBUTIL} ${LIBPAM} ${LIBBSM} LDADD= -lutil ${MINUSLPAM} -MAN= login.1 login.access.5 .if ${MK_SETUID_LOGIN} != "no" BINOWN= root From owner-trustedbsd-cvs@FreeBSD.ORG Tue May 30 12:56:46 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A837516A6B5 for ; Tue, 30 May 2006 12:56:46 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 288FE43D46 for ; Tue, 30 May 2006 12:56:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5DD7646D1F for ; Tue, 30 May 2006 08:56:45 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BB462581C0; Tue, 30 May 2006 12:56:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B051316A606; Tue, 30 May 2006 12:56:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5723016A601 for ; Tue, 30 May 2006 12:56:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0870A43D53 for ; Tue, 30 May 2006 12:56: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.6/8.13.6) with ESMTP id k4UCtOnV072918 for ; Tue, 30 May 2006 12:55:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UCtO0S072915 for perforce@freebsd.org; Tue, 30 May 2006 12:55:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 30 May 2006 12:55:24 GMT Message-Id: <200605301255.k4UCtO0S072915@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 98128 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 12:56:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=98128 Change 98128 by rwatson@rwatson_zoo on 2006/05/30 12:55:14 Delete mismerge. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#8 (text+ko) ==== @@ -162,8 +162,6 @@ if (mask_p == NULL) return (-1); - ae_class = au_event_class(event); - /* * Perform the actual check of the masks against the event. */ From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 31 08:24:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A60EC16A42D for ; Wed, 31 May 2006 08:24:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1871C43D5C for ; Wed, 31 May 2006 08:24:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A70C146D35 for ; Wed, 31 May 2006 04:24:35 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1702355A4A; Wed, 31 May 2006 08:24:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E08716A428; Wed, 31 May 2006 08:24:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C3F7916A427 for ; Wed, 31 May 2006 08:24:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2A0143D53 for ; Wed, 31 May 2006 08:24:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V8NBXe044488 for ; Wed, 31 May 2006 08:23:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V8NBMQ044485 for perforce@freebsd.org; Wed, 31 May 2006 08:23:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 31 May 2006 08:23:11 GMT Message-Id: <200605310823.k4V8NBMQ044485@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 98193 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 08:24:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=98193 Change 98193 by rwatson@rwatson_zoo on 2006/05/31 08:23:09 Create audit_pipe_preselect_flush() from audit_pipe_preselect_flush_locked(), as we call the preselect flush routine both with and without the audit pipe mutex; with when closing the pipe, and without when the flush ioctl is called. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#24 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#24 (text+ko) ==== @@ -295,15 +295,24 @@ * Delete all per-auid masks on an audit pipe. */ static void -audit_pipe_preselect_flush(struct audit_pipe *ap) +audit_pipe_preselect_flush_locked(struct audit_pipe *ap) { struct audit_pipe_preselect *app; - mtx_lock(&audit_pipe_mtx); + mtx_assert(&audit_pipe_mtx, MA_OWNED); + while ((app = TAILQ_FIRST(&ap->ap_preselect_list)) != NULL) { TAILQ_REMOVE(&ap->ap_preselect_list, app, app_list); free(app, M_AUDIT_PIPE_PRESELECT); } +} + +static void +audit_pipe_preselect_flush(struct audit_pipe *ap) +{ + + mtx_lock(&audit_pipe_mtx); + audit_pipe_preselect_flush_locked(ap); mtx_unlock(&audit_pipe_mtx); } @@ -561,7 +570,7 @@ mtx_assert(&audit_pipe_mtx, MA_OWNED); - audit_pipe_preselect_flush(ap); + audit_pipe_preselect_flush_locked(ap); audit_pipe_flush(ap); TAILQ_REMOVE(&audit_pipe_list, ap, ap_list); free(ap, M_AUDIT_PIPE); From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 31 10:37:35 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 949CD16A439 for ; Wed, 31 May 2006 10:37:35 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85D1943D53 for ; Wed, 31 May 2006 10:37:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 92EA246D56 for ; Wed, 31 May 2006 06:37:31 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 42B1C5B783; Wed, 31 May 2006 10:37:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 35F1316A44C; Wed, 31 May 2006 10:37:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A580F16A457 for ; Wed, 31 May 2006 10:37:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A3BA43D53 for ; Wed, 31 May 2006 10:37:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4VAZvjo060345 for ; Wed, 31 May 2006 10:35:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4VAZvFh060342 for perforce@freebsd.org; Wed, 31 May 2006 10:35:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 31 May 2006 10:35:57 GMT Message-Id: <200605311035.k4VAZvFh060342@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 98196 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 10:37:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=98196 Change 98196 by rwatson@rwatson_peppercorn on 2006/05/31 10:34:58 Add two entry points, mac_ipfw_tcpreflect() and mac_ipfw_tcpkeepalive(), intended to allow ipfw to label packets it generates. Note yet fully implemented. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#40 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_inet.c#4 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#285 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#246 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#40 (text+ko) ==== @@ -1524,9 +1524,12 @@ * When flags & TH_RST, we are sending a RST packet, because of a * "reset" action matched the packet. * Otherwise we are sending a keepalive, and flags & TH_ + * The 'replyto' mbuf is the mbuf being replied to, if any, and is required + * so that MAC can label the reply appropriately. */ static struct mbuf * -send_pkt(struct ipfw_flow_id *id, u_int32_t seq, u_int32_t ack, int flags) +send_pkt(struct mbuf *replyto, struct ipfw_flow_id *id, u_int32_t seq, + u_int32_t ack, int flags) { struct mbuf *m; struct ip *ip; @@ -1536,6 +1539,13 @@ if (m == 0) return (NULL); m->m_pkthdr.rcvif = (struct ifnet *)0; + +#ifdef MAC + if (replyto != NULL) + + +#endif + m->m_pkthdr.len = m->m_len = sizeof(struct ip) + sizeof(struct tcphdr); m->m_data += max_linkhdr; @@ -1620,8 +1630,8 @@ L3HDR(struct tcphdr, mtod(args->m, struct ip *)); if ( (tcp->th_flags & TH_RST) == 0) { struct mbuf *m; - m = send_pkt(&(args->f_id), ntohl(tcp->th_seq), - ntohl(tcp->th_ack), + m = send_pkt(args->m, &(args->f_id), + ntohl(tcp->th_seq), ntohl(tcp->th_ack), tcp->th_flags | TH_RST); if (m != NULL) ip_output(m, NULL, NULL, 0, NULL, NULL); @@ -4082,7 +4092,7 @@ if (TIME_LEQ(q->expire, time_uptime)) continue; /* too late, rule expired */ - *mtailp = send_pkt(&(q->id), q->ack_rev - 1, + *mtailp = send_pkt(NULL, &(q->id), q->ack_rev - 1, q->ack_fwd, TH_SYN); if (*mtailp != NULL) mtailp = &(*mtailp)->m_nextpkt; ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_inet.c#4 (text+ko) ==== @@ -309,3 +309,29 @@ INP_LOCK_ASSERT(inp); MAC_PERFORM(inpcb_sosetlabel, so, so->so_label, inp, inp->inp_label); } + +void +mac_ipfw_tcpreflect(struct mbuf *from, struct mbuf *to) +{ + struct label *fromlabel, *tolabel; + + M_ASSERTPKTHDR(from); + M_ASSERTPKTHDR(to); + + fromlabel = mac_mbuf_to_label(from); + tolabel = mac_mbuf_to_label(to); + + MAC_PERFORM(ipfw_tcpreflect, from, fromlabel, to, tolabel); +} + +void +mac_ipfw_tcpkeepalive(struct mbuf *m) +{ + struct label *label; + + M_ASSERTPKTHDR(m); + + label = mac_mbuf_to_label(m); + + MAC_PERFORM(ipfw_tcpkeepalive, m, label); +} ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#285 (text+ko) ==== @@ -283,6 +283,8 @@ void mac_update_ipq(struct mbuf *fragment, struct ipq *ipq); int mac_update_mbuf_from_cipso(struct mbuf *m, char *cp, int *code); void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp); +void mac_ipfw_tcpreflect(struct mbuf *from, struct mbuf *to); +void mac_ipfw_tcpkeepalive(struct mbuf *m); /* * Labeling event operations: processes. ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#246 (text+ko) ==== @@ -328,6 +328,11 @@ typedef void (*mpo_inpcb_sosetlabel_t)(struct socket *so, struct label *label, struct inpcb *inp, struct label *inplabel); +typedef void (*mpo_ipfw_tcpreflect_t)(struct mbuf *from, + struct label *fromlabel, struct mbuf *to, + struct label *tolabel); +typedef void (*mpo_ipfw_tcpkeepalive_t)(struct mbuf *m, + struct label *label); /* * Labeling event operations: processes. @@ -748,6 +753,8 @@ mpo_update_ipq_t mpo_update_ipq; mpo_update_mbuf_from_cipso_t mpo_update_mbuf_from_cipso; mpo_inpcb_sosetlabel_t mpo_inpcb_sosetlabel; + mpo_ipfw_tcpreflect_t mpo_ipfw_tcpreflect; + mpo_ipfw_tcpkeepalive_t mpo_ipfw_tcpkeepalive; /* * Labeling event operations: processes. From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 31 12:52:32 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE0BB16A4CD for ; Wed, 31 May 2006 12:52:32 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47FB943D48 for ; Wed, 31 May 2006 12:52:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1937146D2B for ; Wed, 31 May 2006 08:52:31 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D9664D0A0E; Wed, 31 May 2006 12:36:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C89B16A6A7; Wed, 31 May 2006 12:35:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0FAC16A605 for ; Wed, 31 May 2006 12:35:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D66343D58 for ; Wed, 31 May 2006 12:35:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4VCYSYX082259 for ; Wed, 31 May 2006 12:34:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4VCYSHo082256 for perforce@freebsd.org; Wed, 31 May 2006 12:34:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 31 May 2006 12:34:28 GMT Message-Id: <200605311234.k4VCYSHo082256@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 98204 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 12:52:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=98204 Change 98204 by rwatson@rwatson_zoo on 2006/05/31 12:33:49 More ipfw MAC support. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#41 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#41 (text+ko) ==== @@ -43,6 +43,7 @@ #endif #include "opt_inet6.h" #include "opt_ipsec.h" +#include "opt_mac.h" #include #include @@ -52,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -1542,8 +1544,9 @@ #ifdef MAC if (replyto != NULL) - - + mac_ipfw_tcpreflect(replyto, m); + else + mac_ipfw_tcpkeepalive(m); #endif m->m_pkthdr.len = m->m_len = sizeof(struct ip) + sizeof(struct tcphdr); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jun 1 15:34:21 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECF6216AEF3 for ; Thu, 1 Jun 2006 15:34:21 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEEE743D45 for ; Thu, 1 Jun 2006 15:34:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 13C8546D4B for ; Thu, 1 Jun 2006 11:34:18 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4A05E55698; Thu, 1 Jun 2006 15:34:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4153216AEF5; Thu, 1 Jun 2006 15:34:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF89616AEDA for ; Thu, 1 Jun 2006 15:34:14 +0000 (UTC) (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 7333643D4C for ; Thu, 1 Jun 2006 15:34:14 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k51FWl5m030317 for ; Thu, 1 Jun 2006 15:32:47 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k51FWlbx030314 for perforce@freebsd.org; Thu, 1 Jun 2006 15:32:47 GMT (envelope-from csjp@freebsd.org) Date: Thu, 1 Jun 2006 15:32:47 GMT Message-Id: <200606011532.k51FWlbx030314@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 98267 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jun 2006 15:34:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=98267 Change 98267 by csjp@csjp_xor on 2006/06/01 15:32:20 Check to see if the rootdir is the same as the current working directory. If it is, and the pathname was relative, do not separate the componenets with a '/' character. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#9 (text+ko) ==== @@ -487,10 +487,11 @@ char *retbuf, *freebuf; struct vnode *vnp; struct filedesc *fdp; - int error, vfslocked; + int cisr, error, vfslocked; fdp = td->td_proc->p_fd; bufp = path; + cisr = 0; FILEDESC_LOCK(fdp); if (*(path) == '/') { while (*(bufp) == '/') @@ -509,6 +510,7 @@ } } else { vnp = fdp->fd_cdir; /* Prepend the current dir. */ + cisr = (fdp->fd_rdir == fdp->fd_cdir); vref(vnp); bufp = path; } @@ -525,8 +527,14 @@ vn_lock(vnp, LK_EXCLUSIVE | LK_RETRY, td); error = vn_fullpath(td, vnp, &retbuf, &freebuf); if (error == 0) { - /* Copy and free buffer allocated by vn_fullpath(). */ - snprintf(cpath, MAXPATHLEN, "%s/%s", retbuf, bufp); + /* Copy and free buffer allocated by vn_fullpath(). + * If the current working directory was the same as + * the root directory, and the path was a relative + * pathname, do not separate the two components with + * the '/' character. + */ + snprintf(cpath, MAXPATHLEN, "%s%s%s", retbuf, + cisr ? "" : "/", bufp); free(freebuf, M_TEMP); } else cpath[0] = '\0'; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jun 1 20:55:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B3D616A743 for ; Thu, 1 Jun 2006 20:55:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30D4043D67 for ; Thu, 1 Jun 2006 20:55:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 37D9346BDE for ; Thu, 1 Jun 2006 16:55:45 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9D09556326; Thu, 1 Jun 2006 20:53:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 97E9616BD70; Thu, 1 Jun 2006 20:53:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5EAC16BA0C for ; Thu, 1 Jun 2006 20:52:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7668C43D4C for ; Thu, 1 Jun 2006 20:52:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k51KpTc5081287 for ; Thu, 1 Jun 2006 20:51:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k51KpTFi081284 for perforce@freebsd.org; Thu, 1 Jun 2006 20:51:29 GMT (envelope-from millert@freebsd.org) Date: Thu, 1 Jun 2006 20:51:29 GMT Message-Id: <200606012051.k51KpTFi081284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 98279 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jun 2006 20:56:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=98279 Change 98279 by millert@millert_ibook on 2006/06/01 20:51:12 Remove old version of this report. It will be added back later in a different location. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/IEEEtran.bst#2 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/api.tex#3 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/bsd.tex#3 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/chgbar.sty#2 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/framework.tex#2 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/future.tex#2 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/getting.tex#2 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/intro.tex#2 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/mach.tex#3 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/sebsd.tex#2 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/sedarwin.bib#2 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/sedarwin.tex#2 delete .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin-report/test.tex#2 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jun 1 22:15:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D488516C40B for ; Thu, 1 Jun 2006 22:15:54 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F31143D49 for ; Thu, 1 Jun 2006 22:15:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 06C0A46DA5 for ; Thu, 1 Jun 2006 18:15:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DDB5C583B3; Thu, 1 Jun 2006 22:13:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D6C5116C5BC; Thu, 1 Jun 2006 22:13:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AC1316C522 for ; Thu, 1 Jun 2006 22:13:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAC9E43D58 for ; Thu, 1 Jun 2006 22:13: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.6/8.13.6) with ESMTP id k51MCA8X093262 for ; Thu, 1 Jun 2006 22:12:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k51MCA1x093259 for perforce@freebsd.org; Thu, 1 Jun 2006 22:12:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 1 Jun 2006 22:12:10 GMT Message-Id: <200606012212.k51MCA1x093259@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 98281 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jun 2006 22:16:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=98281 Change 98281 by rwatson@rwatson_zoo on 2006/06/01 22:11:59 Modify auditfilterd to separately handle pipe files vs. audit trail files, as their buffering semantics are quite different. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#6 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#3 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#6 (text+ko) ==== @@ -25,10 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#6 $ */ #include +#include #include #include @@ -66,12 +67,14 @@ usage(void) { - fprintf(stderr, "auditfilterd [-c conffile] [-d] [-t trailfile]\n"); + fprintf(stderr, "auditfilterd [-c conffile] [-d] [-p pipefile]" + " [-t trailfile]\n"); fprintf(stderr, " -c Specify configuration file (default: %s)\n", AUDITFILTERD_CONFFILE); fprintf(stderr, " -d Debugging mode, don't daemonize\n"); - fprintf(stderr, " -t Specify audit trail file (default: %s)", - AUDITFILTERD_TRAILFILE); + fprintf(stderr, " -p Specify pipe file (default: %s)\n", + AUDITFILTERD_PIPEFILE); + fprintf(stderr, " -t Specify audit trail file (default: none)\n"); exit(-1); } @@ -147,7 +150,7 @@ * them to modules for processing. */ static void -mainloop(const char *conffile, const char *trailfile, FILE *trail_fp) +mainloop_file(const char *conffile, const char *trailfile, FILE *trail_fp) { struct timespec ts; FILE *conf_fp; @@ -184,10 +187,8 @@ * more at the right blocking and signal behavior here. */ reclen = au_read_rec(trail_fp, &buf); - if (reclen == -1) { - sleep(1); + if (reclen == -1) continue; - } if (clock_gettime(CLOCK_REALTIME, &ts) < 0) err(-1, "clock_gettime"); present_bsmrecord(&ts, buf, reclen); @@ -196,16 +197,68 @@ } } +/* + * The main loop spins pulling records out of the record source and passing + * them to modules for processing. This version of the function accepts + * discrete record input from a file descriptor, as opposed to buffered input + * from a file stream. + */ +static void +mainloop_pipe(const char *conffile, const char *pipefile, int pipe_fd) +{ + u_char record[MAX_AUDIT_RECORD_SIZE]; + struct timespec ts; + FILE *conf_fp; + int reclen; + + while (1) { + /* + * On SIGHUP, we reread the configuration file. Unlike with + * a trail file, we don't reopen the pipe, as we don't want + * to miss records which will be flushed if we do. + */ + if (reread_config) { + reread_config = 0; + warnx("rereading configuration"); + conf_fp = fopen(conffile, "r"); + if (conf_fp == NULL) + err(-1, "%s", conffile); + auditfilterd_conf(conffile, conf_fp); + fclose(conf_fp); + } + if (quit) { + warnx("quitting"); + break; + } + + /* + * For now, be relatively unrobust about incomplete records, + * but in the future will want to do better. Need to look + * more at the right blocking and signal behavior here. + */ + reclen = read(pipe_fd, record, MAX_AUDIT_RECORD_SIZE); + if (reclen < 0) + continue; + if (clock_gettime(CLOCK_REALTIME, &ts) < 0) + err(-1, "clock_gettime"); + present_bsmrecord(&ts, record, reclen); + present_tokens(&ts, record, reclen); + } +} + int main(int argc, char *argv[]) { - const char *trailfile, *conffile; + const char *pipefile, *trailfile, *conffile; FILE *trail_fp, *conf_fp; + struct stat sb; + int pipe_fd; int ch; conffile = AUDITFILTERD_CONFFILE; - trailfile = AUDITFILTERD_TRAILFILE; - while ((ch = getopt(argc, argv, "c:dt:")) != -1) { + trailfile = NULL; + pipefile = NULL; + while ((ch = getopt(argc, argv, "c:dp:t:")) != -1) { switch (ch) { case 'c': conffile = optarg; @@ -216,9 +269,17 @@ break; case 't': + if (trailfile != NULL || pipefile != NULL) + usage(); trailfile = optarg; break; + case 'p': + if (pipefile != NULL || trailfile != NULL) + usage(); + pipefile = optarg; + break; + default: usage(); } @@ -230,9 +291,26 @@ if (argc != 0) usage(); - trail_fp = fopen(trailfile, "r"); - if (trail_fp == NULL) - err(-1, "%s", trailfile); + /* + * We allow only one of a pipe or a trail to be used. If none is + * specified, we provide a default pipe path. + */ + if (pipefile == NULL && trailfile == NULL) + pipefile = AUDITFILTERD_PIPEFILE; + + if (pipefile != NULL) { + pipe_fd = open(pipefile, O_RDONLY); + if (pipe_fd < 0) + err(-1, "open:%s", pipefile); + if (fstat(pipe_fd, &sb) < 0) + err(-1, "stat: %s", pipefile); + if (!S_ISCHR(sb.st_mode)) + errx(-1, "fstat: %s not device", pipefile); + } else { + trail_fp = fopen(trailfile, "r"); + if (trail_fp == NULL) + err(-1, "%s", trailfile); + } conf_fp = fopen(conffile, "r"); if (conf_fp == NULL) @@ -253,7 +331,10 @@ signal(SIGQUIT, signal_handler); signal(SIGTERM, signal_handler); - mainloop(conffile, trailfile, trail_fp); + if (pipefile != NULL) + mainloop_pipe(conffile, pipefile, pipe_fd); + else + mainloop_file(conffile, trailfile, trail_fp); auditfilterd_conf_shutdown(); return (0); ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#3 (text+ko) ==== @@ -25,11 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#3 $ */ #define AUDITFILTERD_CONFFILE "/etc/security/audit_filter" -#define AUDITFILTERD_TRAILFILE "/dev/auditpipe" +#define AUDITFILTERD_PIPEFILE "/dev/auditpipe" /* * Limit on the number of arguments that can appear in an audit_filterd ==== //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#2 $ */ #ifndef _BSM_AUDIT_FILTER_H_ @@ -48,7 +48,7 @@ typedef int (*audit_filter_attach_t)(void **instance, int argc, char *argv[]); typedef int (*audit_filter_reinit_t)(void *instance, int argc, char *argv[]); typedef void (*audit_filter_record_t)(void *instance, struct timespec *ts, - int token_count, const tokenstr_t *tok[]); + int token_count, const tokenstr_t tok[]); typedef void (*audit_filter_bsmrecord_t)(void *instance, struct timespec *ts, void *data, u_int len); typedef void (*audit_filter_detach_t)(void *instance); From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 2 12:33:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E11C16A501 for ; Fri, 2 Jun 2006 12:33:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9DD743D79 for ; Fri, 2 Jun 2006 12:33:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C6D5346D5F for ; Fri, 2 Jun 2006 08:33:30 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5C62C725E4; Fri, 2 Jun 2006 12:31:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 543B516A436; Fri, 2 Jun 2006 12:31:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE94816A42D for ; Fri, 2 Jun 2006 12:31:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97D6A43D48 for ; Fri, 2 Jun 2006 12:31: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.6/8.13.6) with ESMTP id k52CTw5Q078271 for ; Fri, 2 Jun 2006 12:29:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k52CTwir078268 for perforce@freebsd.org; Fri, 2 Jun 2006 12:29:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 2 Jun 2006 12:29:58 GMT Message-Id: <200606021229.k52CTwir078268@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 98330 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jun 2006 12:33:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=98330 Change 98330 by rwatson@rwatson_sesame on 2006/06/02 12:29:40 Correct two variable name typos. These are not currently implemented in the audit3 implementation, so only the include file changes. Submitted by: Martin Fong Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#16 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#16 $ */ #ifndef _BSM_AUDIT_H @@ -264,11 +264,11 @@ unsigned int as_version; unsigned int as_numevent; int as_generated; - int as_nonattring; + int as_nonattrib; int as_kernel; int as_audit; int as_auditctl; - int as_enqueu; + int as_enqueue; int as_written; int as_wblocked; int as_rblocked; From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 2 12:34:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5548F16A475 for ; Fri, 2 Jun 2006 12:34:43 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0687B43D53 for ; Fri, 2 Jun 2006 12:34:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 720A146DC3 for ; Fri, 2 Jun 2006 08:34:31 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DAAFB7367B; Fri, 2 Jun 2006 12:32:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D44AA16A457; Fri, 2 Jun 2006 12:32:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEDFB16A453 for ; Fri, 2 Jun 2006 12:32:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7628C43D45 for ; Fri, 2 Jun 2006 12:32:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k52CV0hr078350 for ; Fri, 2 Jun 2006 12:31:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k52CV0cP078347 for perforce@freebsd.org; Fri, 2 Jun 2006 12:31:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 2 Jun 2006 12:31:00 GMT Message-Id: <200606021231.k52CV0cP078347@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 98331 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jun 2006 12:34:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=98331 Change 98331 by rwatson@rwatson_sesame on 2006/06/02 12:30:19 Update OpenBSM version in autoconf. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure.ac#22 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure.ac#22 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#21 $]) +AC_INIT([OpenBSM], [1.0a6], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#22 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 2 12:35:12 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F335316A47B for ; Fri, 2 Jun 2006 12:35:11 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7253543D5D for ; Fri, 2 Jun 2006 12:35:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8D8B946DC7 for ; Fri, 2 Jun 2006 08:35:02 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1709D5741D; Fri, 2 Jun 2006 12:33:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0600716A479; Fri, 2 Jun 2006 12:33:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4A1016A444 for ; Fri, 2 Jun 2006 12:33:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3ED443D6D for ; Fri, 2 Jun 2006 12:33: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.6/8.13.6) with ESMTP id k52CW2b8078499 for ; Fri, 2 Jun 2006 12:32:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k52CW2n6078496 for perforce@freebsd.org; Fri, 2 Jun 2006 12:32:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 2 Jun 2006 12:32:02 GMT Message-Id: <200606021232.k52CW2n6078496@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 98332 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jun 2006 12:35:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=98332 Change 98332 by rwatson@rwatson_sesame on 2006/06/02 12:31:13 Update comment. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#17 (text+ko) ==== @@ -30,23 +30,15 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#17 $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ -/* Various token id types */ - /* - * Values inside the comments are not documented in the BSM pages and - * have been picked up from the header files - */ - -/* - * Values marked as XXX do not have a value defined in the BSM header files + * Token type identifiers. */ - #define AUT_INVALID 0x00 #define AUT_OTHER_FILE32 0x11 #define AUT_OHEADER 0x12 From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 2 12:35:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 48A5B16A4A3 for ; Fri, 2 Jun 2006 12:35:29 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9282443D5D for ; Fri, 2 Jun 2006 12:35:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6C81946DC7 for ; Fri, 2 Jun 2006 08:35:17 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AFB735C248; Fri, 2 Jun 2006 12:34:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AA48616A4D2; Fri, 2 Jun 2006 12:34:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88BE816A47C for ; Fri, 2 Jun 2006 12:34:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1ACDB43D6B for ; Fri, 2 Jun 2006 12:34:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k52CX44O078540 for ; Fri, 2 Jun 2006 12:33:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k52CX4Ck078537 for perforce@freebsd.org; Fri, 2 Jun 2006 12:33:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 2 Jun 2006 12:33:04 GMT Message-Id: <200606021233.k52CX4Ck078537@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 98333 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jun 2006 12:35:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=98333 Change 98333 by rwatson@rwatson_sesame on 2006/06/02 12:33:03 Regenerate. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#20 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#20 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#20 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#22 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a6. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a5' -PACKAGE_STRING='OpenBSM 1.0a5' +PACKAGE_VERSION='1.0a6' +PACKAGE_STRING='OpenBSM 1.0a6' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a5 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a5:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a6:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a5 +OpenBSM configure 1.0a6 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a5, which was +It was created by OpenBSM $as_me 1.0a6, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a5 + VERSION=1.0a6 cat >>confdefs.h <<_ACEOF @@ -23477,7 +23477,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a5, which was +This file was extended by OpenBSM $as_me 1.0a6, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23540,7 +23540,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a5 +OpenBSM config.status 1.0a6 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 2 13:43:14 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A49F16A5CA for ; Fri, 2 Jun 2006 13:43:14 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AA0043D45 for ; Fri, 2 Jun 2006 13:43:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 94D5046DB5 for ; Fri, 2 Jun 2006 09:43:10 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B5C9D57AAF; Fri, 2 Jun 2006 13:43:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A46C716A42D; Fri, 2 Jun 2006 13:43:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 12EE416A467 for ; Fri, 2 Jun 2006 13:43:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB3A543D45 for ; Fri, 2 Jun 2006 13:43:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k52DfXbX090651 for ; Fri, 2 Jun 2006 13:41:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k52DfWui090646 for perforce@freebsd.org; Fri, 2 Jun 2006 13:41:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 2 Jun 2006 13:41:32 GMT Message-Id: <200606021341.k52DfWui090646@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 98338 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jun 2006 13:43:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=98338 Change 98338 by rwatson@rwatson_fledge on 2006/06/02 13:40:55 Fix syntax errors in recent sedarwin page commit -- allow web page to build and install again. Affected files ... .. //depot/projects/trustedbsd/www/sedarwin.page#5 edit Differences ... ==== //depot/projects/trustedbsd/www/sedarwin.page#5 (text+ko) ==== @@ -36,7 +36,7 @@ - $P4: //depot/projects/trustedbsd/www/sedarwin.page#4 $ + $P4: //depot/projects/trustedbsd/www/sedarwin.page#5 $ @@ -62,7 +62,7 @@ a variety of Apple PowerPC hardware. The SEDarwin project has recently moved to it's own website at - www.sedarwin.org. More + www.sedarwin.org. More information and current versions of SEDarwin can be found there.

    @@ -76,7 +76,7 @@ to the Tiger platform soon.

    The DSEP sources have also recently moved to - sedarwin.org

    From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 2 13:49:17 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 21E4F16A513 for ; Fri, 2 Jun 2006 13:49:17 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7595B43D48 for ; Fri, 2 Jun 2006 13:49:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7C43046DB9 for ; Fri, 2 Jun 2006 09:49:15 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 389CD565C4; Fri, 2 Jun 2006 13:49:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 327F216A478; Fri, 2 Jun 2006 13:49:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EA0B16A45D for ; Fri, 2 Jun 2006 13:49:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C866643D48 for ; Fri, 2 Jun 2006 13:49:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k52Dlgge091012 for ; Fri, 2 Jun 2006 13:47:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k52DlfDR091009 for perforce@freebsd.org; Fri, 2 Jun 2006 13:47:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 2 Jun 2006 13:47:41 GMT Message-Id: <200606021347.k52DlfDR091009@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 98340 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jun 2006 13:49:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=98340 Change 98340 by rwatson@rwatson_fledge on 2006/06/02 13:47:18 Add OpenBSM 1.0a6 announcement. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#7 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#7 (text+ko) ==== @@ -1,5 +1,5 @@ - + News - $P4: //depot/projects/trustedbsd/www/news.page#5 $ + $P4: //depot/projects/trustedbsd/www/news.page#6 $ From owner-trustedbsd-cvs@FreeBSD.ORG Sun Jun 11 22:10:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7B8116A41A for ; Sun, 11 Jun 2006 22:10:29 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE65443D46 for ; Sun, 11 Jun 2006 22:10:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 11E0046C3D for ; Sun, 11 Jun 2006 18:10:20 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7E245555C1; Sun, 11 Jun 2006 22:10:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 75E9816A46F; Sun, 11 Jun 2006 22:10:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32BFD16A41B for ; Sun, 11 Jun 2006 22:10:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 397C143D45 for ; Sun, 11 Jun 2006 22:09:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BM7juR071411 for ; Sun, 11 Jun 2006 22:07:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BM7iMs071408 for perforce@freebsd.org; Sun, 11 Jun 2006 22:07:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 11 Jun 2006 22:07:44 GMT Message-Id: <200606112207.k5BM7iMs071408@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 99016 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jun 2006 22:10:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=99016 Change 99016 by rwatson@rwatson_fledge on 2006/06/11 22:06:49 Engage in some advertising activities on the TrustedBSD.org page to help pay for the cost of hardware, bandwidth, etc. Affected files ... .. //depot/projects/trustedbsd/www/sidebar.xml#6 edit Differences ... ==== //depot/projects/trustedbsd/www/sidebar.xml#6 (text+ko) ==== @@ -15,6 +15,25 @@
  • SEDarwin
  • UFS2
+



+
+ + +
@@ -32,6 +51,63 @@
  • SEDarwin
  • UFS2
    • +



    +
    + + + + +
    +
    + +
    +



    +
    + + +
    @@ -39,6 +115,57 @@
  • Documentation
  • Implementation Papers
    • +



    +
    + + + + + + +
    @@ -46,5 +173,63 @@
  • TrustedBSD Mailing Lists
  • POSIX.1e Mailing Lists
    • +



    +
    + + +
    +
    + +
    +



    +
    + + + + +
    + From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jun 12 20:38:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83C4416A41A for ; Mon, 12 Jun 2006 20:38:07 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDDD643D46 for ; Mon, 12 Jun 2006 20:38:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 058FA46CDE for ; Mon, 12 Jun 2006 16:38:05 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7F5F5726C0; Mon, 12 Jun 2006 20:30:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2760616A49E; Mon, 12 Jun 2006 20:30:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7A4E16A41A for ; Mon, 12 Jun 2006 20:30:04 +0000 (UTC) (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 764A043D66 for ; Mon, 12 Jun 2006 20:30:01 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CKRji6007509 for ; Mon, 12 Jun 2006 20:27:45 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CKRjLa007506 for perforce@freebsd.org; Mon, 12 Jun 2006 20:27:45 GMT (envelope-from wsalamon@computer.org) Date: Mon, 12 Jun 2006 20:27:45 GMT Message-Id: <200606122027.k5CKRjLa007506@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 99077 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jun 2006 20:38:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=99077 Change 99077 by wsalamon@vh1 on 2006/06/12 20:27:30 Make the size of the subject32_ex and process32_ex tokens depend on whether we have an IPv6 address, or not. Write the term ID as 4 or 16 bytes depending on address type. This change matches the recent OpenBSM change, and what Solaris does. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#17 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#16 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#17 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.3 2006/06/05 13:13:02 rwatson Exp $ */ @@ -609,7 +609,7 @@ * terminal ID * port ID 4 bytes/8 bytes (32-bit/64-bit value) * address type-len 4 bytes - * machine address 16 bytes + * machine address 4/16 bytes */ token_t * au_to_process32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, @@ -618,7 +618,12 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); + if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * + sizeof(u_int32_t)); + else + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); ADD_U_CHAR(dptr, AUT_PROCESS32_EX); ADD_U_INT32(dptr, auid); @@ -631,10 +636,11 @@ ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); ADD_U_INT32(dptr, tid->at_addr[0]); - ADD_U_INT32(dptr, tid->at_addr[1]); - ADD_U_INT32(dptr, tid->at_addr[2]); - ADD_U_INT32(dptr, tid->at_addr[3]); - + if (tid->at_type == AU_IPv6) { + ADD_U_INT32(dptr, tid->at_addr[1]); + ADD_U_INT32(dptr, tid->at_addr[2]); + ADD_U_INT32(dptr, tid->at_addr[3]); + } return (t); } @@ -938,7 +944,7 @@ * terminal ID * port ID 4 bytes/8 bytes (32-bit/64-bit value) * address type/length 4 bytes - * machine address 16 bytes + * machine address 4/16 bytes */ token_t * au_to_subject32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, @@ -947,7 +953,12 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); + if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * + sizeof(u_int32_t)); + else + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); ADD_U_CHAR(dptr, AUT_SUBJECT32_EX); ADD_U_INT32(dptr, auid); @@ -960,10 +971,11 @@ ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); ADD_U_INT32(dptr, tid->at_addr[0]); - ADD_U_INT32(dptr, tid->at_addr[1]); - ADD_U_INT32(dptr, tid->at_addr[2]); - ADD_U_INT32(dptr, tid->at_addr[3]); - + if (tid->at_type == AU_IPv6) { + ADD_U_INT32(dptr, tid->at_addr[1]); + ADD_U_INT32(dptr, tid->at_addr[2]); + ADD_U_INT32(dptr, tid->at_addr[3]); + } return (t); } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jun 13 20:29:41 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30A1C16A476 for ; Tue, 13 Jun 2006 20:29:41 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D30E43D76 for ; Tue, 13 Jun 2006 20:29:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9EE0E46C32 for ; Tue, 13 Jun 2006 16:29:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5E14B55689; Tue, 13 Jun 2006 20:27:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5781016A476; Tue, 13 Jun 2006 20:27:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 10F3616A41A for ; Tue, 13 Jun 2006 20:27:07 +0000 (UTC) (envelope-from Patrick.LeBlanc@sparta.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B512E43D46 for ; Tue, 13 Jun 2006 20:27:06 +0000 (GMT) (envelope-from Patrick.LeBlanc@sparta.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DKOkr8083105 for ; Tue, 13 Jun 2006 20:24:46 GMT (envelope-from Patrick.LeBlanc@sparta.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DKOjst083102 for perforce@freebsd.org; Tue, 13 Jun 2006 20:24:45 GMT (envelope-from Patrick.LeBlanc@sparta.com) Date: Tue, 13 Jun 2006 20:24:45 GMT Message-Id: <200606132024.k5DKOjst083102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to Patrick.LeBlanc@sparta.com using -f From: pleblanc To: Perforce Change Reviews Cc: Subject: PERFORCE change 99162 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jun 2006 20:29:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=99162 Change 99162 by pleblanc@pleblanc_p4 on 2006/06/13 20:24:38 - Re-automate the installation of the sebsd policy sources. - Make actual installation paths agree with the installation doc. Affected files ... .. //depot/projects/trustedbsd/sebsd/Makefile#18 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#25 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/Makefile#18 (text+ko) ==== @@ -310,9 +310,19 @@ sebsd_bootstrap: .if exists(${.CURDIR}/contrib/sebsd) @echo "Installing SEBSD policy" + +.if !exists(${DESTDIR}/etc/security/sebsd/targeted/policy) + (cd ${.CURDIR}/contrib/sebsd/refpolicy; gmake install-src) +.else + @echo "Existing SEBSD targeted policy sources found." + @echo "Will not reinstall them. To reinstall them by hand" + @echo "do \"cd contrib/sebsd/refpolicy && gmake install-src\"." +.endif + .if exists(${DESTDIR}/usr/bin/checkpolicy) .if !exists(${DESTDIR}/etc/security/sebsd/targeted/policy/policy.20) + mkdir -p ${DESTDIR}/etc/security/sebsd/targeted/policy (${DESTDIR}/usr/bin/checkpolicy -o ${DESTDIR}/etc/security/sebsd/targeted/policy/policy.20 ${.CURDIR}/contrib/sebsd/support/policy.conf) .else @echo "Binary policy file found. Not overwriting." ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#25 (text+ko) ==== @@ -33,7 +33,7 @@ .endif POLICYVER := policy.$(POLICYVERTMP) POLICYBIN = policy.bin -INSTALLDIR = $(DESTDIR)/etc/security/sebsd +INSTALLDIR = $(DESTDIR)/etc/security/sebsd/targeted POLICYPATH = $(INSTALLDIR)/policy SRCPATH = $(INSTALLDIR)/src CONTEXTPATH = $(INSTALLDIR)/contexts @@ -138,10 +138,10 @@ m4 $(M4PARAM) -Imacros -s $(POLICYFILES) > $@.tmp mv $@.tmp $@ -install-src: /etc/security/sebsd - rm -rf $(INSTALLDIR)/policy.old - -mv $(INSTALLDIR)/policy $(INSTALLDIR)/policy.old - cd ..; tar cf - policy | (cd $(INSTALLDIR); tar xf -) +install-src: $(SRCPATH) + rm -rf $(SRCPATH)/policy.old + -mv $(SRCPATH)/policy $(SRCPATH)/policy.old + cd ..; tar cf - policy | (cd $(SRCPATH); tar xf -) tmp/program_used_flags.te: $(wildcard domains/program/*.te) domains/program mkdir -p tmp From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jun 15 00:17:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3802B16A549 for ; Thu, 15 Jun 2006 00:17:18 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A281743D46 for ; Thu, 15 Jun 2006 00:17:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E321C46CA3 for ; Wed, 14 Jun 2006 20:17:14 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 858EB558F5; Thu, 15 Jun 2006 00:17:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F8FF16A47A; Thu, 15 Jun 2006 00:17:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C51F16A474 for ; Thu, 15 Jun 2006 00:17:11 +0000 (UTC) (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 1073243D49 for ; Thu, 15 Jun 2006 00:17:11 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5F0HACr060684 for ; Thu, 15 Jun 2006 00:17:10 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5F0HA0D060681 for perforce@freebsd.org; Thu, 15 Jun 2006 00:17:10 GMT (envelope-from wsalamon@computer.org) Date: Thu, 15 Jun 2006 00:17:10 GMT Message-Id: <200606150017.k5F0HA0D060681@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 99267 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jun 2006 00:17:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=99267 Change 99267 by wsalamon@gretsch on 2006/06/15 00:16:51 Some updates for system calls already audited. Affected files ... .. //depot/projects/trustedbsd/audit3/notes/syscall_audit.tsv#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/notes/syscall_audit.tsv#5 (text+ko) ==== @@ -50,7 +50,7 @@ SYS_accept 30 Y N s, addr, fd; addrlen? SYS_getpeername 31 ? N if audited: s, name; namelen? SYS_getsockname 32 ? N if audited: s, name; namelen? -SYS_access 33 Y N path, mode +SYS_access 33 Y Y path, attr SYS_chflags 34 Y Y path, flags, attr SYS_fchflags 35 Y Y fd, attr, fflags SYS_sync 36 Y N @@ -74,7 +74,7 @@ SYS_ioctl 54 Y N d, request, argp? SYS_reboot 55 Y N how SYS_revoke 56 Y N path -SYS_symlink 57 Y N name1, name2 +SYS_symlink 57 Y Y path, attr, link SYS_readlink 58 Y N path, buf, bufsiz SYS_execve 59 Y N path, argv, envp? SYS_umask 60 Y N numask @@ -137,7 +137,7 @@ SYS_rename 128 Y N SYS_flock 131 Y N fd, operation, addr -SYS_mkfifo 132 Y N +SYS_mkfifo 132 Y Y path, attr, mode SYS_sendto 133 Y N SYS_shutdown 134 Y N SYS_socketpair 135 Y N @@ -148,7 +148,7 @@ SYS_adjtime 140 Y N SYS_setsid 147 Y N -SYS_quotactl 148 Y N +SYS_quotactl 148 Y Y path, attr, cmd, uid SYS_nfssvc 155 Y N @@ -171,7 +171,7 @@ SYS_stat 188 Y Y path, attr; sb? SYS_fstat 189 Y Y fd, attr; sb? SYS_lstat 190 Y Y path, attr; sb? -SYS_pathconf 191 Y N +SYS_pathconf 191 Y Y SYS_fpathconf 192 Y N SYS_getrlimit 194 N N SYS_setrlimit 195 Y N @@ -179,8 +179,8 @@ SYS_mmap 197 Y N addr, len, fd; prot?, flags? (see BSM) SYS___syscall 198 ? N the resulting syscall would still be audited SYS_lseek 199 N N Because read() is not audited, lseek isn't -SYS_truncate 200 Y N -SYS_ftruncate 201 Y N +SYS_truncate 200 Y Y path, attr +SYS_ftruncate 201 Y Y path, attr SYS___sysctl 202 Y N SYS_mlock 203 Y N SYS_munlock 204 Y N @@ -286,7 +286,7 @@ SYS_extattr_delete_fd 373 Y N SYS___setugid 374 ? N SYS_nfsclnt 375 ? N -SYS_eaccess 376 ? N +SYS_eaccess 376 Y Y path, attr SYS_nmount 378 Y Y iovec strings audited SYS_kse_exit 379 ? N SYS_kse_wakeup 380 ? N From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jun 15 00:21:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B0A816A4A5 for ; Thu, 15 Jun 2006 00:21:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D7E843D45 for ; Thu, 15 Jun 2006 00:21:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F19A746C41 for ; Wed, 14 Jun 2006 20:21:17 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2C61F5652B; Thu, 15 Jun 2006 00:21:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2621E16A4A0; Thu, 15 Jun 2006 00:21:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE7D116A494 for ; Thu, 15 Jun 2006 00:21:16 +0000 (UTC) (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 A384443D58 for ; Thu, 15 Jun 2006 00:21:16 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5F0LG3w061095 for ; Thu, 15 Jun 2006 00:21:16 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5F0LGMO061092 for perforce@freebsd.org; Thu, 15 Jun 2006 00:21:16 GMT (envelope-from wsalamon@computer.org) Date: Thu, 15 Jun 2006 00:21:16 GMT Message-Id: <200606150021.k5F0LGMO061092@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 99268 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jun 2006 00:21:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=99268 Change 99268 by wsalamon@gretsch on 2006/06/15 00:20:22 Use "ufs" for file system type. Also add tests for the nmount(2) system call. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/filesystem/tfilesys.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/filesystem/tfilesys.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include /* * Test the auditing of some of the filesystem-related system calls. @@ -45,12 +46,13 @@ int ret; int temp_fd; char tempname[32]; - struct statfs stat; + struct statfs sb; u_long count; u_long basep; u_long newstate; u_long nmatches; char buf[128]; + struct iovec iov[16]; AUT_INIT(); @@ -61,39 +63,92 @@ exit (-1); } /* Generate a success AUE_GETFSSTAT audit record */ - if (getfsstat(&stat, 1, MNT_NOWAIT)) + if (getfsstat(&sb, 1, MNT_NOWAIT) != 0) AUT_PERROR("getfsstat()"); aut_assert(AUE_GETFSSTAT); /* Generate a success AUE_STATFS audit record */ - if (statfs(tempname, &stat)) + if (statfs(tempname, &sb) != 0) AUT_PERROR("statfs()"); aut_assert(AUE_STATFS); /* Generate a success AUE_FSTATFS audit record */ - if (fstatfs(temp_fd, &stat)) + if (fstatfs(temp_fd, &sb) != 0) AUT_PERROR("fstatfs()"); aut_assert(AUE_FSTATFS); /* Generate a failure AUE_STATFS audit record */ - if (statfs("ANonExiSteNtFileName", &stat)) + if (statfs("ANonExiSteNtFileName", &sb) != 0) AUT_PERROR("statfs()"); /* Generate a failure AUE_FSTATFS audit record */ - if (fstatfs(1027309, &stat)) + if (fstatfs(1027309, &sb) != 0) AUT_PERROR("fstatfs()"); close(temp_fd); unlink(tempname); /* Generate an AUE_MOUNT audit record (but fail) */ - if (mount("hfs", "/tmp", MNT_UPDATE, NULL)) - AUT_PERROR("mount()"); + if (mount("ufs", "/", MNT_RDONLY, &sb) != 0) + AUT_PERROR("mount(/)"); + aut_assert(AUE_MOUNT); + + /* Generate an AUE_MOUNT audit record (but fail) */ + if (mount("cd9660", "/cdrom", MNT_RDONLY, NULL) != 0) + AUT_PERROR("mount(/cdrom)"); aut_assert(AUE_MOUNT); /* Generate an AUE_UMOUNT audit record (but fail) */ - if (unmount("/tmp", 0)) - AUT_PERROR("unmount()"); + if (unmount("/cdrom", 0) != 0) + AUT_PERROR("unmount(/cdrom)"); + aut_assert(AUE_UMOUNT); + + /* Generate an AUE_NMOUNT audit record (but fail) */ +#define FSTYPE "fstype" +#define CD "cd9660" +#define FSPATH "fspath" +#define PATH "/cdrom" +#define FSJUNK "fsjunk" +#define JUNK "/junk" + iov[0].iov_base = malloc(strlen(FSTYPE)); + iov[0].iov_base = FSTYPE; + iov[0].iov_len = strlen(FSTYPE); + iov[1].iov_base = malloc(strlen(CD)); + iov[1].iov_base = CD; + iov[1].iov_len = strlen(CD); + iov[2].iov_base = malloc(strlen(FSPATH)); + iov[2].iov_base = FSPATH; + iov[2].iov_len = strlen(FSPATH); + iov[3].iov_base = malloc(strlen(PATH)); + iov[3].iov_base = PATH; + iov[3].iov_len = strlen(PATH); + iov[4].iov_base = malloc(strlen(FSJUNK)); + iov[4].iov_base = FSJUNK; + iov[4].iov_len = strlen(FSJUNK); + iov[5].iov_base = malloc(strlen(JUNK)); + iov[5].iov_base = JUNK; + iov[5].iov_len = strlen(JUNK); + iov[4].iov_base = malloc(sizeof(sb)); + iov[4].iov_base = &sb; + iov[4].iov_len = sizeof(&sb); + iov[5].iov_base = malloc(sizeof(nmatches)); + iov[5].iov_base = &nmatches; + iov[5].iov_len = sizeof(nmatches); + iov[6].iov_base = malloc(strlen(FSJUNK)); + iov[6].iov_base = FSJUNK; + iov[6].iov_len = strlen(FSJUNK); + iov[7].iov_base = malloc(strlen(JUNK)); + iov[7].iov_base = JUNK; + iov[7].iov_len = strlen(JUNK); + if (nmount(&iov[0], 8, MNT_RDONLY) != 0) + AUT_PERROR("nmount()"); + aut_assert(AUE_NMOUNT); + + /* Generate another failure AUE_UMOUNT record; unmounting root fails * + * differently. + */ + if (unmount("/", 0)) + AUT_PERROR("unmount(/)"); aut_assert(AUE_UMOUNT); temp_fd = open("/", O_RDONLY, 0); From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 16 13:08:16 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4307316A53E for ; Fri, 16 Jun 2006 13:08:16 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAA5743D46 for ; Fri, 16 Jun 2006 13:08:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1EB9746C78 for ; Fri, 16 Jun 2006 09:08:15 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5304A55754; Fri, 16 Jun 2006 13:08:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 598B016A47D; Fri, 16 Jun 2006 13:08:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 34D6916A47B for ; Fri, 16 Jun 2006 13:08:13 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED72043D46 for ; Fri, 16 Jun 2006 13:08:12 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5GD8CKf094100 for ; Fri, 16 Jun 2006 13:08:12 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5GD8COZ094097 for perforce@freebsd.org; Fri, 16 Jun 2006 13:08:12 GMT (envelope-from brueffer@freebsd.org) Date: Fri, 16 Jun 2006 13:08:12 GMT Message-Id: <200606161308.k5GD8COZ094097@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 99354 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jun 2006 13:08:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=99354 Change 99354 by brueffer@brueffer_serenity on 2006/06/16 13:07:22 Typo fixed. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#9 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#9 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 @@ -218,7 +218,7 @@ .It Li "Protocol" Ta "1 byte" Ta "IP protocol number" .It Li "Checksum" Ta "2 bytes" Ta "IP header checksum, network byte order" .It Li "Source Address" Ta "4 bytes" Ta "IPv4 source address" -.It Li "Desintation Address" Ta "4 bytes" Ta "IPv4 destination address" +.It Li "Destination Address" Ta "4 bytes" Ta "IPv4 destination address" .El .Ss Expanded ip Token The From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 16 20:22:26 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A9DF716A541 for ; Fri, 16 Jun 2006 20:22:26 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EE1743D46 for ; Fri, 16 Jun 2006 20:22:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 90F7946C0E for ; Fri, 16 Jun 2006 16:22:25 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id F3BEB55C81; Fri, 16 Jun 2006 20:22:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F3C9616A47B; Fri, 16 Jun 2006 20:22:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D12F616A479 for ; Fri, 16 Jun 2006 20:22:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9094943D49 for ; Fri, 16 Jun 2006 20:22:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5GKMOwm033185 for ; Fri, 16 Jun 2006 20:22:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5GKMOsM033182 for perforce@freebsd.org; Fri, 16 Jun 2006 20:22:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 16 Jun 2006 20:22:24 GMT Message-Id: <200606162022.k5GKMOsM033182@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 99366 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jun 2006 20:22:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=99366 Change 99366 by rwatson@rwatson_peppercorn on 2006/06/16 20:21:24 Forward declare struct timeval, which appears in the audit token generation API. On some systems, this isn't implicitly defined due to prior includes (such as FreeBSD 4.x). Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#18 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#18 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -220,6 +220,7 @@ struct sockaddr_in; struct sockaddr_in6; struct sockaddr_un; +struct timeval; #if defined(_KERNEL) || defined(KERNEL) struct vnode_au_info; #endif From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 16 20:25:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DC4716A47E for ; Fri, 16 Jun 2006 20:25:44 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B2A243D46 for ; Fri, 16 Jun 2006 20:25:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C7E2446C0E for ; Fri, 16 Jun 2006 16:25:37 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2302758695; Fri, 16 Jun 2006 20:25:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2235F16A47A; Fri, 16 Jun 2006 20:25:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA65916A479 for ; Fri, 16 Jun 2006 20:25:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59AA343D58 for ; Fri, 16 Jun 2006 20:25:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5GKPS16033918 for ; Fri, 16 Jun 2006 20:25:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5GKPSHe033915 for perforce@freebsd.org; Fri, 16 Jun 2006 20:25:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 16 Jun 2006 20:25:28 GMT Message-Id: <200606162025.k5GKPSHe033915@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 99367 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jun 2006 20:25:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=99367 Change 99367 by rwatson@rwatson_peppercorn on 2006/06/16 20:24:42 Nested include sys/time.h since it is required, rathe than forward declare -- the arguments aren't struct timeval *, they're plain struct timeval. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#19 (text+ko) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#19 $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ +#include /* struct timeval */ + /* * Token type identifiers. */ @@ -220,7 +222,6 @@ struct sockaddr_in; struct sockaddr_in6; struct sockaddr_un; -struct timeval; #if defined(_KERNEL) || defined(KERNEL) struct vnode_au_info; #endif From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 16 20:30:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D6E316A492 for ; Fri, 16 Jun 2006 20:30:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E66743D4C for ; Fri, 16 Jun 2006 20:30:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 81B5E46BD5 for ; Fri, 16 Jun 2006 16:30:37 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B89A36453A; Fri, 16 Jun 2006 20:30:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B5B7116A494; Fri, 16 Jun 2006 20:30:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8C1B316A484 for ; Fri, 16 Jun 2006 20:30:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A31D43D48 for ; Fri, 16 Jun 2006 20:30: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.6/8.13.6) with ESMTP id k5GKUaUQ035541 for ; Fri, 16 Jun 2006 20:30:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5GKUZaq035538 for perforce@freebsd.org; Fri, 16 Jun 2006 20:30:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 16 Jun 2006 20:30:35 GMT Message-Id: <200606162030.k5GKUZaq035538@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 99369 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jun 2006 20:30:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=99369 Change 99369 by rwatson@rwatson_pemaquid on 2006/06/16 20:30:33 Use inttypes.h, this is more universally available than stdint.h (i.e., FreeBSD 4.x). Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#21 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#21 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#20 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#21 $ */ #ifndef _LIBBSM_H_ @@ -43,7 +43,7 @@ #include #include -#include /* Required for audit.h. */ +#include /* Required for audit.h. */ #include /* Required for clock_t on Linux. */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#12 $ */ /* @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jun 17 14:20:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A5F5E16A479 for ; Sat, 17 Jun 2006 14:20:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0233843D46 for ; Sat, 17 Jun 2006 14:20:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 13EB746C13 for ; Sat, 17 Jun 2006 10:20:34 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id F04345548C; Sat, 17 Jun 2006 14:20:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E654A16A47E; Sat, 17 Jun 2006 14:20:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C265316A479 for ; Sat, 17 Jun 2006 14:20:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D39F43D46 for ; Sat, 17 Jun 2006 14:20:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HEKWSd052959 for ; Sat, 17 Jun 2006 14:20:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HEKVTB052956 for perforce@freebsd.org; Sat, 17 Jun 2006 14:20:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jun 2006 14:20:31 GMT Message-Id: <200606171420.k5HEKVTB052956@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 99425 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Jun 2006 14:20:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=99425 Change 99425 by rwatson@rwatson_peppercorn on 2006/06/17 14:20:29 Update HISTORY for FreeBSD 4.x build tweaks. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#14 (text+ko) ==== @@ -3,6 +3,9 @@ - Adopted Solaris-compatible format for subject32_ex and subject64_ex tokens, which previously did not correctly implement variable length address storage. +- Prefer inttypes.h to stdint.h; enhance queue.h detection to test for + TAILQ_FOREACH_SAFE(), which is present in recent BSD queue.h's, but not + older ones. OpenBSM now builds on some FreeBSD 4.x version. OpenBSM 1.0 alpha 6 @@ -171,4 +174,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#13 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#14 $ From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jun 17 19:24:17 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5AE6916A51E for ; Sat, 17 Jun 2006 19:24:17 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8FF643D4C for ; Sat, 17 Jun 2006 19:24:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2222546C05 for ; Sat, 17 Jun 2006 15:24:09 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 544D35BAB9; Sat, 17 Jun 2006 19:24:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CBBC16A47A; Sat, 17 Jun 2006 19:24:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1333E16A47B for ; Sat, 17 Jun 2006 19:24:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 938FA43D6B for ; Sat, 17 Jun 2006 19:24:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HJO4tr095257 for ; Sat, 17 Jun 2006 19:24:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HJO47P095254 for perforce@freebsd.org; Sat, 17 Jun 2006 19:24:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jun 2006 19:24:04 GMT Message-Id: <200606171924.k5HJO47P095254@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 99450 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Jun 2006 19:24:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=99450 Change 99450 by rwatson@rwatson_sesame on 2006/06/17 19:23:58 Test for LIST_FIRST and TAILQ_FOREACH_SAFE in queue.h; FreeBSD 4.x offers the former but not latter, so we must use the compat queue.h on FreeBSD 4.x. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#21 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#21 (xtext) ==== @@ -22936,8 +22936,8 @@ # sys/queue.h exists on most systems, but its capabilities vary a great deal. -# test for LIST_FIRST, which appears to not exist in all of them, and is -# necessary for OpenBSM. +# test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in +# all of them, and are necessary for OpenBSM. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22951,13 +22951,13 @@ main () { - struct foo { - LIST_ENTRY(foo) foo_entries; - }; - LIST_HEAD(, foo) foo_list; - struct foo *foo; - foo = LIST_FIRST(&foo_list); + #ifndef LIST_FIRST + #error LIST_FIRST missing + #endif + #ifndef TAILQ_FOREACH_SAFE + #error TAILQ_FOREACH_SAFE + #endif ; return 0; ==== //depot/projects/trustedbsd/openbsm/configure.ac#23 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a6], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#22 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#23 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -59,18 +59,18 @@ AC_CHECK_FUNCS([bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) # sys/queue.h exists on most systems, but its capabilities vary a great deal. -# test for LIST_FIRST, which appears to not exist in all of them, and is -# necessary for OpenBSM. +# test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in +# all of them, and are necessary for OpenBSM. AC_TRY_LINK([ #include ], [ - struct foo { - LIST_ENTRY(foo) foo_entries; - }; - LIST_HEAD(, foo) foo_list; - struct foo *foo; - foo = LIST_FIRST(&foo_list); + #ifndef LIST_FIRST + #error LIST_FIRST missing + #endif + #ifndef TAILQ_FOREACH_SAFE + #error TAILQ_FOREACH_SAFE + #endif ], [ AC_DEFINE(HAVE_FULL_QUEUE_H,, Define if queue.h includes LIST_FIRST) ]) From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jun 17 19:40:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B56BC16A47C for ; Sat, 17 Jun 2006 19:40:29 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B4D243D46 for ; Sat, 17 Jun 2006 19:40:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D746C46B0F for ; Sat, 17 Jun 2006 15:40:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B521A55A25; Sat, 17 Jun 2006 19:40:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AF48E16A47E; Sat, 17 Jun 2006 19:40:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E22216A47B for ; Sat, 17 Jun 2006 19:40:25 +0000 (UTC) (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 5A6A143D4C for ; Sat, 17 Jun 2006 19:40:25 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HJePVe096082 for ; Sat, 17 Jun 2006 19:40:25 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HJeP3K096079 for perforce@freebsd.org; Sat, 17 Jun 2006 19:40:25 GMT (envelope-from wsalamon@computer.org) Date: Sat, 17 Jun 2006 19:40:25 GMT Message-Id: <200606171940.k5HJeP3K096079@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 99452 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Jun 2006 19:40:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=99452 Change 99452 by wsalamon@vh1 on 2006/06/17 19:39:30 Add the remaining ACL events, and the EXTATTR events. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#38 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#38 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#38 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -383,7 +383,24 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_SYSARCH 406 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ +#define AUE_SYSARCH 410 /* FreeBSD. */ +#define AUE_EXTATTRCTL 411 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jun 17 19:46:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1E5016A47D for ; Sat, 17 Jun 2006 19:46:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3793D43D45 for ; Sat, 17 Jun 2006 19:46:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1F8B446C9A for ; Sat, 17 Jun 2006 15:46:35 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 664FE55425; Sat, 17 Jun 2006 19:46:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6063316A47C; Sat, 17 Jun 2006 19:46:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B25116A474 for ; Sat, 17 Jun 2006 19:46:34 +0000 (UTC) (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 0781F43D45 for ; Sat, 17 Jun 2006 19:46:34 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HJkX1J096391 for ; Sat, 17 Jun 2006 19:46:33 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HJkXr3096388 for perforce@freebsd.org; Sat, 17 Jun 2006 19:46:33 GMT (envelope-from wsalamon@computer.org) Date: Sat, 17 Jun 2006 19:46:33 GMT Message-Id: <200606171946.k5HJkXr3096388@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 99453 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Jun 2006 19:46:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=99453 Change 99453 by wsalamon@vh1 on 2006/06/17 19:45:45 Integrate the new audit events from OpenBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#21 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#21 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#20 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#21 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -383,7 +383,24 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_SYSARCH 406 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ +#define AUE_SYSARCH 410 /* FreeBSD. */ +#define AUE_EXTATTRCTL 411 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jun 19 20:41:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC20E16A4A0 for ; Mon, 19 Jun 2006 20:41:29 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA6E243D93 for ; Mon, 19 Jun 2006 20:41:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9A31846BD7 for ; Mon, 19 Jun 2006 16:41:08 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 03B7D5CEE9; Mon, 19 Jun 2006 20:40:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CF40316A511; Mon, 19 Jun 2006 20:40:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BE3A16A507 for ; Mon, 19 Jun 2006 20:40:24 +0000 (UTC) (envelope-from Patrick.LeBlanc@sparta.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 685EA43DB0 for ; Mon, 19 Jun 2006 20:39:58 +0000 (GMT) (envelope-from Patrick.LeBlanc@sparta.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5JKdobR006857 for ; Mon, 19 Jun 2006 20:39:50 GMT (envelope-from Patrick.LeBlanc@sparta.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5JKdoem006854 for perforce@freebsd.org; Mon, 19 Jun 2006 20:39:50 GMT (envelope-from Patrick.LeBlanc@sparta.com) Date: Mon, 19 Jun 2006 20:39:50 GMT Message-Id: <200606192039.k5JKdoem006854@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to Patrick.LeBlanc@sparta.com using -f From: pleblanc To: Perforce Change Reviews Cc: Subject: PERFORCE change 99637 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jun 2006 20:41:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=99637 Change 99637 by pleblanc@pleblanc_p4 on 2006/06/19 20:39:16 Fix a check for installed SEBSD policy sources. Affected files ... .. //depot/projects/trustedbsd/sebsd/Makefile#19 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/Makefile#19 (text+ko) ==== @@ -311,7 +311,7 @@ .if exists(${.CURDIR}/contrib/sebsd) @echo "Installing SEBSD policy" -.if !exists(${DESTDIR}/etc/security/sebsd/targeted/policy) +.if !exists(${DESTDIR}/etc/security/sebsd/targeted/src/policy) (cd ${.CURDIR}/contrib/sebsd/refpolicy; gmake install-src) .else @echo "Existing SEBSD targeted policy sources found." From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jun 21 01:11:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A4E4616A504 for ; Wed, 21 Jun 2006 01:11:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E91443D78 for ; Wed, 21 Jun 2006 01:11:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id AED3346BBD for ; Tue, 20 Jun 2006 21:11:28 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D2EE455E69; Wed, 21 Jun 2006 01:11:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CCCBA16A482; Wed, 21 Jun 2006 01:11:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 964EC16A47F for ; Wed, 21 Jun 2006 01:11:27 +0000 (UTC) (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 F3C2B43D6D for ; Wed, 21 Jun 2006 01:11:23 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5L1BNVa004298 for ; Wed, 21 Jun 2006 01:11:23 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5L1BNUH004295 for perforce@freebsd.org; Wed, 21 Jun 2006 01:11:23 GMT (envelope-from wsalamon@computer.org) Date: Wed, 21 Jun 2006 01:11:23 GMT Message-Id: <200606210111.k5L1BNUH004295@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 99716 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jun 2006 01:11:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=99716 Change 99716 by wsalamon@vh3 on 2006/06/21 01:10:24 Add the ACL, EXTATTR, SCHED, and other events recently added to audit_kevents.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#10 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#11 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -314,6 +314,49 @@ 378:AUE_KEVENT:kevent(2):no 379:AUE_FSYNC:fsync(2):fm 380:AUE_NMOUNT:nmount(2):ad +381:AUE_BDFLUSH:bdflush(2):ad +382:AUE_SETFSUID:setfsuid(2):ot +383:AUE_SETFSGID:setfsgid(2):ot +384:AUE_PERSONALITY:personality(2):pc +385:AUE_SCHED_GETSCHEDULER:getscheduler(2):ad +386:AUE_SCHED_SETSCHEDULER:setscheduler(2):ad +387:AUE_PRCTL:prctl(2):pc +388:AUE_GETCWD:getcwd(2):pc +389:AUE_CAPGET:capget(2):pc +390:AUE_CAPSET:capset(2):pc +391:AUE_PIVOT_ROOT:pivot_root(2):pc +392:AUE_RTPRIO::rtprio(2):pc +393:AUE_SCHED_GETPARAM:sched_getparam(2):ad +394:AUE_SCHED_SETPARAM:sched_setparam(2):ad +395:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad +396:AUE_SCHED_GET_PRIORITY_MIN:sched_get_priority_min(2):ad +397:AUE_SCHED_RR_GET_INTERVAL:sched_rr_get_interval(2):ad +398:AUE_ACL_GET_FILE:acl_get_file(2):fa +399:AUE_ACL_SET_FILE:acl_set_file(2):fm +400:AUE_ACL_GET_FD:acl_get_fd(2):fa +401:AUE_ACL_SET_FD:acl_set_fd(2):fm +402:AUE_ACL_DELETE_FILE:acl_delete_file(2):fm +403:AUE_ACL_DELETE_FD:acl_delete_fd(2):fm +404:AUE_ACL_CHECK_FILE:acl_aclcheck_file(2):fa +405:AUE_ACL_CHECK_FD:acl_aclcheck_fd(2):fa +406:AUE_ACL_GET_LINK:acl_get_link(2):fa +407:AUE_ACL_SET_LINK:acl_set_link(2):fm +408:AUE_ACL_DELETE_LINK:acl_delete_link(2):fm +409:AUE_ACL_CHECK_LINK:acl_aclcheck_link(2):fa +410:AUE_SYSARCH:sysarch(2):na +411:AUE_EXTATTRCTL:extattrctl(2):fm +412:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa +413:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm +414:AUE_EXTATTR_LIST_FILE:extattr_list_file(2):fa +415:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm +416:AUE_EXTATTR_GET_FD:extattr_get_fd(2):fa +417:AUE_EXTATTR_SET_FD:extattr_set_fd(2):fm +418:AUE_EXTATTR_LIST_FD:extattr_list_fd(2):fa +419:AUE_EXTATTR_DELETE_FD:extattr_delete_fd(2):fm +420:AUE_EXTATTR_GET_LINK:extattr_get_link(2):fa +421:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm +422:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa +423:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jun 21 01:18:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 15A3516A47C for ; Wed, 21 Jun 2006 01:18:18 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EE9B43D58 for ; Wed, 21 Jun 2006 01:18:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6E45A46BCC for ; Tue, 20 Jun 2006 21:18:09 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A762B55D93; Wed, 21 Jun 2006 01:17:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F7E216A47C; Wed, 21 Jun 2006 01:17:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7938316A47A for ; Wed, 21 Jun 2006 01:17:32 +0000 (UTC) (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 1C52F43D45 for ; Wed, 21 Jun 2006 01:17:32 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5L1HVdR004590 for ; Wed, 21 Jun 2006 01:17:31 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5L1HVOd004587 for perforce@freebsd.org; Wed, 21 Jun 2006 01:17:31 GMT (envelope-from wsalamon@computer.org) Date: Wed, 21 Jun 2006 01:17:31 GMT Message-Id: <200606210117.k5L1HVOd004587@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 99717 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jun 2006 01:18:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=99717 Change 99717 by wsalamon@vh3 on 2006/06/21 01:17:11 Integrate recent audit events from OpenBSM into trustedbsd/audit3. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#12 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#11 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#12 $ # $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.2 2006/03/26 01:44:35 rwatson Exp $ # 0:AUE_NULL:indir system call:no @@ -315,6 +315,49 @@ 378:AUE_KEVENT:kevent(2):no 379:AUE_FSYNC:fsync(2):fm 380:AUE_NMOUNT:nmount(2):ad +381:AUE_BDFLUSH:bdflush(2):ad +382:AUE_SETFSUID:setfsuid(2):ot +383:AUE_SETFSGID:setfsgid(2):ot +384:AUE_PERSONALITY:personality(2):pc +385:AUE_SCHED_GETSCHEDULER:getscheduler(2):ad +386:AUE_SCHED_SETSCHEDULER:setscheduler(2):ad +387:AUE_PRCTL:prctl(2):pc +388:AUE_GETCWD:getcwd(2):pc +389:AUE_CAPGET:capget(2):pc +390:AUE_CAPSET:capset(2):pc +391:AUE_PIVOT_ROOT:pivot_root(2):pc +392:AUE_RTPRIO::rtprio(2):pc +393:AUE_SCHED_GETPARAM:sched_getparam(2):ad +394:AUE_SCHED_SETPARAM:sched_setparam(2):ad +395:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad +396:AUE_SCHED_GET_PRIORITY_MIN:sched_get_priority_min(2):ad +397:AUE_SCHED_RR_GET_INTERVAL:sched_rr_get_interval(2):ad +398:AUE_ACL_GET_FILE:acl_get_file(2):fa +399:AUE_ACL_SET_FILE:acl_set_file(2):fm +400:AUE_ACL_GET_FD:acl_get_fd(2):fa +401:AUE_ACL_SET_FD:acl_set_fd(2):fm +402:AUE_ACL_DELETE_FILE:acl_delete_file(2):fm +403:AUE_ACL_DELETE_FD:acl_delete_fd(2):fm +404:AUE_ACL_CHECK_FILE:acl_aclcheck_file(2):fa +405:AUE_ACL_CHECK_FD:acl_aclcheck_fd(2):fa +406:AUE_ACL_GET_LINK:acl_get_link(2):fa +407:AUE_ACL_SET_LINK:acl_set_link(2):fm +408:AUE_ACL_DELETE_LINK:acl_delete_link(2):fm +409:AUE_ACL_CHECK_LINK:acl_aclcheck_link(2):fa +410:AUE_SYSARCH:sysarch(2):na +411:AUE_EXTATTRCTL:extattrctl(2):fm +412:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa +413:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm +414:AUE_EXTATTR_LIST_FILE:extattr_list_file(2):fa +415:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm +416:AUE_EXTATTR_GET_FD:extattr_get_fd(2):fa +417:AUE_EXTATTR_SET_FD:extattr_set_fd(2):fm +418:AUE_EXTATTR_LIST_FD:extattr_list_fd(2):fa +419:AUE_EXTATTR_DELETE_FD:extattr_delete_fd(2):fm +420:AUE_EXTATTR_GET_LINK:extattr_get_link(2):fa +421:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm +422:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa +423:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jun 24 00:51:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE90716A552 for ; Sat, 24 Jun 2006 00:51:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C77243D45 for ; Sat, 24 Jun 2006 00:51:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6C7BB46BDD for ; Fri, 23 Jun 2006 20:51:53 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8687B55D32; Sat, 24 Jun 2006 00:51:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DAEC16A494; Sat, 24 Jun 2006 00:51:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5087816A47E for ; Sat, 24 Jun 2006 00:51:51 +0000 (UTC) (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 070A243D45 for ; Sat, 24 Jun 2006 00:51:51 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5O0pooM081374 for ; Sat, 24 Jun 2006 00:51:50 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5O0poZZ081371 for perforce@freebsd.org; Sat, 24 Jun 2006 00:51:50 GMT (envelope-from wsalamon@computer.org) Date: Sat, 24 Jun 2006 00:51:50 GMT Message-Id: <200606240051.k5O0poZZ081371@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 99910 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jun 2006 00:51:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=99910 Change 99910 by wsalamon@vh3 on 2006/06/24 00:51:45 Audit the extattr system calls. Re-gen the system call table and related files with the AUE_ events. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#23 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#30 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#21 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#34 edit .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#33 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#15 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#20 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#21 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#24 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#23 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#22 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#23 $ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.5 2006/02/06 01:12:46 rwatson Exp $ */ @@ -384,7 +384,24 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_SYSARCH 406 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ +#define AUE_SYSARCH 410 /* FreeBSD. */ +#define AUE_EXTATTRCTL 411 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#30 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.211 2006/03/23 08:48:37 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.213 2006/03/23 08:46:41 davidxu Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp */ #include "opt_compat.h" @@ -384,10 +384,10 @@ { SYF_MPSAFE | AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL }, /* 352 = __acl_delete_fd */ { SYF_MPSAFE | AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL }, /* 353 = __acl_aclcheck_file */ { SYF_MPSAFE | AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL }, /* 354 = __acl_aclcheck_fd */ - { SYF_MPSAFE | AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ - { SYF_MPSAFE | AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ - { SYF_MPSAFE | AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ - { SYF_MPSAFE | AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ + { SYF_MPSAFE | AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_EXTATTRCTL }, /* 355 = extattrctl */ + { SYF_MPSAFE | AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE }, /* 356 = extattr_set_file */ + { SYF_MPSAFE | AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE }, /* 357 = extattr_get_file */ + { SYF_MPSAFE | AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE }, /* 358 = extattr_delete_file */ { SYF_MPSAFE | AS(aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 359 = aio_waitcomplete */ { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 360 = getresuid */ { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 361 = getresgid */ @@ -400,9 +400,9 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 369 = __cap_set_file */ { AS(nosys_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 370 = lkmressys */ - { SYF_MPSAFE | AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ - { SYF_MPSAFE | AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ - { SYF_MPSAFE | AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ + { SYF_MPSAFE | AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD }, /* 371 = extattr_set_fd */ + { SYF_MPSAFE | AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD }, /* 372 = extattr_get_fd */ + { SYF_MPSAFE | AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD }, /* 373 = extattr_delete_fd */ { SYF_MPSAFE | AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL }, /* 374 = __setugid */ { AS(nfsclnt_args), (sy_call_t *)nosys, AUE_NULL }, /* 375 = nfsclnt */ { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS }, /* 376 = eaccess */ @@ -441,9 +441,9 @@ { SYF_MPSAFE | AS(__mac_get_pid_args), (sy_call_t *)__mac_get_pid, AUE_NULL }, /* 409 = __mac_get_pid */ { SYF_MPSAFE | AS(__mac_get_link_args), (sy_call_t *)__mac_get_link, AUE_NULL }, /* 410 = __mac_get_link */ { SYF_MPSAFE | AS(__mac_set_link_args), (sy_call_t *)__mac_set_link, AUE_NULL }, /* 411 = __mac_set_link */ - { SYF_MPSAFE | AS(extattr_set_link_args), (sy_call_t *)extattr_set_link, AUE_NULL }, /* 412 = extattr_set_link */ - { SYF_MPSAFE | AS(extattr_get_link_args), (sy_call_t *)extattr_get_link, AUE_NULL }, /* 413 = extattr_get_link */ - { SYF_MPSAFE | AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link, AUE_NULL }, /* 414 = extattr_delete_link */ + { SYF_MPSAFE | AS(extattr_set_link_args), (sy_call_t *)extattr_set_link, AUE_EXTATTR_SET_LINK }, /* 412 = extattr_set_link */ + { SYF_MPSAFE | AS(extattr_get_link_args), (sy_call_t *)extattr_get_link, AUE_EXTATTR_GET_LINK }, /* 413 = extattr_get_link */ + { SYF_MPSAFE | AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link, AUE_EXTATTR_DELETE_LINK }, /* 414 = extattr_delete_link */ { SYF_MPSAFE | AS(__mac_execve_args), (sy_call_t *)__mac_execve, AUE_NULL }, /* 415 = __mac_execve */ { SYF_MPSAFE | AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION }, /* 416 = sigaction */ { SYF_MPSAFE | AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN }, /* 417 = sigreturn */ @@ -466,9 +466,9 @@ { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL }, /* 434 = _umtx_lock */ { SYF_MPSAFE | AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL }, /* 435 = _umtx_unlock */ { SYF_MPSAFE | AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL }, /* 436 = jail_attach */ - { SYF_MPSAFE | AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_NULL }, /* 437 = extattr_list_fd */ - { SYF_MPSAFE | AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_NULL }, /* 438 = extattr_list_file */ - { SYF_MPSAFE | AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_NULL }, /* 439 = extattr_list_link */ + { SYF_MPSAFE | AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_EXTATTR_LIST_FD }, /* 437 = extattr_list_fd */ + { SYF_MPSAFE | AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_EXTATTR_LIST_FILE }, /* 438 = extattr_list_file */ + { SYF_MPSAFE | AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_EXTATTR_LIST_LINK }, /* 439 = extattr_list_link */ { SYF_MPSAFE | AS(kse_switchin_args), (sy_call_t *)kse_switchin, AUE_NULL }, /* 440 = kse_switchin */ { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 441 = ksem_timedwait */ { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL }, /* 442 = thr_suspend */ ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#21 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.195 2006/03/23 08:48:37 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.213 2006/03/23 08:46:41 davidxu Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp */ const char *syscallnames[] = { ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#34 (text+ko) ==== @@ -610,24 +610,26 @@ acl_type_t type, struct acl *aclp); } 350 AUE_NULL MSTD { int __acl_set_fd(int filedes, \ acl_type_t type, struct acl *aclp); } -351 AUE_NULL MSTD { int __acl_delete_file(const char *path, \ - acl_type_t type); } +351 AUE_NULL MSTD { int __acl_delete_file( \ + const char *path, acl_type_t type); } 352 AUE_NULL MSTD { int __acl_delete_fd(int filedes, \ acl_type_t type); } 353 AUE_NULL MSTD { int __acl_aclcheck_file(const char *path, \ acl_type_t type, struct acl *aclp); } 354 AUE_NULL MSTD { int __acl_aclcheck_fd(int filedes, \ acl_type_t type, struct acl *aclp); } -355 AUE_NULL MSTD { int extattrctl(const char *path, int cmd, \ +355 AUE_EXTATTRCTL MSTD { int extattrctl(const char *path, int cmd, \ const char *filename, int attrnamespace, \ const char *attrname); } -356 AUE_NULL MSTD { int extattr_set_file(const char *path, \ - int attrnamespace, const char *attrname, \ - void *data, size_t nbytes); } -357 AUE_NULL MSTD { ssize_t extattr_get_file(const char *path, \ - int attrnamespace, const char *attrname, \ - void *data, size_t nbytes); } -358 AUE_NULL MSTD { int extattr_delete_file(const char *path, \ +356 AUE_EXTATTR_SET_FILE MSTD { int extattr_set_file( \ + const char *path, int attrnamespace, \ + const char *attrname, void *data, \ + size_t nbytes); } +357 AUE_EXTATTR_GET_FILE MSTD { ssize_t extattr_get_file( \ + const char *path, int attrnamespace, \ + const char *attrname, void *data, \ + size_t nbytes); } +358 AUE_EXTATTR_DELETE_FILE MSTD { int extattr_delete_file(const char *path, \ int attrnamespace, \ const char *attrname); } 359 AUE_NULL MNOSTD { int aio_waitcomplete( \ @@ -649,13 +651,13 @@ 368 AUE_NULL UNIMPL __cap_set_fd 369 AUE_NULL UNIMPL __cap_set_file 370 AUE_NULL NODEF lkmressys lkmressys nosys_args int -371 AUE_NULL MSTD { int extattr_set_fd(int fd, \ +371 AUE_EXTATTR_SET_FD MSTD { int extattr_set_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -372 AUE_NULL MSTD { ssize_t extattr_get_fd(int fd, \ +372 AUE_EXTATTR_GET_FD MSTD { ssize_t extattr_get_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -373 AUE_NULL MSTD { int extattr_delete_fd(int fd, \ +373 AUE_EXTATTR_DELETE_FD MSTD { int extattr_delete_fd(int fd, \ int attrnamespace, \ const char *attrname); } 374 AUE_NULL MSTD { int __setugid(int flag); } @@ -718,14 +720,16 @@ struct mac *mac_p); } 411 AUE_NULL MSTD { int __mac_set_link(const char *path_p, \ struct mac *mac_p); } -412 AUE_NULL MSTD { int extattr_set_link(const char *path, \ - int attrnamespace, const char *attrname, \ - void *data, size_t nbytes); } -413 AUE_NULL MSTD { ssize_t extattr_get_link(const char *path, \ - int attrnamespace, const char *attrname, \ - void *data, size_t nbytes); } -414 AUE_NULL MSTD { int extattr_delete_link(const char *path, \ - int attrnamespace, \ +412 AUE_EXTATTR_SET_LINK MSTD { int extattr_set_link( \ + const char *path, int attrnamespace, \ + const char *attrname, void *data, \ + size_t nbytes); } +413 AUE_EXTATTR_GET_LINK MSTD { ssize_t extattr_get_link( \ + const char *path, int attrnamespace, \ + const char *attrname, void *data, \ + size_t nbytes); } +414 AUE_EXTATTR_DELETE_LINK MSTD { int extattr_delete_link( \ + const char *path, int attrnamespace, \ const char *attrname); } 415 AUE_NULL MSTD { int __mac_execve(char *fname, char **argv, \ char **envv, struct mac *mac_p); } @@ -761,13 +765,13 @@ 434 AUE_NULL MSTD { int _umtx_lock(struct umtx *umtx); } 435 AUE_NULL MSTD { int _umtx_unlock(struct umtx *umtx); } 436 AUE_NULL MSTD { int jail_attach(int jid); } -437 AUE_NULL MSTD { ssize_t extattr_list_fd(int fd, \ +437 AUE_EXTATTR_LIST_FD MSTD { ssize_t extattr_list_fd(int fd, \ int attrnamespace, void *data, \ size_t nbytes); } -438 AUE_NULL MSTD { ssize_t extattr_list_file( \ +438 AUE_EXTATTR_LIST_FILE MSTD { ssize_t extattr_list_file( \ const char *path, int attrnamespace, \ void *data, size_t nbytes); } -439 AUE_NULL MSTD { ssize_t extattr_list_link( \ +439 AUE_EXTATTR_LIST_LINK MSTD { ssize_t extattr_list_link( \ const char *path, int attrnamespace, \ void *data, size_t nbytes); } 440 AUE_NULL MSTD { int kse_switchin( \ ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#33 (text+ko) ==== @@ -4371,6 +4371,8 @@ char attrname[EXTATTR_MAXNAMELEN]; int vfslocked, fnvfslocked, error; + AUDIT_ARG(cmd, uap->cmd); + AUDIT_ARG(value, uap->attrnamespace); /* * uap->attrname is not always defined. We check again later when we * invoke the VFS call so as to pass in NULL there if needed. @@ -4381,6 +4383,7 @@ if (error) return (error); } + AUDIT_ARG(text, attrname); vfslocked = fnvfslocked = 0; /* @@ -4509,9 +4512,12 @@ char attrname[EXTATTR_MAXNAMELEN]; int vfslocked, error; + AUDIT_ARG(fd, uap->fd); + AUDIT_ARG(value, uap->attrnamespace); error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL); if (error) return (error); + AUDIT_ARG(text, attrname); error = getvnode(td->td_proc->p_fd, uap->fd, &fp); if (error) @@ -4541,9 +4547,11 @@ char attrname[EXTATTR_MAXNAMELEN]; int vfslocked, error; + AUDIT_ARG(value, uap->attrnamespace); error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL); if (error) return (error); + AUDIT_ARG(text, attrname); NDINIT(&nd, LOOKUP, MPSAFE | FOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, td); @@ -4576,9 +4584,11 @@ char attrname[EXTATTR_MAXNAMELEN]; int vfslocked, error; + AUDIT_ARG(value, uap->attrnamespace); error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL); if (error) return (error); + AUDIT_ARG(text, attrname); NDINIT(&nd, LOOKUP, MPSAFE | NOFOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, td); @@ -4683,9 +4693,12 @@ char attrname[EXTATTR_MAXNAMELEN]; int vfslocked, error; + AUDIT_ARG(fd, uap->fd); + AUDIT_ARG(value, uap->attrnamespace); error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL); if (error) return (error); + AUDIT_ARG(text, attrname); error = getvnode(td->td_proc->p_fd, uap->fd, &fp); if (error) @@ -4715,9 +4728,11 @@ char attrname[EXTATTR_MAXNAMELEN]; int vfslocked, error; + AUDIT_ARG(value, uap->attrnamespace); error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL); if (error) return (error); + AUDIT_ARG(text, attrname); NDINIT(&nd, LOOKUP, MPSAFE | FOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, td); @@ -4750,9 +4765,11 @@ char attrname[EXTATTR_MAXNAMELEN]; int vfslocked, error; + AUDIT_ARG(value, uap->attrnamespace); error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL); if (error) return (error); + AUDIT_ARG(text, attrname); NDINIT(&nd, LOOKUP, MPSAFE | NOFOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, td); @@ -4827,9 +4844,12 @@ char attrname[EXTATTR_MAXNAMELEN]; int vfslocked, error; + AUDIT_ARG(fd, uap->fd); + AUDIT_ARG(value, uap->attrnamespace); error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL); if (error) return (error); + AUDIT_ARG(text, attrname); error = getvnode(td->td_proc->p_fd, uap->fd, &fp); if (error) @@ -4856,9 +4876,11 @@ char attrname[EXTATTR_MAXNAMELEN]; int vfslocked, error; + AUDIT_ARG(value, uap->attrnamespace); error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL); if (error) return(error); + AUDIT_ARG(text, attrname); NDINIT(&nd, LOOKUP, MPSAFE | FOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, td); @@ -4887,9 +4909,11 @@ char attrname[EXTATTR_MAXNAMELEN]; int vfslocked, error; + AUDIT_ARG(value, uap->attrnamespace); error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL); if (error) return(error); + AUDIT_ARG(text, attrname); NDINIT(&nd, LOOKUP, MPSAFE | NOFOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, td); @@ -4985,6 +5009,8 @@ struct file *fp; int vfslocked, error; + AUDIT_ARG(fd, uap->fd); + AUDIT_ARG(value, uap->attrnamespace); error = getvnode(td->td_proc->p_fd, uap->fd, &fp); if (error) return (error); @@ -5011,6 +5037,7 @@ struct nameidata nd; int vfslocked, error; + AUDIT_ARG(value, uap->attrnamespace); NDINIT(&nd, LOOKUP, MPSAFE | FOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, td); error = namei(&nd); @@ -5040,6 +5067,7 @@ struct nameidata nd; int vfslocked, error; + AUDIT_ARG(value, uap->attrnamespace); NDINIT(&nd, LOOKUP, MPSAFE | NOFOLLOW | AUDITVNODE1, UIO_USERSPACE, uap->path, td); error = namei(&nd); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#15 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -625,6 +626,54 @@ UPATH1_VNODE1_TOKENS; break; + case AUE_EXTATTR_GET_FILE: + case AUE_EXTATTR_SET_FILE: + case AUE_EXTATTR_LIST_FILE: + case AUE_EXTATTR_DELETE_FILE: + case AUE_EXTATTR_GET_LINK: + case AUE_EXTATTR_SET_LINK: + case AUE_EXTATTR_LIST_LINK: + case AUE_EXTATTR_DELETE_LINK: + case AUE_EXTATTRCTL: + UPATH1_VNODE1_TOKENS; + if (ARG_IS_VALID(kar, ARG_CMD)) { + tok = au_to_arg32(2, "cmd", ar->ar_arg_cmd); + kau_write(rec, tok); + } + /* extattrctl(2) filename parameter is in upath2/vnode2 */ + UPATH2_TOKENS; + VNODE2_TOKENS; + /* fall through */ + case AUE_EXTATTR_GET_FD: + case AUE_EXTATTR_SET_FD: + case AUE_EXTATTR_LIST_FD: + case AUE_EXTATTR_DELETE_FD: + if (ARG_IS_VALID(kar, ARG_FD)) { + tok = au_to_arg32(2, "fd", ar->ar_arg_fd); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_VALUE)) { + switch (ar->ar_arg_value) { + case EXTATTR_NAMESPACE_USER: + tok = au_to_text(EXTATTR_NAMESPACE_USER_STRING); + break; + case EXTATTR_NAMESPACE_SYSTEM: + tok = au_to_text(EXTATTR_NAMESPACE_SYSTEM_STRING); + break; + default: + tok = au_to_arg32(3, "attrnamespace", + ar->ar_arg_value); + break; + } + kau_write(rec, tok); + } + /* attrname is in the text field */ + if (ARG_IS_VALID(kar, ARG_TEXT)) { + tok = au_to_text(ar->ar_arg_text); + kau_write(rec, tok); + } + break; + case AUE_FCHMOD: if (ARG_IS_VALID(kar, ARG_MODE)) { tok = au_to_arg32(2, "new file mode", ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#20 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.192 2006/03/23 08:48:37 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.213 2006/03/23 08:46:41 davidxu Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp */ #define SYS_syscall 0 ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#21 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.147 2006/03/23 08:48:37 davidxu Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.213 2006/03/23 08:46:41 davidxu Exp +# $FreeBSD$ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#24 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.194 2006/03/28 14:32:38 des Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.213 2006/03/23 08:46:41 davidxu Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp */ #ifndef _SYS_SYSPROTO_H_ From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jun 24 01:05:14 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF46F16A492 for ; Sat, 24 Jun 2006 01:05:14 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1E7D43D7C for ; Sat, 24 Jun 2006 01:05:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8508746C18 for ; Fri, 23 Jun 2006 21:05:00 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CF48273F26; Sat, 24 Jun 2006 01:03:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C774616A49E; Sat, 24 Jun 2006 01:03:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A077016A494 for ; Sat, 24 Jun 2006 01:03:05 +0000 (UTC) (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 7208E43D4C for ; Sat, 24 Jun 2006 01:03:05 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5O135ZM083143 for ; Sat, 24 Jun 2006 01:03:05 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5O135Lu083140 for perforce@freebsd.org; Sat, 24 Jun 2006 01:03:05 GMT (envelope-from wsalamon@computer.org) Date: Sat, 24 Jun 2006 01:03:05 GMT Message-Id: <200606240103.k5O135Lu083140@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 99911 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jun 2006 01:05:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=99911 Change 99911 by wsalamon@vh3 on 2006/06/24 01:02:34 Add a test program for exteneded attribute call auditing. Change the GETFH event name in tfileaccess to match current reality. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/Makefile#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileaccess.c#6 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileextattr.c#1 add Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/Makefile#2 (text+ko) ==== @@ -26,7 +26,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -TARGETS=tfilecreate tfilemodify tdir tfileaccess tchroot tmmap tfileioctl tsharedfile +TARGETS=tfilecreate tfilemodify tdir tfileaccess tchroot tmmap tfileioctl tsharedfile tfileextattr CC=cc -g -I../include ../lib/audittest.o -lbsm # Set ASSERT_FLAGS only if not already set ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileaccess.c#6 (text+ko) ==== @@ -68,10 +68,10 @@ /* Generate a failure AUE_ACCESS record */ access("ANonExisteNtFiLeNaME", F_OK); - /* Generate a success AUE_GETFH record */ + /* Generate a success AUE_NFS_GETFH record */ if (getfh(tempname, &fh)) AUT_PERROR("getfh()"); - aut_assert(AUE_GETFH); + aut_assert(AUE_NFS_GETFH); /* Generate a AUE_STAT audit record */ if ((stat(tempname, &tstat)) < 0) From owner-trustedbsd-cvs@FreeBSD.ORG Sun Jun 25 13:51:47 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9BC2C16A405 for ; Sun, 25 Jun 2006 13:51:47 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 503A543D46 for ; Sun, 25 Jun 2006 13:51:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3C4E246C9E for ; Sun, 25 Jun 2006 09:51:41 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9ED6B56BE0; Sun, 25 Jun 2006 13:51:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 96C0916A406; Sun, 25 Jun 2006 13:51:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 72CE416A400 for ; Sun, 25 Jun 2006 13:51:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2049243D68 for ; Sun, 25 Jun 2006 13:51:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5PDpRvh023913 for ; Sun, 25 Jun 2006 13:51:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5PDpR1F023910 for perforce@freebsd.org; Sun, 25 Jun 2006 13:51:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 25 Jun 2006 13:51:27 GMT Message-Id: <200606251351.k5PDpR1F023910@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 99988 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jun 2006 13:51:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=99988 Change 99988 by rwatson@rwatson_sesame on 2006/06/25 13:51:12 Update HISTORY. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#15 (text+ko) ==== @@ -6,6 +6,7 @@ - Prefer inttypes.h to stdint.h; enhance queue.h detection to test for TAILQ_FOREACH_SAFE(), which is present in recent BSD queue.h's, but not older ones. OpenBSM now builds on some FreeBSD 4.x version. +- New event types for extended attributes, ACLs, and scheduling. OpenBSM 1.0 alpha 6 @@ -174,4 +175,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#14 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#15 $ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jun 27 13:54:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B38916A408 for ; Tue, 27 Jun 2006 13:54:30 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A20143D70 for ; Tue, 27 Jun 2006 13:54:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2F35246CD2 for ; Tue, 27 Jun 2006 09:54:15 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0A16B73C6D; Tue, 27 Jun 2006 13:49:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F215916A409; Tue, 27 Jun 2006 13:49:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B447E16A406 for ; Tue, 27 Jun 2006 13:49:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98D1543D66 for ; Tue, 27 Jun 2006 13:48: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.6/8.13.6) with ESMTP id k5RDmwbS042267 for ; Tue, 27 Jun 2006 13:48:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RDmwBc042264 for perforce@freebsd.org; Tue, 27 Jun 2006 13:48:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 13:48:58 GMT Message-Id: <200606271348.k5RDmwBc042264@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 100139 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 13:54:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=100139 Change 100139 by rwatson@rwatson_sesame on 2006/06/27 13:48:35 Upgrade configure bits. Update version number. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/ltmain.sh#3 edit .. //depot/projects/trustedbsd/openbsm/configure#22 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#24 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/ltmain.sh#3 (xtext) ==== @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.20 -TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)" +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -132,6 +132,8 @@ show="$echo" show_help= execute_dlfiles= +duplicate_deps=no +preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -139,6 +141,43 @@ # Shell function definitions: # This seems to be the best place for them +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $mkdir "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || { + $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 + exit $EXIT_FAILURE + } + fi + + $echo "X$my_tmpdir" | $Xsed +} + + # func_win32_libid arg # return the library type of file 'arg' # @@ -157,12 +196,11 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` - if test "X$win32_nmres" = "Ximport" ; then - win32_libid_type="x86 archive import" - else - win32_libid_type="x86 archive static" - fi + $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac fi ;; *DLL*) @@ -188,6 +226,20 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { + # FreeBSD-specific: where we install compilers with non-standard names + tag_compilers_CC="*cc cc* *gcc gcc*" + tag_compilers_CXX="*c++ c++* *g++ g++*" + base_compiler=`set -- "$@"; echo $1` + + # If $tagname isn't set, then try to infer if the default "CC" tag applies + if test -z "$tagname"; then + for zp in $tag_compilers_CC; do + case $base_compiler in + $zp) tagname="CC"; break;; + esac + done + fi + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -228,7 +280,22 @@ break ;; esac - fi + + # FreeBSD-specific: try compilers based on inferred tag + if test -z "$tagname"; then + eval "tag_compilers=\$tag_compilers_${z}" + if test -n "$tag_compilers"; then + for zp in $tag_compilers; do + case $base_compiler in + $zp) tagname=$z; break;; + esac + done + if test -n "$tagname"; then + break + fi + fi + fi + fi done # If $tagname still isn't set, then no tagged configuration # was found and let the user know that the "--tag" command @@ -295,9 +362,9 @@ $run ${rm}r "$my_xdir" $show "$mkdir $my_xdir" $run $mkdir "$my_xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$my_xdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then + exit $exit_status fi case $host in *-darwin*) @@ -352,6 +419,8 @@ # Darwin sucks eval std_shrext=\"$shrext_cmds\" +disable_libs=no + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -468,7 +537,11 @@ preserve_args="$preserve_args $arg" ;; - --tag) prevopt="--tag" prev=tag ;; + --tag) + prevopt="--tag" + prev=tag + preserve_args="$preserve_args --tag" + ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -500,6 +573,18 @@ exit $EXIT_FAILURE fi +case $disable_libs in +no) + ;; +shared) + build_libtool_libs=no + build_old_libs=yes + ;; +static) + build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + ;; +esac + # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -856,9 +941,9 @@ if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - status=$? - if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $exit_status fi fi @@ -1061,6 +1146,7 @@ no_install=no objs= non_pic_objects= + notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1089,14 +1175,15 @@ if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes - prefer_static_libs=yes break ;; esac @@ -1271,6 +1358,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1354,8 +1446,8 @@ prev= continue ;; - darwin_framework) - compiler_flags="$compiler_flags $arg" + darwin_framework|darwin_framework_skip) + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" prev= @@ -1419,13 +1511,17 @@ continue ;; - -framework|-arch) - prev=darwin_framework - compiler_flags="$compiler_flags $arg" + -framework|-arch|-isysroot) + case " $CC " in + *" ${arg} ${1} "* | *" ${arg} ${1} "*) + prev=darwin_framework_skip ;; + *) compiler_flags="$compiler_flags $arg" + prev=darwin_framework ;; + esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - continue - ;; + continue + ;; -inst-prefix-dir) prev=inst_prefix @@ -1453,7 +1549,8 @@ absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE + absdir="$dir" + notinst_path="$notinst_path $dir" fi dir="$absdir" ;; @@ -1467,10 +1564,15 @@ esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac continue @@ -1479,11 +1581,11 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-mingw* | *-*-os2*) + *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; @@ -1495,6 +1597,15 @@ # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; esac elif test "X$arg" = "X-lc_r"; then case $host in @@ -1522,6 +1633,7 @@ compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" + deplibs="$deplibs $arg" continue ;; @@ -1536,7 +1648,12 @@ # +DA*, +DD* enable 64-bit mode on the HP compiler # -q* pass through compiler args for the IBM compiler # -m* pass through architecture-specific compiler args for GCC - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ + -t[45]*|-txscale*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1548,9 +1665,7 @@ esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi + compiler_flags="$compiler_flags $arg" continue ;; @@ -1788,6 +1903,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1893,9 +2013,9 @@ if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then + exit $exit_status fi fi @@ -1958,7 +2078,6 @@ newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -2012,6 +2131,29 @@ else compiler_flags="$compiler_flags $deplib" fi + + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + ;; + *) + ;; + esac # linkmode + continue ;; -l*) @@ -2194,7 +2336,7 @@ esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot find the library \`$lib'" 1>&2 + $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 exit $EXIT_FAILURE fi @@ -2445,8 +2587,12 @@ fi link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes ; then + use_static_libs=no + fi if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { test "$use_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes @@ -2559,11 +2705,15 @@ if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; *-*-darwin* ) # if the lib is a module then we can not link against # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then + if /usr/bin/file -L $add 2> /dev/null | + $EGREP ": [^:]* bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -3314,9 +3464,9 @@ # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` - deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` done if test -n "$xrpath"; then @@ -3369,7 +3519,12 @@ ;; *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work ;; *) # Add libc to deplibs on all other systems if necessary. @@ -3413,7 +3568,7 @@ int main() { return 0; } EOF $rm conftest - $LTCC -o conftest conftest.c $deplibs + $LTCC $LTCFLAGS -o conftest conftest.c $deplibs if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do @@ -3458,7 +3613,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC -o conftest conftest.c $i + $LTCC $LTCFLAGS -o conftest conftest.c $i # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` @@ -3705,6 +3860,35 @@ deplibs=$newdeplibs fi + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). library_names= old_library= @@ -3788,6 +3972,7 @@ fi lib="$output_objdir/$realname" + linknames= for link do linknames="$linknames $link" @@ -4219,6 +4404,35 @@ ;; esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -4263,10 +4477,15 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac done @@ -4383,10 +4602,22 @@ export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac else - $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac fi fi @@ -4503,16 +4734,32 @@ esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + case $host in + *cygwin* | *mingw* ) + if test -f "$output_objdir/${outputname}.def" ; then + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + else + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + fi + ;; + * ) + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + ;; + esac + ;; + *-*-freebsd*) + # FreeBSD doesn't need this... ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 @@ -4537,7 +4784,7 @@ # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" - status=$? + exit_status=$? # Delete the generated files. if test -n "$dlsyms"; then @@ -4545,7 +4792,7 @@ $run $rm "$output_objdir/${outputname}S.${objext}" fi - exit $status + exit $exit_status fi if test -n "$shlibpath_var"; then @@ -4685,10 +4932,12 @@ esac case $host in *cygwin* | *mingw* ) - cwrappersource=`$echo ${objdir}/lt-${outputname}.c` - cwrapper=`$echo ${output}.exe` - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + output_name=`basename $output` + output_path=`dirname $output` + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $rm $cwrappersource $cwrapper + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 cat > $cwrappersource < #include #include +#include +#include +#include #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4723,16 +4975,20 @@ #endif #ifndef DIR_SEPARATOR -#define DIR_SEPARATOR '/' +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) -#define HAVE_DOS_BASED_FILE_SYSTEM -#ifndef DIR_SEPARATOR_2 -#define DIR_SEPARATOR_2 '\\' +# define HAVE_DOS_BASED_FILE_SYSTEM +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif #endif -#endif #ifndef DIR_SEPARATOR_2 # define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) @@ -4741,17 +4997,32 @@ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) +/* -DDEBUG is fairly common in CFLAGS. */ +#undef DEBUG +#if defined DEBUGWRAPPER +# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) +#else +# define DEBUG(format, ...) +#endif + const char *program_name = NULL; void * xmalloc (size_t num); char * xstrdup (const char *string); -char * basename (const char *name); -char * fnqualify(const char *path); +const char * base_name (const char *name); +char * find_executable(const char *wrapper); +int check_executable(const char *path); char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); @@ -4761,29 +5032,50 @@ char **newargz; int i; - program_name = (char *) xstrdup ((char *) basename (argv[0])); + program_name = (char *) xstrdup (base_name (argv[0])); + DEBUG("(main) argv[0] : %s\n",argv[0]); + DEBUG("(main) program_name : %s\n",program_name); newargz = XMALLOC(char *, argc+2); EOF - cat >> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = fnqualify(argv[0]); + cat >> $cwrappersource <<"EOF" + newargz[1] = find_executable(argv[0]); + if (newargz[1] == NULL) + lt_fatal("Couldn't find %s", argv[0]); + DEBUG("(main) found exe at : %s\n",newargz[1]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newargz[argc+1] = NULL; + + for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" + cat >> $cwrappersource <<"EOF" return 127; } @@ -4804,48 +5096,148 @@ ; } -char * -basename (const char *name) +const char * +base_name (const char *name) { const char *base; #if defined (HAVE_DOS_BASED_FILE_SYSTEM) /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha (name[0]) && name[1] == ':') + if (isalpha ((unsigned char)name[0]) && name[1] == ':') name += 2; #endif for (base = name; *name; name++) if (IS_DIR_SEPARATOR (*name)) base = name + 1; - return (char *) base; + return base; +} + +int +check_executable(const char * path) +{ + struct stat st; + + DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); + if ((!path) || (!*path)) + return 0; + + if ((stat (path, &st) >= 0) && + ( + /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ +#if defined (S_IXOTH) + ((st.st_mode & S_IXOTH) == S_IXOTH) || +#endif +#if defined (S_IXGRP) + ((st.st_mode & S_IXGRP) == S_IXGRP) || +#endif + ((st.st_mode & S_IXUSR) == S_IXUSR)) + ) + return 1; + else + return 0; } +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise */ char * -fnqualify(const char *path) +find_executable (const char* wrapper) { - size_t size; - char *p; + int has_slash = 0; + const char* p; + const char* p_next; + /* static buffer for getcwd */ char tmp[LT_PATHMAX + 1]; + int tmp_len; + char* concat_name; - assert(path != NULL); + DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; - /* Is it qualified already? */ + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } #if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha (path[0]) && path[1] == ':') - return xstrdup (path); + } #endif - if (IS_DIR_SEPARATOR (path[0])) - return xstrdup (path); - /* prepend the current directory */ - /* doesn't handle '~' */ + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char* path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char* q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR(*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen(tmp); + concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) lt_fatal ("getcwd failed"); - size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ - p = XMALLOC(char, size); - sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); - return p; + tmp_len = strlen(tmp); + concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jun 27 14:04:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFB9216A40A for ; Tue, 27 Jun 2006 14:04:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6275B43D5A for ; Tue, 27 Jun 2006 14:04:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4790946BFC for ; Tue, 27 Jun 2006 10:04:29 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6B1D457148; Tue, 27 Jun 2006 14:04:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 606F916A40B; Tue, 27 Jun 2006 14:04:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D96216A408 for ; Tue, 27 Jun 2006 14:04:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BB9B43D6B for ; Tue, 27 Jun 2006 14:04:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RE4IIB044122 for ; Tue, 27 Jun 2006 14:04:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RE4HSK044119 for perforce@freebsd.org; Tue, 27 Jun 2006 14:04:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 14:04:17 GMT Message-Id: <200606271404.k5RE4HSK044119@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 100140 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 14:04:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=100140 Change 100140 by rwatson@rwatson_fledge on 2006/06/27 14:03:58 OpenBSM 1.0a7 release. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#9 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#9 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#8 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#9 $ @@ -81,6 +81,13 @@ created by McAfee Research under contract to Apple Computer, and has since been extended by the volunteer TrustedBSD team.

    +

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

    +

    2006-06-02 - OpenBSM 1.0 alpha 6 release is a test release of the OpenBSM code base, and matches what is present in FreeBSD CVS at this date. In this revision, the primary changes are the From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jun 27 14:06:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5463916A414 for ; Tue, 27 Jun 2006 14:06:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3BE143D66 for ; Tue, 27 Jun 2006 14:06:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 587A446CCD for ; Tue, 27 Jun 2006 10:06:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8F99B576E7; Tue, 27 Jun 2006 14:06:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 83A8216A412; Tue, 27 Jun 2006 14:06:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49FD016A410 for ; Tue, 27 Jun 2006 14:06:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6846B43D58 for ; Tue, 27 Jun 2006 14:06:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RE6L16044385 for ; Tue, 27 Jun 2006 14:06:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RE6LKN044382 for perforce@freebsd.org; Tue, 27 Jun 2006 14:06:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 14:06:21 GMT Message-Id: <200606271406.k5RE6LKN044382@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 100143 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 14:06:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=100143 Change 100143 by rwatson@rwatson_fledge on 2006/06/27 14:06:05 Add OpenBSM tarballs for history's sake. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha4.tgz#1 add .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha5.tgz#1 add .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha6.tgz#1 add .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha7.tgz#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jun 27 14:21:04 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4EB4916A40A for ; Tue, 27 Jun 2006 14:21:04 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 226C843D6A for ; Tue, 27 Jun 2006 14:20:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A966746D01 for ; Tue, 27 Jun 2006 10:20:47 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 327B95614F; Tue, 27 Jun 2006 14:20:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2735516A407; Tue, 27 Jun 2006 14:20:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDF5516A411 for ; Tue, 27 Jun 2006 14:20:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5E5F43D70 for ; Tue, 27 Jun 2006 14:20:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5REKdRD045008 for ; Tue, 27 Jun 2006 14:20:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5REKdj7045005 for perforce@freebsd.org; Tue, 27 Jun 2006 14:20:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 14:20:39 GMT Message-Id: <200606271420.k5REKdj7045005@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 100144 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 14:21:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=100144 Change 100144 by rwatson@rwatson_zoo on 2006/06/27 14:20:38 Integrate OpenBSM branch into audit3 branch to bring in remaining unintegrated changes from OpenBSM 1.0a7. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#5 (text+ko) ==== @@ -1,3 +1,13 @@ +OpenBSM 1.0 alpha 7 + +- Adopted Solaris-compatible format for subject32_ex and subject64_ex + tokens, which previously did not correctly implement variable length + address storage. +- Prefer inttypes.h to stdint.h; enhance queue.h detection to test for + TAILQ_FOREACH_SAFE(), which is present in recent BSD queue.h's, but not + older ones. OpenBSM now builds on some FreeBSD 4.x version. +- New event types for extended attributes, ACLs, and scheduling. + OpenBSM 1.0 alpha 6 - Use AU_TO_WRITE and AU_NO_TO_WRITE for the 'keep' argument to au_close(); @@ -165,4 +175,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#4 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#5 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#8 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_6 +OPENBSM_1_0_ALPHA_7 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#10 (text+ko) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#10 $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ +#include /* struct timeval */ + /* * Token type identifiers. */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#12 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#11 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#12 $ */ #ifndef _LIBBSM_H_ @@ -43,7 +43,7 @@ #include #include -#include /* Required for audit.h. */ +#include /* Required for audit.h. */ #include /* Required for clock_t on Linux. */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#4 (text+ko) ==== @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.20 -TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)" +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -132,6 +132,8 @@ show="$echo" show_help= execute_dlfiles= +duplicate_deps=no +preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -139,6 +141,43 @@ # Shell function definitions: # This seems to be the best place for them +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $mkdir "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || { + $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 + exit $EXIT_FAILURE + } + fi + + $echo "X$my_tmpdir" | $Xsed +} + + # func_win32_libid arg # return the library type of file 'arg' # @@ -157,12 +196,11 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` - if test "X$win32_nmres" = "Ximport" ; then - win32_libid_type="x86 archive import" - else - win32_libid_type="x86 archive static" - fi + $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac fi ;; *DLL*) @@ -188,6 +226,20 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { + # FreeBSD-specific: where we install compilers with non-standard names + tag_compilers_CC="*cc cc* *gcc gcc*" + tag_compilers_CXX="*c++ c++* *g++ g++*" + base_compiler=`set -- "$@"; echo $1` + + # If $tagname isn't set, then try to infer if the default "CC" tag applies + if test -z "$tagname"; then + for zp in $tag_compilers_CC; do + case $base_compiler in + $zp) tagname="CC"; break;; + esac + done + fi + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -228,7 +280,22 @@ break ;; esac - fi + + # FreeBSD-specific: try compilers based on inferred tag + if test -z "$tagname"; then + eval "tag_compilers=\$tag_compilers_${z}" + if test -n "$tag_compilers"; then + for zp in $tag_compilers; do + case $base_compiler in + $zp) tagname=$z; break;; + esac + done + if test -n "$tagname"; then + break + fi + fi + fi + fi done # If $tagname still isn't set, then no tagged configuration # was found and let the user know that the "--tag" command @@ -295,9 +362,9 @@ $run ${rm}r "$my_xdir" $show "$mkdir $my_xdir" $run $mkdir "$my_xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$my_xdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then + exit $exit_status fi case $host in *-darwin*) @@ -352,6 +419,8 @@ # Darwin sucks eval std_shrext=\"$shrext_cmds\" +disable_libs=no + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -468,7 +537,11 @@ preserve_args="$preserve_args $arg" ;; - --tag) prevopt="--tag" prev=tag ;; + --tag) + prevopt="--tag" + prev=tag + preserve_args="$preserve_args --tag" + ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -500,6 +573,18 @@ exit $EXIT_FAILURE fi +case $disable_libs in +no) + ;; +shared) + build_libtool_libs=no + build_old_libs=yes + ;; +static) + build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + ;; +esac + # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -856,9 +941,9 @@ if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - status=$? - if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $exit_status fi fi @@ -1061,6 +1146,7 @@ no_install=no objs= non_pic_objects= + notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1089,14 +1175,15 @@ if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes - prefer_static_libs=yes break ;; esac @@ -1271,6 +1358,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1354,8 +1446,8 @@ prev= continue ;; - darwin_framework) - compiler_flags="$compiler_flags $arg" + darwin_framework|darwin_framework_skip) + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" prev= @@ -1419,13 +1511,17 @@ continue ;; - -framework|-arch) - prev=darwin_framework - compiler_flags="$compiler_flags $arg" + -framework|-arch|-isysroot) + case " $CC " in + *" ${arg} ${1} "* | *" ${arg} ${1} "*) + prev=darwin_framework_skip ;; + *) compiler_flags="$compiler_flags $arg" + prev=darwin_framework ;; + esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - continue - ;; + continue + ;; -inst-prefix-dir) prev=inst_prefix @@ -1453,7 +1549,8 @@ absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE + absdir="$dir" + notinst_path="$notinst_path $dir" fi dir="$absdir" ;; @@ -1467,10 +1564,15 @@ esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac continue @@ -1479,11 +1581,11 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-mingw* | *-*-os2*) + *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; @@ -1495,6 +1597,15 @@ # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; esac elif test "X$arg" = "X-lc_r"; then case $host in @@ -1522,6 +1633,7 @@ compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" + deplibs="$deplibs $arg" continue ;; @@ -1536,7 +1648,12 @@ # +DA*, +DD* enable 64-bit mode on the HP compiler # -q* pass through compiler args for the IBM compiler # -m* pass through architecture-specific compiler args for GCC - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ + -t[45]*|-txscale*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1548,9 +1665,7 @@ esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi + compiler_flags="$compiler_flags $arg" continue ;; @@ -1788,6 +1903,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1893,9 +2013,9 @@ if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then + exit $exit_status fi fi @@ -1958,7 +2078,6 @@ newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -2012,6 +2131,29 @@ else compiler_flags="$compiler_flags $deplib" fi + + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + ;; + *) + ;; + esac # linkmode + continue ;; -l*) @@ -2194,7 +2336,7 @@ esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot find the library \`$lib'" 1>&2 + $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 exit $EXIT_FAILURE fi @@ -2445,8 +2587,12 @@ fi link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes ; then + use_static_libs=no + fi if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { test "$use_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes @@ -2559,11 +2705,15 @@ if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; *-*-darwin* ) # if the lib is a module then we can not link against # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then + if /usr/bin/file -L $add 2> /dev/null | + $EGREP ": [^:]* bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -3314,9 +3464,9 @@ # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` - deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` done if test -n "$xrpath"; then @@ -3369,7 +3519,12 @@ ;; *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work ;; *) # Add libc to deplibs on all other systems if necessary. @@ -3413,7 +3568,7 @@ int main() { return 0; } EOF $rm conftest - $LTCC -o conftest conftest.c $deplibs + $LTCC $LTCFLAGS -o conftest conftest.c $deplibs if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do @@ -3458,7 +3613,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC -o conftest conftest.c $i + $LTCC $LTCFLAGS -o conftest conftest.c $i # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` @@ -3705,6 +3860,35 @@ deplibs=$newdeplibs fi + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). library_names= old_library= @@ -3788,6 +3972,7 @@ fi lib="$output_objdir/$realname" + linknames= for link do linknames="$linknames $link" @@ -4219,6 +4404,35 @@ ;; esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -4263,10 +4477,15 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac done @@ -4383,10 +4602,22 @@ export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac else - $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac fi fi @@ -4503,16 +4734,32 @@ esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + case $host in + *cygwin* | *mingw* ) + if test -f "$output_objdir/${outputname}.def" ; then + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + else + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + fi + ;; + * ) + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + ;; + esac + ;; + *-*-freebsd*) + # FreeBSD doesn't need this... ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 @@ -4537,7 +4784,7 @@ # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" - status=$? + exit_status=$? # Delete the generated files. if test -n "$dlsyms"; then @@ -4545,7 +4792,7 @@ $run $rm "$output_objdir/${outputname}S.${objext}" fi - exit $status + exit $exit_status fi if test -n "$shlibpath_var"; then @@ -4685,10 +4932,12 @@ esac case $host in *cygwin* | *mingw* ) - cwrappersource=`$echo ${objdir}/lt-${outputname}.c` - cwrapper=`$echo ${output}.exe` - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + output_name=`basename $output` + output_path=`dirname $output` + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $rm $cwrappersource $cwrapper + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 cat > $cwrappersource < #include #include +#include +#include +#include #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4723,16 +4975,20 @@ #endif #ifndef DIR_SEPARATOR -#define DIR_SEPARATOR '/' +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) -#define HAVE_DOS_BASED_FILE_SYSTEM -#ifndef DIR_SEPARATOR_2 -#define DIR_SEPARATOR_2 '\\' +# define HAVE_DOS_BASED_FILE_SYSTEM +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif #endif -#endif #ifndef DIR_SEPARATOR_2 # define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) @@ -4741,17 +4997,32 @@ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) +/* -DDEBUG is fairly common in CFLAGS. */ +#undef DEBUG +#if defined DEBUGWRAPPER +# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) +#else +# define DEBUG(format, ...) +#endif + const char *program_name = NULL; void * xmalloc (size_t num); char * xstrdup (const char *string); -char * basename (const char *name); -char * fnqualify(const char *path); +const char * base_name (const char *name); +char * find_executable(const char *wrapper); +int check_executable(const char *path); char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); @@ -4761,29 +5032,50 @@ char **newargz; int i; - program_name = (char *) xstrdup ((char *) basename (argv[0])); + program_name = (char *) xstrdup (base_name (argv[0])); + DEBUG("(main) argv[0] : %s\n",argv[0]); + DEBUG("(main) program_name : %s\n",program_name); newargz = XMALLOC(char *, argc+2); EOF - cat >> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = fnqualify(argv[0]); + cat >> $cwrappersource <<"EOF" + newargz[1] = find_executable(argv[0]); + if (newargz[1] == NULL) + lt_fatal("Couldn't find %s", argv[0]); + DEBUG("(main) found exe at : %s\n",newargz[1]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newargz[argc+1] = NULL; + + for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" + cat >> $cwrappersource <<"EOF" return 127; } @@ -4804,48 +5096,148 @@ ; } -char * -basename (const char *name) +const char * +base_name (const char *name) { const char *base; #if defined (HAVE_DOS_BASED_FILE_SYSTEM) /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha (name[0]) && name[1] == ':') + if (isalpha ((unsigned char)name[0]) && name[1] == ':') name += 2; #endif for (base = name; *name; name++) if (IS_DIR_SEPARATOR (*name)) base = name + 1; - return (char *) base; + return base; +} + +int +check_executable(const char * path) +{ + struct stat st; + + DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); + if ((!path) || (!*path)) + return 0; + + if ((stat (path, &st) >= 0) && + ( + /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ +#if defined (S_IXOTH) + ((st.st_mode & S_IXOTH) == S_IXOTH) || +#endif +#if defined (S_IXGRP) + ((st.st_mode & S_IXGRP) == S_IXGRP) || +#endif + ((st.st_mode & S_IXUSR) == S_IXUSR)) + ) + return 1; + else + return 0; } +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise */ char * -fnqualify(const char *path) +find_executable (const char* wrapper) { - size_t size; - char *p; + int has_slash = 0; + const char* p; + const char* p_next; + /* static buffer for getcwd */ char tmp[LT_PATHMAX + 1]; + int tmp_len; + char* concat_name; - assert(path != NULL); + DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; - /* Is it qualified already? */ + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + else + { +#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jun 27 14:26:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF11C16A400 for ; Tue, 27 Jun 2006 14:26:52 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 896EA43D6B for ; Tue, 27 Jun 2006 14:26:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id DB5F346CE2 for ; Tue, 27 Jun 2006 10:26:13 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4341B91C64; Tue, 27 Jun 2006 14:25:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3507316A4C2; Tue, 27 Jun 2006 14:25:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA6B516A4A6 for ; Tue, 27 Jun 2006 14:25:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9139343D7E for ; Tue, 27 Jun 2006 14:25:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5REPklH045330 for ; Tue, 27 Jun 2006 14:25:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5REPkU8045327 for perforce@freebsd.org; Tue, 27 Jun 2006 14:25:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 14:25:46 GMT Message-Id: <200606271425.k5REPkU8045327@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 100145 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 14:26:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=100145 Change 100145 by rwatson@rwatson_zoo on 2006/06/27 14:24:50 Integrate OpenBSM 1.0a7 from audit3 userspace to audit3 kernel. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#29 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#18 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#29 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#28 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#29 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.4 2006/06/05 12:55:45 rwatson Exp $ */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#15 (text+ko) ==== @@ -30,13 +30,15 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#14 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#15 $ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.2 2006/06/05 13:00:52 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ +#include /* struct timeval */ + /* * Token type identifiers. */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#18 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#17 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#18 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.3 2006/06/05 13:13:02 rwatson Exp $ */ @@ -618,12 +618,14 @@ token_t *t; u_char *dptr = NULL; - if (tid->at_type == AU_IPv6) - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * - sizeof(u_int32_t)); + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 10 * sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + + 13 * sizeof(u_int32_t)); else - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * - sizeof(u_int32_t)); + return (NULL); ADD_U_CHAR(dptr, AUT_PROCESS32_EX); ADD_U_INT32(dptr, auid); @@ -953,12 +955,14 @@ token_t *t; u_char *dptr = NULL; - if (tid->at_type == AU_IPv6) + if (tid->at_type == AU_IPv4) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); + else if (tid->at_type == AU_IPv6) GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); else - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * - sizeof(u_int32_t)); + return (NULL); ADD_U_CHAR(dptr, AUT_SUBJECT32_EX); ADD_U_INT32(dptr, auid); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jun 27 15:54:39 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E9B316A407 for ; Tue, 27 Jun 2006 15:54:39 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3ABEC449A8 for ; Tue, 27 Jun 2006 15:54:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 515F946CD5 for ; Tue, 27 Jun 2006 11:54:31 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 474565575E; Tue, 27 Jun 2006 15:54:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D82F16A40F; Tue, 27 Jun 2006 15:54:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D9A5F16A407 for ; Tue, 27 Jun 2006 15:54:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC020449C0 for ; Tue, 27 Jun 2006 15:54:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RFsSb3051052 for ; Tue, 27 Jun 2006 15:54:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RFrdlc050950 for perforce@freebsd.org; Tue, 27 Jun 2006 15:53:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 15:53:39 GMT Message-Id: <200606271553.k5RFrdlc050950@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 100149 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 15:54:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=100149 Change 100149 by rwatson@rwatson_zoo on 2006/06/27 15:52:53 Integrate trustedbsd base branch: - much mucking with make world - file update - sendmail update - traceroute icmp support - geli authentication - interface groups - enc, mxge, nfe - ng_tag - sched_core - snd_envy24 - linux emulator updates, including more linux audit support - !COMPAT_43 - ath hal update - xfs update - suser fixes - kernel linker relocked, cleanup - sched_relinquish - tcp syncache cleanup + relock - loop back of audit locking fixes and cleanup, process tokens - conditional giant locking on audit log rotation - sbinsertoob removed, sodealloc hidden - usual plethora of bug fixes, driver updates, etc. Affected files ... .. //depot/projects/trustedbsd/base/Makefile#45 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#73 integrate .. //depot/projects/trustedbsd/base/README#6 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#8 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/cd.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#16 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#24 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.c#14 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-sparc.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/adventure#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/amigaos#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/animation#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/apple#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/archive#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/audio#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/basis#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/bflt#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/bout#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/btsnoop#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/c64#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/cad#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/commands#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/compress#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/console#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/cracklib#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/ctags#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/database#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/diff#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/digital#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/dump#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/elf#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/filesystems#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/flash#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/gnu#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/iff#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/images#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/java#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/linux#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/lisp#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mach#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/macintosh#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mail.news#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/maple#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/msdos#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mup#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/ncr#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/perl#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/printer#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/psion#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/python#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/riff#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/scientific#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sgi#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sql#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/varied.out#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.am#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/aclocal.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/apprentice.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/ascmagic.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/compress.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/config.h.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.man#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/fsmagic.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/funcs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/libmagic.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.man#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.mime#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic2mime#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/patchlevel.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/print.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/softmagic.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pfsync.4#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#20 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/PGPKEYS#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.mc#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/dnsbl.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/enhdnsbl.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfapi.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_header.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/engine.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/bf.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#18 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/envelope.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/helpfile#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mime.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/savemail.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/util.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.1#8 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.8#7 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#14 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#55 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/470.status-named#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/abi#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/auditd#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cached#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ldconfig#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#27 integrate .. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.mc#11 integrate .. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.submit.mc#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#51 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcc_r/Makefile#2 delete .. //depot/projects/trustedbsd/base/lib/libc/gen/glob.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#27 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/tsearch.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strlcpy.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mincore.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/stat.2#12 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/ftp.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libmagic/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libmagic/config.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#27 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaction.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libsdp/sdp.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libsdp/util.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libutil/Makefile#15 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_class.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libutil/pidfile.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/Makefile#13 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#22 integrate .. //depot/projects/trustedbsd/base/release/Makefile#76 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#68 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#102 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#14 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#9 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#25 integrate .. //depot/projects/trustedbsd/base/sbin/ffsinfo/ffsinfo.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/ggatec.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/add.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.h#9 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/label.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/remove.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/show.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#39 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifgroup.c#1 branch .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#19 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifpfsync.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/init/init.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#46 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#40 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#23 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#68 integrate .. //depot/projects/trustedbsd/base/share/man/man4/aac.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#26 integrate .. //depot/projects/trustedbsd/base/share/man/man4/adv.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/adw.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/amd.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/amr.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/auditpipe.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bge.4#17 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bt.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/carp.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cpufreq.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/dpt.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/enc.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/esp.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fast_ipsec.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/iir.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ips.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/share/man/man4/man4.alpha/linux.4#4 delete .. //depot/projects/trustedbsd/base/share/man/man4/man4.alpha/osf1.4#4 delete .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/linux.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/padlock.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mpt.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mxge.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/myri10ge.4#2 delete .. //depot/projects/trustedbsd/base/share/man/man4/ncr.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ncv.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nfe.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_tag.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/nsp.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/re.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sched_4bsd.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sched_core.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/sched_ule.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_csa.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_envy24.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/snd_gusc.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_ich.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_sbc.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/stg.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sym.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/umodem.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uscanner.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uvisor.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vinum.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man5/mailer.conf.5#4 integrate .. //depot/projects/trustedbsd/base/share/man/man7/build.7#13 integrate .. //depot/projects/trustedbsd/base/share/man/man8/rc.subr.8#9 integrate .. //depot/projects/trustedbsd/base/share/man/man9/lock.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/vflush.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/vgone.9#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.README#12 integrate .. //depot/projects/trustedbsd/base/share/monetdef/pt_PT.ISO8859-1.src#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/fpu.c#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/initcpu.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#26 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#29 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#26 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/md_var.h#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/inckern.S#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/locore.S#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#15 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#14 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/files.at91#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/IQ31244#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/KB920X#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SIMICS#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#13 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/assabet_machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_cpu_sa1110.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_dev_sa1110.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/Makefile#16 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_ccb.h#9 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#26 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#21 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#33 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#41 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/kern_ndis.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ndis.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#30 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_proto.h#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscall.h#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscallnames.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sysent.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/syscalls.master#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.arm#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#73 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#101 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#29 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.arm#6 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#63 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#22 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#48 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#72 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#9 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/README#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah.h#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_desc.h#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_devid.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_if.m#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.h#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/version.h#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pfsync.c#14 integrate .. //depot/projects/trustedbsd/base/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_sym.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_panasonic.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_battery.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_thermal.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath_pci.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athioctl.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#54 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus_cis.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/cm/if_cm_isa.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6var.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dcreg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/digi.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_novell.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_edvar.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#52 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwvar.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge.c#3 delete .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/mcp_gen_header.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/myri10ge_mcp.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/driver.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/midi.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/sequencer.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ak452x.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ak452x.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/cmi.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/maestro.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_rate.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/vchan.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umodem.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#52 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#55 integrate .. //depot/projects/trustedbsd/base/sys/dev/wl/if_wl.c#23 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.c#12 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#25 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.h#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_ctl.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_key.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/geom.h#40 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#40 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#25 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#31 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_acl.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_acl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ag.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_arch.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr_sf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_behavior.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_behavior.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bit.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bit.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_btree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_btree.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_buf_item.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_buf_item.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_cap.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_clnt.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_da_btree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_da_btree.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dfrag.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dinode.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_block.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_block.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_data.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_data.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_node.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_node.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_trace.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir_sf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dmapi.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dmops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_error.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_error.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_extfree_item.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_extfree_item.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_fs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_fsops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_fsops.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iget.c#1 branch .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_imap.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode_item.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode_item.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inum.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iocore.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iomap.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iomap.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_itable.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_itable.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log_priv.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log_recover.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_mac.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_macros.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_macros.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_mount.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_mount.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_qmops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_quota.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_refcache.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_refcache.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rename.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rtalloc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rw.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rw.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_sb.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_ail.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_buf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_inode.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_item.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_priv.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_space.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_types.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_utils.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_utils.h#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfsidbg.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakecode.S#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#26 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#55 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#67 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#38 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#64 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#48 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/specialreg.h#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_dummy.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#20 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#37 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/SKI#19 integrate .. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm.h#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_decode.c#4 integrate .. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_extract.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_format.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_int.h#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#60 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#52 integrate .. //depot/projects/trustedbsd/base/sys/isa/isa_common.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#64 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_module.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/link_elf.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/link_elf_obj.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_core.c#1 branch .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_kdb.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_rman.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_msg.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_shm.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cache.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_init.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#76 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#59 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#77 integrate .. //depot/projects/trustedbsd/base/sys/modules/ath_hal/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/geom_bde/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/geom_eli/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_bridge/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/mxge/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/modules/netgraph/Makefile#17 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/tag/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/nfe/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/ppc/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/ak452x/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/envy24/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#41 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.h#18 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#45 integrate .. //depot/projects/trustedbsd/base/sys/net/if.h#26 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net/if_clone.c#7 integrate .. //depot/projects/trustedbsd/base/sys/net/if_enc.c#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_types.h#9 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#38 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#35 integrate .. //depot/projects/trustedbsd/base/sys/net/route.c#24 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/netgraph.h#18 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#26 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_tag.c#1 branch .. //depot/projects/trustedbsd/base/sys/netgraph/ng_tag.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#32 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#40 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#37 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#47 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#62 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_seq.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#40 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#35 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#32 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#28 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#24 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/raw_ip6.c#23 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_input.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ipip.c#12 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvcache.c#10 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfsrvcache.h#6 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/DEFAULTS#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#46 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#35 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_i810.c#22 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rlreg.h#22 integrate .. //depot/projects/trustedbsd/base/sys/posix4/ksched.c#13 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#30 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/mmu_if.m#4 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#53 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/_bus.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/bus.h#23 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/isa/isa.c#14 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sbus/sbus.c#23 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#56 integrate .. //depot/projects/trustedbsd/base/sys/sys/firmware.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/gpt.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/linker.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/protosw.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/rman.h#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/rwlock.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/sched.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#45 integrate .. //depot/projects/trustedbsd/base/sys/sys/sockio.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/sx.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#29 integrate .. //depot/projects/trustedbsd/base/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/trustedbsd/base/sys/vm/pmap.h#30 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#45 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#49 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_meter.c#21 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#34 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#61 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageq.c#19 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/init-a.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-copy.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-data.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-hmac.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/onetime-a.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/geom_eli/onetime.t#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ipw/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ipw/ipwstats.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/mfc/mfc.pl#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#49 integrate .. //depot/projects/trustedbsd/base/usr.bin/file/config.h#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/locate/locate/locate.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/top/machine.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.8#19 integrate .. //depot/projects/trustedbsd/base/usr.sbin/asf/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf.h#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf_kld.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf_kvm.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/asf/asf_prog.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/config/config.y#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/main.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/mkmakefile.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/mkoptions.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/cron/do_command.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/cron/popen.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/jail/jail.8#31 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/mailwrapper.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/mountd.c#15 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#26 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/main.c#16 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/main.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/delete/main.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/main.c#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/global.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/lib.h#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/version/main.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/Makefile.yp#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_server.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/ypinit.8#5 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#45 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.330 2006/05/26 18:10:06 netchild Exp $ +# $FreeBSD: src/Makefile,v 1.334 2006/06/22 16:52:53 imp Exp $ # # The user-driven targets are: # @@ -8,7 +8,7 @@ # buildworld - Rebuild *everything*, including glue to help do # upgrades. # installworld - Install everything built by "buildworld". -# world - buildworld + installworld. +# world - buildworld + installworld, no kernel. # buildkernel - Rebuild the kernel and the kernel-modules. # installkernel - Install the kernel and the kernel-modules. # installkernel.debug @@ -37,7 +37,8 @@ # system, the simple instructions are: # # 1. `cd /usr/src' (or to the directory containing your source tree). -# 2. `make world' +# 2. Define `HISTORICAL_MAKE_WORLD' variable (see README). +# 3. `make world' # # For individuals wanting to upgrade their sources (even if only a # delta of a few days): @@ -46,6 +47,7 @@ # 2. `make buildworld' # 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). # 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# [steps 3. & 4. can be combined by using the "kernel" target] # 5. `reboot' (in single user mode: boot -s from the loader prompt). # 6. `mergemaster -p' # 7. `make installworld' @@ -68,9 +70,9 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # -TGTS= all all-man buildenv buildkernel buildworld check-old checkdpadd \ - clean cleandepend cleandir delete-old delete-old-libs depend \ - distribute distributeworld distrib-dirs distribution doxygen \ +TGTS= all all-man buildenv buildenvvars buildkernel buildworld check-old \ + checkdpadd clean cleandepend cleandir delete-old delete-old-libs \ + depend distribute distributeworld distrib-dirs distribution doxygen \ everything hierarchy install installcheck installkernel \ installkernel.debug reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries lint maninstall \ @@ -204,9 +206,6 @@ @echo "'Rebuilding world', for how to upgrade your system." @echo "Define DESTDIR to where you want to install FreeBSD," @echo "including /, to override this warning and proceed as usual." - @echo "You may get the historical 'make world' behavior by defining" - @echo "HISTORICAL_MAKE_WORLD. You should understand the implications" - @echo "before doing this." @echo "" @echo "Bailing out now..." @false ==== //depot/projects/trustedbsd/base/Makefile.inc1#73 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.547 2006/05/26 18:10:06 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.549 2006/06/06 18:07:58 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -468,6 +468,16 @@ buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} + +# +# We need to have this as a target because the indirection between Makefile +# and Makefile.inc1 causes the correct PATH to be used, rather than a +# modification of the current environment's PATH. In addition, we need +# to quote multiword values. +# +buildenvvars: + @echo ${WMAKEENV:Q} + buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} @cd ${.CURDIR} && env ${WMAKEENV} sh || true ==== //depot/projects/trustedbsd/base/README#6 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $ +$FreeBSD: src/README,v 1.24 2006/06/07 03:33:48 trhodes Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -11,8 +11,13 @@ building components (or all) of the FreeBSD source tree, the most commonly used one being ``world'', which rebuilds and installs everything in the FreeBSD system from the source tree except the -kernel, the kernel-modules and the contents of /etc. The -``buildkernel'' and ``installkernel'' targets build and install +kernel, the kernel-modules and the contents of /etc. The ``world'' +target should only be used in cases where the source tree has not +changed from the currently running version. See: +http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html +for more information, including setting make(1) variables. + +The ``buildkernel'' and ``installkernel'' targets build and install the kernel and the modules (see below). Please see the top of the Makefile in this directory for more information on the standard build targets and compile-time flags. ==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.14 2005/12/13 17:07:52 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.16 2006/06/09 17:03:24 maxim Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -44,6 +44,8 @@ .Nm utility sets discretionary access control information on the specified file(s). +If no files are specified, or the list consists of the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jun 27 16:18:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 841E316A412 for ; Tue, 27 Jun 2006 16:18:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7F1844B56 for ; Tue, 27 Jun 2006 16:18:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 098EA46C08 for ; Tue, 27 Jun 2006 12:18:03 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D0B8555478; Tue, 27 Jun 2006 16:17:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C818016A403; Tue, 27 Jun 2006 16:17:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8666C16A409 for ; Tue, 27 Jun 2006 16:17:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2390A44B56 for ; Tue, 27 Jun 2006 16:17:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RGHxIL062443 for ; Tue, 27 Jun 2006 16:17:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RGGvvc061579 for perforce@freebsd.org; Tue, 27 Jun 2006 16:16:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 27 Jun 2006 16:16:57 GMT Message-Id: <200606271616.k5RGGvvc061579@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 100150 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 16:18:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100150 Change 100150 by rwatson@rwatson_zoo on 2006/06/27 16:16:13 Integrate Trustedbsd audit3 branch from TrustedBSD base branch. Merges changes described in @100149. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#10 integrate .. //depot/projects/trustedbsd/audit3/README#3 integrate .. //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/cd.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/eval.c#6 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/sh.1#7 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/var.c#6 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/var.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/binutils/bfd/elf64-sparc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/ChangeLog#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/adventure#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/amigaos#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/animation#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/apple#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/archive#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/audio#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/basis#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/bflt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/bout#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/btsnoop#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/c64#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/cad#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/commands#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/compress#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/console#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/cracklib#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/database#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/diff#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/digital#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/dump#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/elf#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/filesystems#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/flash#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/gnu#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/iff#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/images#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/java#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/linux#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/mach#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/macintosh#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/mail.news#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/maple#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/msdos#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/mup#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/ncr#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/perl#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/printer#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/psion#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/python#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/riff#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/scientific#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/sgi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/sql#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/varied.out#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Makefile.am#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/apprentice.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/ascmagic.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/compress.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/config.h.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/configure#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/configure.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/file.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/file.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/file.man#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/fsmagic.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/funcs.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/libmagic.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic.man#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic.mime#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic2mime#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/patchlevel.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/print.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/readelf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/readelf.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/softmagic.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/man/pfsync.4#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/PGPKEYS#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/RELEASE_NOTES#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/README#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/submit.cf#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/submit.mc#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/dnsbl.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/enhdnsbl.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/proto.m4#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/version.m4#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/libmilter/mfapi.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_header.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/engine.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/README#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/bf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/collect.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/conf.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/daemon.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/deliver.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/domain.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/envelope.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/headers.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/helpfile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/map.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mci.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mime.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/parseaddr.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/queue.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/savemail.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sendmail.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sfsasl.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sfsasl.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/srvrsmtp.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/tls.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/util.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/version.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/tcpdump.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/traceroute/traceroute.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/traceroute/traceroute.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/config.h#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/loginrec.c#5 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#13 integrate .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/470.status-named#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/abi#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#11 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/cached#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ldconfig#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.subr#8 integrate .. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.mc#4 integrate .. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.submit.mc#3 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#12 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libgcc_r/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/gen/glob.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/tsearch.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/string/strlcpy.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/stat.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libfetch/ftp.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libmagic/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libmagic/config.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_private.h#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_sig.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_sigaction.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libsdp/sdp.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libsdp/util.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/login_class.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/pidfile.c#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftpd/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpcmd.y#4 integrate .. //depot/projects/trustedbsd/audit3/release/Makefile#10 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#9 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/trustedbsd/audit3/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/trustedbsd/audit3/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/devfs/devfs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/fdisk/fdisk.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ffsinfo/ffsinfo.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geli.8#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geom_eli.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ggate/ggatec/ggatec.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/add.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.8#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.h#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/label.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/remove.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/show.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifgroup.c#1 branch .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifpfsync.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/init/init.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw.8#10 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.c#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#12 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/aac.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/acpi.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/adv.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/adw.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/altq.4#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/amd.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/amr.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/bge.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/bt.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/carp.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/cpufreq.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/dpt.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/enc.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/esp.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/fast_ipsec.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/if_bridge.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/iir.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ips.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.alpha/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.alpha/linux.4#2 delete .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.alpha/osf1.4#4 delete .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/linux.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/man4.i386/padlock.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/mpt.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/mxge.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/myri10ge.4#2 delete .. //depot/projects/trustedbsd/audit3/share/man/man4/ncr.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ncv.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/nfe.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_tag.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/nsp.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/re.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/sched_4bsd.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/sched_core.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/sched_ule.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_csa.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_envy24.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_gusc.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_ich.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_sbc.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/stg.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/sym.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/umodem.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uscanner.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uvisor.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/vinum.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/mailer.conf.5#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/build.7#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/rc.subr.8#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/lock.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/vflush.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/vgone.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.README#6 integrate .. //depot/projects/trustedbsd/audit3/share/monetdef/pt_PT.ISO8859-1.src#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/fpu.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/locore.S#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/files.at91#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/KB920X#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pmap.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/uart_cpu_sa1110.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/uart_dev_sa1110.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_ccb.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#16 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_misc.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_proto.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscall.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscallnames.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_sysent.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/syscalls.master#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.arm#8 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#13 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#22 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#8 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.arm#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#10 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.powerpc#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.post.mk#8 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.arm#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/README#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah_desc.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_if.m#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_osdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/freebsd/ah_osdep.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/i386-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/x86_64-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/ath/version.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ddb/db_sym.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_panasonic.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_battery.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_thermal.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athvar.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cardbus/cardbus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cm/if_cm_isa.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cm/smc90cx6var.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/digi/digi.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_novell.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_edvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ipw/if_ipwvar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephy.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_pci.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/if_mxge.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/my/if_my.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/if_myri10ge.c#3 delete .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/if_myri10ge_var.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/mcp_gen_header.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/myri10ge/myri10ge_mcp.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfe.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/re/if_re.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/driver.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/midi/midi.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ak452x.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ak452x.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/cmi.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/envy24.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/envy24.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/es137x.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ich.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/via8233.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/vchan.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ubsec/ubsec.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uplcom.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uscanner.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uvisor.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/procfs/procfs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/udf/udf_vfsops.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_key.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/geom/geom.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_dev.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_gpt.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_io.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#3 delete .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_acl.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_acl.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ag.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_alloc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_alloc.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_arch.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_attr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_attr.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_attr_sf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_behavior.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_behavior.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bit.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bit.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_btree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_btree.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_buf_item.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_buf_item.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_cap.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_clnt.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_da_btree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_da_btree.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dfrag.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dinode.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_block.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_block.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_data.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_data.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_node.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_node.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_trace.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir_sf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dmapi.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dmops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_error.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_error.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_extfree_item.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_extfree_item.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_fs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_fsops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_fsops.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ialloc.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_iget.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_imap.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inode.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inode_item.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inode_item.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inum.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_iocore.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_iomap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_iomap.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_itable.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_itable.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log_priv.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log_recover.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_mac.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_macros.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_macros.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_mount.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_mount.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_qmops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_quota.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_refcache.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_refcache.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rename.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rtalloc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rw.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rw.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_sb.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_ail.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_buf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_inode.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_item.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_priv.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_trans_space.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_types.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_utils.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_utils.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfsidbg.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/NOTES#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/XBOX#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/db_trace.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_dummy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#15 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/conf/SKI#5 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/disasm/disasm.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/disasm/disasm_decode.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/disasm/disasm_extract.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/disasm/disasm_format.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/disasm/disasm_int.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/machdep.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/isa/isa_common.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_clock.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_descrip.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_event.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_ktrace.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_linker.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_module.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_switch.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_synch.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sysctl.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_tc.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/link_elf.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/link_elf_obj.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_core.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/kern/sched_ule.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_bus.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_kdb.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_rman.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_pipe.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sysv_msg.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sysv_sem.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mbuf.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket2.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_init.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/ath_hal/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/geom/geom_bde/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/geom/geom_eli/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_bridge/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/mxge/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/tag/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/nfe/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/ppc/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/sound/driver/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/sound/driver/ak452x/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/sound/driver/envy24/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_clone.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_enc.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/if_types.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_var.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/net/route.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netatalk/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_socket.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_tag.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_tag.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/netinet/if_ether.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_seq.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/ipsec.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/nd6.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/xform_ipip.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvcache.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfsrvcache.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/crypto.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_i810.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_rlreg.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/posix4/ksched.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#33 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_trigger.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/include/_bus.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/include/bus.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/isa/isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sbus/sbus.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/firmware.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/gpt.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/linker.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/protosw.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/rman.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/rwlock.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sched.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/socketvar.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sockio.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sx.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscallsubr.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/pmap.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_fault.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_map.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_meter.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_mmap.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/init-a.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/init.t#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-copy.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-data.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/integrity-hmac.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/onetime-a.t#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/geom_eli/onetime.t#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ipw/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ipw/ipwstats.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/mfc/mfc.pl#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#11 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/file/config.h#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/locate/locate/locate.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/top/machine.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/adduser/adduser.8#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf.h#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf_kld.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf_kvm.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/asf/asf_prog.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/config/config.y#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/main.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/mkmakefile.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/mkoptions.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/cron/cron/do_command.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/cron/cron/popen.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/jail/jail.8#8 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mailwrapper/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mailwrapper/mailwrapper.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mountd/mountd.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/newsyslog/newsyslog.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/main.c#8 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/create/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/delete/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/info/main.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/global.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/lib.h#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/version/main.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ypserv/Makefile.yp#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ypserv/yp_server.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ypserv/ypinit.8#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.330 2006/05/26 18:10:06 netchild Exp $ +# $FreeBSD: src/Makefile,v 1.334 2006/06/22 16:52:53 imp Exp $ # # The user-driven targets are: # @@ -8,7 +8,7 @@ # buildworld - Rebuild *everything*, including glue to help do # upgrades. # installworld - Install everything built by "buildworld". -# world - buildworld + installworld. +# world - buildworld + installworld, no kernel. # buildkernel - Rebuild the kernel and the kernel-modules. # installkernel - Install the kernel and the kernel-modules. # installkernel.debug @@ -37,7 +37,8 @@ # system, the simple instructions are: # # 1. `cd /usr/src' (or to the directory containing your source tree). -# 2. `make world' +# 2. Define `HISTORICAL_MAKE_WORLD' variable (see README). +# 3. `make world' # # For individuals wanting to upgrade their sources (even if only a # delta of a few days): @@ -46,6 +47,7 @@ # 2. `make buildworld' # 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). # 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# [steps 3. & 4. can be combined by using the "kernel" target] # 5. `reboot' (in single user mode: boot -s from the loader prompt). # 6. `mergemaster -p' # 7. `make installworld' @@ -68,9 +70,9 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # -TGTS= all all-man buildenv buildkernel buildworld check-old checkdpadd \ - clean cleandepend cleandir delete-old delete-old-libs depend \ - distribute distributeworld distrib-dirs distribution doxygen \ +TGTS= all all-man buildenv buildenvvars buildkernel buildworld check-old \ + checkdpadd clean cleandepend cleandir delete-old delete-old-libs \ + depend distribute distributeworld distrib-dirs distribution doxygen \ everything hierarchy install installcheck installkernel \ installkernel.debug reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries lint maninstall \ @@ -204,9 +206,6 @@ @echo "'Rebuilding world', for how to upgrade your system." @echo "Define DESTDIR to where you want to install FreeBSD," @echo "including /, to override this warning and proceed as usual." - @echo "You may get the historical 'make world' behavior by defining" - @echo "HISTORICAL_MAKE_WORLD. You should understand the implications" - @echo "before doing this." @echo "" @echo "Bailing out now..." @false ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.547 2006/05/26 18:10:06 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.549 2006/06/06 18:07:58 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -468,6 +468,16 @@ buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} + +# +# We need to have this as a target because the indirection between Makefile +# and Makefile.inc1 causes the correct PATH to be used, rather than a +# modification of the current environment's PATH. In addition, we need +# to quote multiword values. +# +buildenvvars: + @echo ${WMAKEENV:Q} + buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} @cd ${.CURDIR} && env ${WMAKEENV} sh || true ==== //depot/projects/trustedbsd/audit3/README#3 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $ +$FreeBSD: src/README,v 1.24 2006/06/07 03:33:48 trhodes Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -11,8 +11,13 @@ building components (or all) of the FreeBSD source tree, the most commonly used one being ``world'', which rebuilds and installs everything in the FreeBSD system from the source tree except the -kernel, the kernel-modules and the contents of /etc. The -``buildkernel'' and ``installkernel'' targets build and install +kernel, the kernel-modules and the contents of /etc. The ``world'' +target should only be used in cases where the source tree has not +changed from the currently running version. See: +http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html +for more information, including setting make(1) variables. + +The ``buildkernel'' and ``installkernel'' targets build and install the kernel and the modules (see below). Please see the top of the Makefile in this directory for more information on the standard build targets and compile-time flags. ==== //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.1#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.14 2005/12/13 17:07:52 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.16 2006/06/09 17:03:24 maxim Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -44,6 +44,8 @@ .Nm utility sets discretionary access control information on the specified file(s). +If no files are specified, or the list consists of the +only "-", the file names are taken from the standard input. .Pp The following options are available: .Bl -tag -width indent ==== //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.11 2005/02/09 17:37:39 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.12 2006/06/09 16:09:26 kib Exp $"); #include #include @@ -109,6 +109,7 @@ int local_error, carried_error, ch, i; struct sf_file *file; struct sf_entry *entry; + const char *fn_dup; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jun 27 16:27:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C57C216A409 for ; Tue, 27 Jun 2006 16:27:54 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9C4C44B6D for ; Tue, 27 Jun 2006 16:27:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6C63746CFC for ; Tue, 27 Jun 2006 12:27:45 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2CA295B25A; Tue, 27 Jun 2006 16:27:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2457616A40B; Tue, 27 Jun 2006 16:27:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00E2D16A403 for ; Tue, 27 Jun 2006 16:27:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9A7444B5A for ; Tue, 27 Jun 2006 16:27:10 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RGRAjX067430 for ; Tue, 27 Jun 2006 16:27:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RGRAsR067427 for perforce@freebsd.org; Tue, 27 Jun 2006 16:27:10 GMT (envelope-from millert@freebsd.org) Date: Tue, 27 Jun 2006 16:27:10 GMT Message-Id: <200606271627.k5RGRAsR067427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 100151 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 16:27:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=100151 Change 100151 by millert@millert_g4tower on 2006/06/27 16:26:16 Remove unneeded file. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/Makefile.orig#2 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jun 27 16:29:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BFF616A4DE for ; Tue, 27 Jun 2006 16:29:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 164AC43DB4 for ; Tue, 27 Jun 2006 15:56:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9880B46CD1 for ; Tue, 27 Jun 2006 11:56:01 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0BE9357421; Tue, 27 Jun 2006 15:56:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A6116A531; Tue, 27 Jun 2006 15:56:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B678B16A50D for ; Tue, 27 Jun 2006 15:56:00 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AF15446C7 for ; Tue, 27 Jun 2006 15:27:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5RFR2q0049562 for ; Tue, 27 Jun 2006 15:27:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5RFR265049559 for perforce@freebsd.org; Tue, 27 Jun 2006 15:27:02 GMT (envelope-from millert@freebsd.org) Date: Tue, 27 Jun 2006 15:27:02 GMT Message-Id: <200606271527.k5RFR265049559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 100147 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2006 16:29:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100147 Change 100147 by millert@millert_ibook on 2006/06/27 15:27:01 Add security.mac.sebsd.mls sysctl Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#10 (text+ko) ==== @@ -368,6 +368,8 @@ SYSCTL_INT(_security_mac_sebsd, OID_AUTO, verbose, CTLFLAG_RW, &sebsd_verbose, 0, " SEBSD Verbose Debug Stuff"); +SYSCTL_INT(_security_mac_sebsd, OID_AUTO, mls, CTLFLAG_RD, + &selinux_mls_enabled, 0, " SEBSD MLS enabled"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, sids, CTLTYPE_STRING|CTLFLAG_RD, NULL, 0, sysctl_list_sids, "A", "SEBSD SIDs"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, user_sids, CTLTYPE_STRING | @@ -403,4 +405,5 @@ sysctl_register_oid(&sysctl__security_mac_sebsd_auditing); sysctl_register_oid(&sysctl__security_mac_sebsd_enforcing); sysctl_register_oid(&sysctl__security_mac_sebsd_policyvers); + sysctl_register_oid(&sysctl__security_mac_sebsd_mls); } From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 30 01:26:47 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D8AE16A573 for ; Fri, 30 Jun 2006 01:26:47 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10F8443D64 for ; Fri, 30 Jun 2006 01:26:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7C0EA46C56 for ; Thu, 29 Jun 2006 21:26:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D0A2755A5B; Fri, 30 Jun 2006 01:26:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C553B16A4E6; Fri, 30 Jun 2006 01:26:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9FEF516A4E0 for ; Fri, 30 Jun 2006 01:26:37 +0000 (UTC) (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 B96C244746 for ; Fri, 30 Jun 2006 00:59:58 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5U0xwIp047682 for ; Fri, 30 Jun 2006 00:59:58 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5U0xwvZ047679 for perforce@freebsd.org; Fri, 30 Jun 2006 00:59:58 GMT (envelope-from wsalamon@computer.org) Date: Fri, 30 Jun 2006 00:59:58 GMT Message-Id: <200606300059.k5U0xwvZ047679@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 100324 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jun 2006 01:26:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=100324 Change 100324 by wsalamon@vh3 on 2006/06/30 00:59:30 When creating subejct32_ex or process32_ex tokens, assert that we have a known address type. However, anyting but AU_IPv6 will get 4 bytes of the address written. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#20 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#20 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#19 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#20 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.4 2006/06/17 13:53:04 wsalamon Exp $ */ @@ -618,14 +618,14 @@ token_t *t; u_char *dptr = NULL; - if (tid->at_type == AU_IPv4) - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + - 10 * sizeof(u_int32_t)); - else if (tid->at_type == AU_IPv6) - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + - 13 * sizeof(u_int32_t)); + KASSERT((tid->at_type == AU_IPv4) || (tid->at_type == AU_IPv6), + ("au_to_process32_ex: type %u", (unsigned int)tid->at_type)); + if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * + sizeof(u_int32_t)); else - return (NULL); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); ADD_U_CHAR(dptr, AUT_PROCESS32_EX); ADD_U_INT32(dptr, auid); @@ -955,14 +955,14 @@ token_t *t; u_char *dptr = NULL; - if (tid->at_type == AU_IPv4) - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * - sizeof(u_int32_t)); - else if (tid->at_type == AU_IPv6) + KASSERT((tid->at_type == AU_IPv4) || (tid->at_type == AU_IPv6), + ("au_to_subject32_ex: type %u", (unsigned int)tid->at_type)); + if (tid->at_type == AU_IPv6) GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); else - return (NULL); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); ADD_U_CHAR(dptr, AUT_SUBJECT32_EX); ADD_U_INT32(dptr, auid); From owner-trustedbsd-cvs@FreeBSD.ORG Fri Jun 30 18:30:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62CD616A40F for ; Fri, 30 Jun 2006 18:30:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 191F443D88 for ; Fri, 30 Jun 2006 18:30:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4B29146C50 for ; Fri, 30 Jun 2006 14:30:29 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DFE037358C; Fri, 30 Jun 2006 18:29:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A05B216A5C3; Fri, 30 Jun 2006 18:29:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A20A16A5B5 for ; Fri, 30 Jun 2006 18:29:30 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 845BB43D53 for ; Fri, 30 Jun 2006 18:29:29 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5UITTwb069499 for ; Fri, 30 Jun 2006 18:29:29 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5UITTkk069496 for perforce@freebsd.org; Fri, 30 Jun 2006 18:29:29 GMT (envelope-from deker@FreeBSD.org) Date: Fri, 30 Jun 2006 18:29:29 GMT Message-Id: <200606301829.k5UITTkk069496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 100357 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jun 2006 18:30:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=100357 Change 100357 by deker@sebsd_build on 2006/06/30 18:28:37 Update install instructions to include use of tunefs to enable multilabel support. Affected files ... .. //depot/projects/trustedbsd/sebsd/SEBSD-Installation.txt#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/SEBSD-Installation.txt#5 (text+ko) ==== @@ -41,13 +41,24 @@ # pkg_add -r gmake -3. Install SEBSD sources. After downloading the sources from +3. Enable multilabel support on filesystems. In order for the SEBSD file + labeling to function properly, file label support must be enabled. To + enable multilabel support on your system, boot into single user mode + and use 'tunefs' to enable multilabel support for each filesystem on + your system. Here is an example for /. + + # tunefs -l enable / + + Repeat this step, substituting each other filesystem in place of / as + above. + +4. Install SEBSD sources. After downloading the sources from http://www.trustedbsd.org/sebsd.html, untar them into /usr/src. # cd /usr/src # tar -zxf /path/to/sebsd-.tar.gz -4. Build the SEBSD system. This process is similar to the canonical +5. Build the SEBSD system. This process is similar to the canonical building of world detailed in the FreeBSD Handbook, with a few additional steps, and some re-arranging of the typical order. @@ -85,7 +96,7 @@ the FreeBSD boot loader. Refer to the FreeBSD handbook for more information on the boot loader. -5. Inspect the SEBSD policy. The system comes pre-installed with a +6. Inspect the SEBSD policy. The system comes pre-installed with a sample policy, but local changes might be required. The policy source is located in /etc/security/sebsd/targeted/src/policy and the compiled (binary) version is installed in @@ -108,17 +119,16 @@ /usr/sbin/load_policy /etc/security/sebsd/targeted/policy/policy.20 -6. Label the file system. In step 4b, extended attribute support was - enabled in the fstab file , but the individual filesystems were not - labeled. To label all file systems, login as root and run the - following command: +7. Label the file system. In step 3, extended attribute support was + enabled, but the individual filesystems were not labeled. To label all + file systems, login as root and run the following command: cd /etc/security/sebsd/targeted/src/policy && gmake relabel Note that you will see several errors during the relabel process as well as many permission denials on the system console. This is normal. -7. Reboot the machine, so that applications can use the file labels +8. Reboot the machine, so that applications can use the file labels and will be started in the correct domains. At this point, the machine will be running SEBSD with the sample From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jul 3 12:42:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFDC616A5C5 for ; Mon, 3 Jul 2006 12:42:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED70743D45 for ; Mon, 3 Jul 2006 12:42:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E224F46B8A for ; Mon, 3 Jul 2006 08:42:51 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D7A0256C37; Mon, 3 Jul 2006 12:42:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CDC8E16A4A7; Mon, 3 Jul 2006 12:42:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A5CF516A52E for ; Mon, 3 Jul 2006 12:42:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 015E243E74 for ; Mon, 3 Jul 2006 12:42:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k63CgkN2079758 for ; Mon, 3 Jul 2006 12:42:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k63CgiDf079755 for perforce@freebsd.org; Mon, 3 Jul 2006 12:42:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 3 Jul 2006 12:42:44 GMT Message-Id: <200607031242.k63CgiDf079755@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 100493 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jul 2006 12:42:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=100493 Change 100493 by rwatson@rwatson_zoo on 2006/07/03 12:42:02 Integrate TrustedBSD base branch: - OpenBSM 1.0 alpha 7 loopback. - More MPSAFE system calls, almost the default. - More ARMishness. - Linuxulator enhancements, de-stack-gap. - Normal plethora of driver enhancements, bug fixes, etc. - INPLOOKUP_WILDCARD. - ifaddr and if_addrlist sanitization. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#39 integrate .. //depot/projects/trustedbsd/base/UPDATING#67 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/VERSION#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_record.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_notify.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/trustedbsd/base/include/malloc_np.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#28 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#103 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nfe.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_netflow.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_tag.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sched_core.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uplcom.4#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#30 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#34 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ipc.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_util.h#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_ipc.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_proto.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscall.h#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscallnames.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sysent.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/syscalls.master#8 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#36 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.mk#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#35 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#55 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/CHANGELOG.TXT#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispmbox.h#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispreg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/ispfw/asm_2322.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ispfw/ispfw.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/acphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/amphy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/bmtphy.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ciphy.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/e1000phy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/exphy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/inphy.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/lxtphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/mii_physubr.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/mlphy.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/nsgphy.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/nsphy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/pnaphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/qsphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rlphy.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ruephy.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/tdkphy.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/tlphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ukphy.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/xmphy.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_cfg.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_pccard.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#44 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#53 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#29 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#15 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#65 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#23 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#21 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/emulate.c#1 branch .. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#40 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/md_var.h#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_core.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#49 integrate .. //depot/projects/trustedbsd/base/sys/modules/bktr/bktr_mem/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/streams/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/svr4/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#46 integrate .. //depot/projects/trustedbsd/base/sys/net/if_atmsubr.c#21 integrate .. //depot/projects/trustedbsd/base/sys/net/if_enc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#33 integrate .. //depot/projects/trustedbsd/base/sys/net/if_stf.c#29 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#33 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#36 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#33 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#41 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#31 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#48 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#46 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#63 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_cksum.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_var.h#13 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/bootp_subr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_diskless.c#15 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rlreg.h#23 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/mmu_oea.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#17 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/extern.h#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/forward.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/tail.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/tail.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kgmon/kgmon.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#27 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/config.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/connect.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/debug.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/list.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/main.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/mkpeer.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/msg.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/name.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/rmhook.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/show.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/shutdown.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/status.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/types.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/write.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#39 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.135 2006/06/03 01:52:11 scottl Exp $ +$FreeBSD: src/MAINTAINERS,v 1.136 2006/07/01 10:51:54 markm Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -35,10 +35,6 @@ NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. -telnet markm Heads-up appreciated. Try not to break it. -secure/* markm Heads-up appreciated. Try not to break it. -kerberos5 nectar Pre-commit review requested. -heimdal nectar Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -91,8 +87,6 @@ libufs jmallett Willing to handle problems, help with work. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. -libc nectar Opportuntity for pre-commit review appreciated for - nsdispatch(3) and its consumers. unifdef(1) fanf Pre-commit review requested. ntp roberto Pre-commit review requested. inetd dwmalone Recommends pre-commit review. @@ -147,12 +141,7 @@ games/fortune/datfiles/Makefile:MAINTAINER= jkh gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch sbin/dhclient/Makefile.inc:MAINTAINER= mbr -sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org -sys/dev/bktr/CHANGELOG.TXT: * MAINTAINER = Roger Hardiman sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org -sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org -sys/modules/streams/Makefile:MAINTAINER= newton@atdot.dotat.org -sys/modules/svr4/Makefile:MAINTAINER= newton@FreeBSD.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org usr.bin/locate/Makefile:MAINTAINER= wosch ==== //depot/projects/trustedbsd/base/UPDATING#67 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20060627: + The XBOX kernel now defaults to the nfe(4) driver instead of + the nve(4) driver. Please update your configuration + accordingly. + 20060511: The machdep.* sysctls and the adjkerntz utility have been modified a bit. The new adjkerntz utility uses the new @@ -580,4 +585,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.449 2006/05/15 15:47:45 keramida Exp $ +$FreeBSD: src/UPDATING,v 1.450 2006/06/27 20:22:32 rink Exp $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#4 (text) ==== @@ -30,15 +30,15 @@ Normally, the CVS vendor import goes along the following lines: cd ~/p4/projects/trustedbsd/openbsm - cvs -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import src/contrib/openbsm \ - TrustedBSD OPENBSM_1_0_ALPHA_1 + cvs -n -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import \ + src/contrib/openbsm TrustedBSD OPENBSM_1_0_ALPHA_1 -Replacing the version string as required. Use the "-n" argument to CVS to -do a test run. +Replacing the version string as required. Remove the "-n" argument once +the import is tested in order to perform the actual import. Propagation of changes to src/sys/{bsm,security/audit} is something that requires careful coordination and attention to detail. These files are not on CVS vendor branches, but do have the same local vs. vendor merge issues. -$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.4 2006/03/05 13:30:37 rwatson Exp $ +$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.5 2006/06/27 17:55:38 rwatson Exp $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#3 (text) ==== @@ -1,3 +1,13 @@ +OpenBSM 1.0 alpha 7 + +- Adopted Solaris-compatible format for subject32_ex and subject64_ex + tokens, which previously did not correctly implement variable length + address storage. +- Prefer inttypes.h to stdint.h; enhance queue.h detection to test for + TAILQ_FOREACH_SAFE(), which is present in recent BSD queue.h's, but not + older ones. OpenBSM now builds on some FreeBSD 4.x version. +- New event types for extended attributes, ACLs, and scheduling. + OpenBSM 1.0 alpha 6 - Use AU_TO_WRITE and AU_NO_TO_WRITE for the 'keep' argument to au_close(); @@ -165,4 +175,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#12 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#15 $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/VERSION#3 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_6 +OPENBSM_1_0_ALPHA_7 ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_kevents.h#2 (text) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#38 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -383,7 +383,24 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_SYSARCH 406 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ +#define AUE_SYSARCH 410 /* FreeBSD. */ +#define AUE_EXTATTRCTL 411 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_record.h#3 (text) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#19 $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ +#include /* struct timeval */ + /* * Token type identifiers. */ ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#5 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#20 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#21 $ */ #ifndef _LIBBSM_H_ @@ -43,7 +43,7 @@ #include #include -#include /* Required for audit.h. */ +#include /* Required for audit.h. */ #include /* Required for clock_t on Linux. */ #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/config/ltmain.sh#2 (text) ==== @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.20 -TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)" +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -132,6 +132,8 @@ show="$echo" show_help= execute_dlfiles= +duplicate_deps=no +preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -139,6 +141,43 @@ # Shell function definitions: # This seems to be the best place for them +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $mkdir "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || { + $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 + exit $EXIT_FAILURE + } + fi + + $echo "X$my_tmpdir" | $Xsed +} + + # func_win32_libid arg # return the library type of file 'arg' # @@ -157,12 +196,11 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` - if test "X$win32_nmres" = "Ximport" ; then - win32_libid_type="x86 archive import" - else - win32_libid_type="x86 archive static" - fi + $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac fi ;; *DLL*) @@ -188,6 +226,20 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { + # FreeBSD-specific: where we install compilers with non-standard names + tag_compilers_CC="*cc cc* *gcc gcc*" + tag_compilers_CXX="*c++ c++* *g++ g++*" + base_compiler=`set -- "$@"; echo $1` + + # If $tagname isn't set, then try to infer if the default "CC" tag applies + if test -z "$tagname"; then + for zp in $tag_compilers_CC; do + case $base_compiler in + $zp) tagname="CC"; break;; + esac + done + fi + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -228,7 +280,22 @@ break ;; esac - fi + + # FreeBSD-specific: try compilers based on inferred tag + if test -z "$tagname"; then + eval "tag_compilers=\$tag_compilers_${z}" + if test -n "$tag_compilers"; then + for zp in $tag_compilers; do + case $base_compiler in + $zp) tagname=$z; break;; + esac + done + if test -n "$tagname"; then + break + fi + fi + fi + fi done # If $tagname still isn't set, then no tagged configuration # was found and let the user know that the "--tag" command @@ -295,9 +362,9 @@ $run ${rm}r "$my_xdir" $show "$mkdir $my_xdir" $run $mkdir "$my_xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$my_xdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then + exit $exit_status fi case $host in *-darwin*) @@ -352,6 +419,8 @@ # Darwin sucks eval std_shrext=\"$shrext_cmds\" +disable_libs=no + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -468,7 +537,11 @@ preserve_args="$preserve_args $arg" ;; - --tag) prevopt="--tag" prev=tag ;; + --tag) + prevopt="--tag" + prev=tag + preserve_args="$preserve_args --tag" + ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -500,6 +573,18 @@ exit $EXIT_FAILURE fi +case $disable_libs in +no) + ;; +shared) + build_libtool_libs=no + build_old_libs=yes + ;; +static) + build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + ;; +esac + # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -856,9 +941,9 @@ if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - status=$? - if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $exit_status fi fi @@ -1061,6 +1146,7 @@ no_install=no objs= non_pic_objects= + notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1089,14 +1175,15 @@ if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes - prefer_static_libs=yes break ;; esac @@ -1271,6 +1358,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1354,8 +1446,8 @@ prev= continue ;; - darwin_framework) - compiler_flags="$compiler_flags $arg" + darwin_framework|darwin_framework_skip) + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" prev= @@ -1419,13 +1511,17 @@ continue ;; - -framework|-arch) - prev=darwin_framework - compiler_flags="$compiler_flags $arg" + -framework|-arch|-isysroot) + case " $CC " in + *" ${arg} ${1} "* | *" ${arg} ${1} "*) + prev=darwin_framework_skip ;; + *) compiler_flags="$compiler_flags $arg" + prev=darwin_framework ;; + esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - continue - ;; + continue + ;; -inst-prefix-dir) prev=inst_prefix @@ -1453,7 +1549,8 @@ absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE + absdir="$dir" + notinst_path="$notinst_path $dir" fi dir="$absdir" ;; @@ -1467,10 +1564,15 @@ esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac continue @@ -1479,11 +1581,11 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-mingw* | *-*-os2*) + *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; @@ -1495,6 +1597,15 @@ # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; esac elif test "X$arg" = "X-lc_r"; then case $host in @@ -1522,6 +1633,7 @@ compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" + deplibs="$deplibs $arg" continue ;; @@ -1536,7 +1648,12 @@ # +DA*, +DD* enable 64-bit mode on the HP compiler # -q* pass through compiler args for the IBM compiler # -m* pass through architecture-specific compiler args for GCC - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ + -t[45]*|-txscale*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1548,9 +1665,7 @@ esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi + compiler_flags="$compiler_flags $arg" continue ;; @@ -1788,6 +1903,11 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1893,9 +2013,9 @@ if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then + exit $exit_status fi fi @@ -1958,7 +2078,6 @@ newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -2012,6 +2131,29 @@ else compiler_flags="$compiler_flags $deplib" fi + + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + ;; + *) + ;; + esac # linkmode + continue ;; -l*) @@ -2194,7 +2336,7 @@ esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot find the library \`$lib'" 1>&2 + $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 exit $EXIT_FAILURE fi @@ -2445,8 +2587,12 @@ fi link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes ; then + use_static_libs=no + fi if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { test "$use_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes @@ -2559,11 +2705,15 @@ if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; *-*-darwin* ) # if the lib is a module then we can not link against # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then + if /usr/bin/file -L $add 2> /dev/null | + $EGREP ": [^:]* bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -3314,9 +3464,9 @@ # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` - deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` done if test -n "$xrpath"; then @@ -3369,7 +3519,12 @@ ;; *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work ;; *) # Add libc to deplibs on all other systems if necessary. @@ -3413,7 +3568,7 @@ int main() { return 0; } EOF $rm conftest - $LTCC -o conftest conftest.c $deplibs + $LTCC $LTCFLAGS -o conftest conftest.c $deplibs if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do @@ -3458,7 +3613,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC -o conftest conftest.c $i + $LTCC $LTCFLAGS -o conftest conftest.c $i # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` @@ -3705,6 +3860,35 @@ deplibs=$newdeplibs fi + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). library_names= old_library= @@ -3788,6 +3972,7 @@ fi lib="$output_objdir/$realname" + linknames= for link do linknames="$linknames $link" @@ -4219,6 +4404,35 @@ ;; esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -4263,10 +4477,15 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac done @@ -4383,10 +4602,22 @@ export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac else - $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac fi fi @@ -4503,16 +4734,32 @@ esac >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jul 3 14:01:13 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D60E16A416 for ; Mon, 3 Jul 2006 14:01:13 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB0EE43D45 for ; Mon, 3 Jul 2006 14:01:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1F4E146BC9 for ; Mon, 3 Jul 2006 10:01:08 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E8D4556AA4; Mon, 3 Jul 2006 14:01:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E75AF16A416; Mon, 3 Jul 2006 14:01:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C004C16A40F for ; Mon, 3 Jul 2006 14:01:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB4F243D46 for ; Mon, 3 Jul 2006 14:01: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.6/8.13.6) with ESMTP id k63E1609093541 for ; Mon, 3 Jul 2006 14:01:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k63E13Y8093536 for perforce@freebsd.org; Mon, 3 Jul 2006 14:01:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 3 Jul 2006 14:01:03 GMT Message-Id: <200607031401.k63E13Y8093536@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 100497 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jul 2006 14:01:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=100497 Change 100497 by rwatson@rwatson_zoo on 2006/07/03 14:00:08 Integrate TrustedBSD audit3 branch; see change @100493 for a summary of changes. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#9 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#22 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#17 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#4 integrate .. //depot/projects/trustedbsd/audit3/include/malloc_np.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#9 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/nfe.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_netflow.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_tag.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/sched_core.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uplcom.4#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#19 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_ipc.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_ipc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_proto.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscall.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscallnames.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_sysent.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/syscalls.master#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.ia64#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.mk#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-cd.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bktr/CHANGELOG.TXT#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispmbox.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispreg.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispvar.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ispfw/asm_2322.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ispfw/ispfw.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/acphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/amphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/bmtphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/ciphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/e1000phy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/exphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/inphy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/lxtphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/mii_physubr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/mlphy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/nsgphy.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/nsphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/pnaphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/qsphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephy.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/rlphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/ruephy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/tdkphy.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/tlphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/ukphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/xmphy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/puc.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/puc_cfg.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/puc_pccard.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/puc_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/re/if_re.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sio/sio.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uplcom.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/XBOX#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#16 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/emulate.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/trap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/include/md_var.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_core.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#35 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sysv_sem.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/bktr/bktr_mem/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/streams/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/svr4/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_atmsubr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_gif.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_stf.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_tun.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/if_ether.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_divert.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_output.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6_cksum.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6_pcb.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_diskless.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_rlreg.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tail/extern.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tail/forward.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tail/tail.1#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tail/tail.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/kgmon/kgmon.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/newsyslog/newsyslog.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/config.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/connect.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/debug.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/list.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/mkpeer.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/msg.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/name.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/rmhook.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/show.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/shutdown.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/status.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/types.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/write.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/MAINTAINERS#9 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.135 2006/06/03 01:52:11 scottl Exp $ +$FreeBSD: src/MAINTAINERS,v 1.136 2006/07/01 10:51:54 markm Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -35,10 +35,6 @@ NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. -telnet markm Heads-up appreciated. Try not to break it. -secure/* markm Heads-up appreciated. Try not to break it. -kerberos5 nectar Pre-commit review requested. -heimdal nectar Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -91,8 +87,6 @@ libufs jmallett Willing to handle problems, help with work. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. -libc nectar Opportuntity for pre-commit review appreciated for - nsdispatch(3) and its consumers. unifdef(1) fanf Pre-commit review requested. ntp roberto Pre-commit review requested. inetd dwmalone Recommends pre-commit review. @@ -147,12 +141,7 @@ games/fortune/datfiles/Makefile:MAINTAINER= jkh gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch sbin/dhclient/Makefile.inc:MAINTAINER= mbr -sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org -sys/dev/bktr/CHANGELOG.TXT: * MAINTAINER = Roger Hardiman sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org -sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org -sys/modules/streams/Makefile:MAINTAINER= newton@atdot.dotat.org -sys/modules/svr4/Makefile:MAINTAINER= newton@FreeBSD.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org usr.bin/locate/Makefile:MAINTAINER= wosch ==== //depot/projects/trustedbsd/audit3/UPDATING#11 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20060627: + The XBOX kernel now defaults to the nfe(4) driver instead of + the nve(4) driver. Please update your configuration + accordingly. + 20060511: The machdep.* sysctls and the adjkerntz utility have been modified a bit. The new adjkerntz utility uses the new @@ -580,4 +585,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.449 2006/05/15 15:47:45 keramida Exp $ +$FreeBSD: src/UPDATING,v 1.450 2006/06/27 20:22:32 rink Exp $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#6 (text) ==== @@ -30,15 +30,15 @@ Normally, the CVS vendor import goes along the following lines: cd ~/p4/projects/trustedbsd/openbsm - cvs -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import src/contrib/openbsm \ - TrustedBSD OPENBSM_1_0_ALPHA_1 + cvs -n -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import \ + src/contrib/openbsm TrustedBSD OPENBSM_1_0_ALPHA_1 -Replacing the version string as required. Use the "-n" argument to CVS to -do a test run. +Replacing the version string as required. Remove the "-n" argument once +the import is tested in order to perform the actual import. Propagation of changes to src/sys/{bsm,security/audit} is something that requires careful coordination and attention to detail. These files are not on CVS vendor branches, but do have the same local vs. vendor merge issues. -$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.4 2006/03/05 13:30:37 rwatson Exp $ +$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.5 2006/06/27 17:55:38 rwatson Exp $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#6 (text+ko) ==== @@ -175,4 +175,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#5 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#6 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#9 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#22 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#21 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#22 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#11 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#11 $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#13 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#12 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#13 $ */ #ifndef _LIBBSM_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#7 (xtext) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#7 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a7], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#6 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#7 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#13 (text+ko) ==== @@ -1,6 +1,6 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#12 $ -# $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.2 2006/03/26 01:44:35 rwatson Exp $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#13 $ +# $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.3 2006/06/27 18:09:54 rwatson Exp $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#11 $ */ /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#17 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#16 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#17 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#7 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#8 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#3 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#4 $ */ /* ==== //depot/projects/trustedbsd/audit3/include/malloc_np.h#2 (text) ==== @@ -26,12 +26,16 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/include/malloc_np.h,v 1.1 2006/03/28 22:16:03 jasone Exp $ + * $FreeBSD: src/include/malloc_np.h,v 1.2 2006/06/30 20:57:41 jasone Exp $ */ #ifndef _MALLOC_NP_H_ #define _MALLOC_NP_H_ +#include +#include +__BEGIN_DECLS size_t malloc_usable_size(const void *ptr); +__END_DECLS #endif /* _MALLOC_NP_H_ */ ==== //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#9 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.127 2006/06/20 20:38:25 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.129 2006/07/01 16:51:10 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -659,9 +659,6 @@ * Data. */ -/* Used as a special "nil" return value for malloc(0). */ -static const int nil; - /* Number of CPUs. */ static unsigned ncpus; @@ -1565,82 +1562,82 @@ static inline void arena_run_reg_dalloc(arena_run_t *run, arena_bin_t *bin, void *ptr, size_t size) { + /* + * To divide by a number D that is not a power of two we multiply + * by (2^21 / D) and then right shift by 21 positions. + * + * X / D + * + * becomes + * + * (size_invs[(D >> QUANTUM_2POW_MIN) - 3] * D) >> SIZE_INV_SHIFT + */ +#define SIZE_INV_SHIFT 21 +#define SIZE_INV(s) (((1 << SIZE_INV_SHIFT) / (s << QUANTUM_2POW_MIN)) + 1) + static const unsigned size_invs[] = { + SIZE_INV(3), + SIZE_INV(4), SIZE_INV(5), SIZE_INV(6), SIZE_INV(7), + SIZE_INV(8), SIZE_INV(9), SIZE_INV(10), SIZE_INV(11), + SIZE_INV(12),SIZE_INV(13), SIZE_INV(14), SIZE_INV(15), + SIZE_INV(16),SIZE_INV(17), SIZE_INV(18), SIZE_INV(19), + SIZE_INV(20),SIZE_INV(21), SIZE_INV(22), SIZE_INV(23), + SIZE_INV(24),SIZE_INV(25), SIZE_INV(26), SIZE_INV(27), + SIZE_INV(28),SIZE_INV(29), SIZE_INV(30), SIZE_INV(31) + }; unsigned diff, regind, elm, bit; assert(run->magic == ARENA_RUN_MAGIC); + assert(((sizeof(size_invs)) / sizeof(unsigned)) + 3 + >= (SMALL_MAX_DEFAULT >> QUANTUM_2POW_MIN)); /* - * Avoid doing division with a variable divisor if possible. This - * single operation can reduce allocator throughput by around 20%! + * Avoid doing division with a variable divisor if possible. Using + * actual division here can reduce allocator throughput by over 20%! */ -#define POW2_CASE(p) \ - case (1 << (p)): \ - regind = diff >> (p); \ - break; -#define QUANTUM_CASE(n) \ - case ((n) << QUANTUM_2POW_MIN): \ - regind = diff / ((n) << QUANTUM_2POW_MIN); \ - break; - - /* - * These assertions make sure that the switch statement matches - * compile-time configuration. - */ - assert(tiny_min_2pow >= 1); - assert(QUANTUM_2POW_MIN >= 3 && QUANTUM_2POW_MIN <= 4); - assert(SMALL_MAX_2POW_DEFAULT == 9); - diff = (unsigned)((uintptr_t)ptr - (uintptr_t)run - bin->reg0_offset); - switch (size) { - POW2_CASE(1) - POW2_CASE(2) -#if (QUANTUM_2POW_MIN > 3) - POW2_CASE(3) -#endif - QUANTUM_CASE(1) - QUANTUM_CASE(2) - QUANTUM_CASE(3) - QUANTUM_CASE(4) - QUANTUM_CASE(5) - QUANTUM_CASE(6) - QUANTUM_CASE(7) - QUANTUM_CASE(8) - QUANTUM_CASE(9) - QUANTUM_CASE(10) - QUANTUM_CASE(11) - QUANTUM_CASE(12) - QUANTUM_CASE(13) - QUANTUM_CASE(14) - QUANTUM_CASE(15) - QUANTUM_CASE(16) - QUANTUM_CASE(17) - QUANTUM_CASE(18) - QUANTUM_CASE(19) - QUANTUM_CASE(20) - QUANTUM_CASE(21) - QUANTUM_CASE(22) - QUANTUM_CASE(23) - QUANTUM_CASE(24) - QUANTUM_CASE(25) - QUANTUM_CASE(26) - QUANTUM_CASE(27) - QUANTUM_CASE(28) - QUANTUM_CASE(29) - QUANTUM_CASE(30) - QUANTUM_CASE(31) - QUANTUM_CASE(32) + if ((size & (size - 1)) == 0) { + /* + * log2_table allows fast division of a power of two in the + * [1..128] range. + * + * (x / divisor) becomes (x >> log2_table[divisor - 1]). + */ + static const unsigned char log2_table[] = { + 0, 1, 0, 2, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7 + }; -#if (QUANTUM_2POW_MIN <= 3) - POW2_CASE(9) -#endif - POW2_CASE(10) - POW2_CASE(11) - POW2_CASE(12) /* Handle up to 8 kB pages. */ - default: + if (size <= 128) + regind = (diff >> log2_table[size - 1]); + else if (size <= 32768) + regind = diff >> (8 + log2_table[(size >> 8) - 1]); + else { + /* + * The page size is too large for us to use the lookup + * table. Use real division. + */ regind = diff / size; - } -#undef POW2_CASE -#undef QUANTUM_CASE + } + } else if (size <= ((sizeof(size_invs) / sizeof(unsigned)) + << QUANTUM_2POW_MIN) + 2) { + regind = size_invs[(size >> QUANTUM_2POW_MIN) - 3] * diff; + regind >>= SIZE_INV_SHIFT; + } else { + /* + * size_invs isn't large enough to handle this size class, so + * calculate regind using actual division. This only happens + * if the user increases small_max via the 'S' runtime + * configuration option. + */ + regind = diff / size; + }; + assert(regind == diff / size); assert(regind < bin->nregs); elm = regind >> (SIZEOF_INT_2POW + 3); @@ -1649,6 +1646,8 @@ bit = regind - (elm << (SIZEOF_INT_2POW + 3)); assert((run->regs_mask[elm] & (1 << bit)) == 0); run->regs_mask[elm] |= (1 << bit); +#undef SIZE_INV +#undef SIZE_INV_SHIFT } static void @@ -2239,7 +2238,6 @@ arena_chunk_map_t mapelm; assert(ptr != NULL); - assert(ptr != &nil); assert(CHUNK_ADDR2BASE(ptr) != ptr); /* @@ -2281,8 +2279,7 @@ == (QUANTUM_CEILING(oldsize) >> opt_quantum_2pow)) goto IN_PLACE; } else { - if (oldsize > small_max && - pow2_ceil(size) == pow2_ceil(oldsize)) + if (oldsize > small_max && pow2_ceil(size) == oldsize) goto IN_PLACE; } @@ -2320,7 +2317,6 @@ assert(arena->magic == ARENA_MAGIC); assert(chunk->arena == arena); assert(ptr != NULL); - assert(ptr != &nil); assert(CHUNK_ADDR2BASE(ptr) != ptr); pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> pagesize_2pow); @@ -2353,6 +2349,7 @@ /* Medium allocation. */ size = mapelm.npages << pagesize_2pow; + assert((((uintptr_t)ptr) & (size - 1)) == 0); if (opt_junk) memset(ptr, 0x5a, size); @@ -2666,29 +2663,36 @@ ipalloc(size_t alignment, size_t size) { void *ret; - size_t pow2_size; + size_t alloc_size; /* - * Round up to the nearest power of two that is >= alignment and - * >= size. + * Take advantage of the fact that for each size class, every object is + * aligned at the smallest power of two that is non-zero in the base + * two representation of the size. For example: + * + * Size | Base 2 | Minimum alignment + * -----+----------+------------------ + * 96 | 1100000 | 32 + * 144 | 10100000 | 32 + * 192 | 11000000 | 64 + * + * Depending on runtime settings, it is possible that arena_malloc() + * will further round up to a power of two, but that never causes + * correctness issues. */ - if (size > alignment) - pow2_size = pow2_ceil(size); - else - pow2_size = alignment; - pow2_size = QUANTUM_CEILING(pow2_size); - if (pow2_size < size) { + alloc_size = (size + (alignment - 1)) & (-alignment); + if (alloc_size < size) { /* size_t overflow. */ return (NULL); } - if (pow2_size <= arena_maxclass) - ret = arena_malloc(choose_arena(), pow2_size); + if (alloc_size <= arena_maxclass) + ret = arena_malloc(choose_arena(), alloc_size); else { if (alignment <= chunk_size) ret = huge_malloc(size); else { - size_t chunksize, alloc_size, offset; + size_t chunksize, offset; chunk_node_t *node; /* @@ -2815,7 +2819,6 @@ arena_chunk_t *chunk; assert(ptr != NULL); - assert(ptr != &nil); chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr); if (chunk != ptr) { @@ -2850,7 +2853,6 @@ size_t oldsize; assert(ptr != NULL); - assert(ptr != &nil); assert(size != 0); oldsize = isalloc(ptr); @@ -2869,7 +2871,6 @@ arena_chunk_t *chunk; assert(ptr != NULL); - assert(ptr != &nil); chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr); if (chunk != ptr) { @@ -3404,10 +3405,11 @@ if (size == 0) { if (opt_sysv == false) - ret = (void *)&nil; - else + size = 1; + else { ret = NULL; - goto RETURN; + goto RETURN; + } } ret = imalloc(size); @@ -3486,10 +3488,11 @@ num_size = num * size; if (num_size == 0) { if (opt_sysv == false) - ret = (void *)&nil; - else + num_size = 1; + else { ret = NULL; - goto RETURN; + goto RETURN; + } /* * Try to avoid division here. We know that it isn't possible to * overflow during multiplication if neither operand uses any of the @@ -3524,44 +3527,49 @@ { void *ret; - if (size != 0) { - if (ptr != &nil && ptr != NULL) { - assert(malloc_initialized); + if (size == 0) { + if (opt_sysv == false) + size = 1; + else { + if (ptr != NULL) + idalloc(ptr); + ret = NULL; + goto RETURN; + } + } - ret = iralloc(ptr, size); + if (ptr != NULL) { + assert(malloc_initialized); - if (ret == NULL) { - if (opt_xmalloc) { - malloc_printf("%s: (malloc) Error in" - " ralloc(%p, %zu): out of memory\n", - _getprogname(), ptr, size); - abort(); - } - errno = ENOMEM; - } - } else { - if (malloc_init()) - ret = NULL; - else - ret = imalloc(size); + ret = iralloc(ptr, size); - if (ret == NULL) { - if (opt_xmalloc) { - malloc_printf("%s: (malloc) Error in" - " ralloc(%p, %zu): out of memory\n", - _getprogname(), ptr, size); - abort(); - } - errno = ENOMEM; + if (ret == NULL) { + if (opt_xmalloc) { + malloc_printf("%s: (malloc) Error in" + " realloc(%p, %zu): out of memory\n", + _getprogname(), ptr, size); + abort(); } + errno = ENOMEM; } } else { - if (ptr != &nil && ptr != NULL) - idalloc(ptr); + if (malloc_init()) + ret = NULL; + else + ret = imalloc(size); - ret = (void *)&nil; + if (ret == NULL) { + if (opt_xmalloc) { + malloc_printf("%s: (malloc) Error in" + " realloc(%p, %zu): out of memory\n", + _getprogname(), ptr, size); + abort(); + } + errno = ENOMEM; + } } +RETURN: UTRACE(ptr, size, ret); return (ret); } @@ -3571,7 +3579,7 @@ { UTRACE(ptr, 0, 0); - if (ptr != &nil && ptr != NULL) { + if (ptr != NULL) { assert(malloc_initialized); idalloc(ptr); @@ -3592,10 +3600,7 @@ assert(ptr != NULL); - if (ptr == &nil) - return (0); - else - return (isalloc(ptr)); + return (isalloc(ptr)); } /* ==== //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.951 2006/06/26 12:12:09 keramida Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.953 2006/07/02 01:58:33 bmah Exp $ 2000 @@ -366,11 +366,11 @@ A new loader tunable comconsole_speed to change the serial console speed has been added. - If the previous stage boot loader requested a serial console + If the previous stage boot loader requested a serial console, then the default speed is determined from the current serial port - speed, and otherwise it is set to 9600 or the value of - the kernel option BOOT_COMCONSOLE_SPEED - at compile time. &merged; + speed. Otherwise it is set to 9600 or the value of + the BOOT_COMCONSOLE_SPEED kernel option. + &merged; @@ -391,7 +391,7 @@ &man.pccbb.4;, and &man.exca.4; drivers are now buildable as kernel modules. - A &man.acpi.dock.4; driver has been added to provide + An &man.acpi.dock.4; driver has been added to provide support for controlling laptop docking station functions via ACPI. @@ -416,9 +416,11 @@ Support for the PadLock Security Co-processor in VIA C3 processors has been added to the &man.crypto.9; subsystem. + More information can be found in the &man.padlock.4; manual + page. &merged; - A bug which prevents the &man.ichsmb.4; kernel module + A bug which prevented the &man.ichsmb.4; kernel module from unloading has been fixed. Dual-core processors (such as the Intel @@ -440,7 +442,7 @@ or at runtime via &man.kldload.8; and releasing the active keyboard. &merged; - The &man.kbdmux.4; driver has been included in the + The &man.kbdmux.4; driver is now included in the GENERIC kernel by default. Also, the Boot FreeBSD with USB keyboard menu item in the boot loader menu has been removed @@ -461,22 +463,22 @@ The smbios(4) driver support for amd64 has been added. - The tnt4882(4) driver which supports National Instruments - PCI-GPIB card has been added. + The tnt4882(4) driver, which supports the National Instruments + PCI-GPIB card, has been added. The &man.uart.4; driver has been included in the GENERIC kernel by default. - When both &man.sio.4; and &man.uart.4; can handle a serial port, + When both &man.sio.4; and &man.uart.4; can handle a given serial port, &man.sio.4; will claim it. The &man.uart.4; driver now supports LOM (Lights Out Management) - and RSC (Remote System Control) devices as console. + and RSC (Remote System Control) devices as consoles. A new loader tunable hw.apic.enable_extint has been added. - This tunable can be used not to mask the ExtINT pin on the first - I/O APIC. At least one chipset for Intel Pentium III seems - to need this even though all of the pins in the 8259A's are masked. + This tunable can be used to disable masking of the ExtINT pin on the first + I/O APIC. At least one chipset for the Intel Pentium III seems + to need this, even though all of the pins in the 8259As are masked. The default is still to mask the ExtINT pin. Support has been improved for @@ -487,7 +489,7 @@ Multimedia Support - The &man.agp.4; driver now supports ATI IGP chipsets. + The &man.agp.4; driver now supports ATI AGP chipsets. &merged; The new midi(4) driver which is based on NetBSD's one @@ -561,7 +563,7 @@ The &man.ed.4; driver is now MPSAFE. - The &man.el.4; driver has been removed. + The &man.el.4; driver has been removed due to lack of use. The &man.em.4; driver now supports big-endian architectures such as sparc64. &merged; @@ -583,11 +585,12 @@ architectures such as sparc64. The &man.le.4; driver, which supports AMD Am7900 LANCE - and Am79C9xx PCnet NICs and is based on NetBSD's implementation, + and Am79C9xx PCnet NICs, has been added. While the &man.lnc.4; driver also supports these NICs, this driver has several advantages over it such as MPSAFE, ALTQ, VLAN_MTU, ifmedia, and 32-bit DMA for PCI - variants. &merged; + variants. This driver is based on NetBSD's implementation. + &merged; The &man.lge.4; driver is now MPSAFE. &merged; @@ -597,7 +600,7 @@ The &man.my.4; driver is now MPSAFE. &merged; - The &man.my.4; driver now supports &man.altq.4; + The &man.my.4; driver now supports &man.altq.4;. The &man.mxge.4; driver, which supports Myricom Myri10GE 10 Gigabit Ethernet @@ -647,14 +650,14 @@ Network Protocols - The &man.arp.8; retransmission algorithm has been - rewritten as that ARP requests are retransmitted without + The &man.arp.4; retransmission algorithm has been + rewritten so that ARP requests are retransmitted without suppression, while there is demand for such ARP entry. Due to this change, a sysctl variable net.link.ether.inet.host_down_time has been removed. &merged; - The &man.arp.8; now supports a sysctl variable + The &man.arp.4; protocol now supports a sysctl variable net.link.ether.inet.log_arp_permanent_modify to suppress logging of attempts to modify permanent ARP entries. &merged; @@ -674,7 +677,7 @@ found in RFC 1701 and RFC 1702, now supports IPv6 over GRE. The &man.if.bridge.4; driver now supports - creating span ports, which transmit a copy of every frame + creating SPAN ports, which transmit a copy of every frame received by the bridge. This feature can be enabled by using &man.ifconfig.8;. &merged; @@ -689,15 +692,15 @@ memberships (formerly 20) has been removed. The path MTU discovery for multicast packets in the &os; - &man.ip6.4; stack has been disabled by default because - notifying path MTU by a lot of routers in multicast + IPv6 stack has been disabled by default. + Path MTU notification from a large number of multicast routers can be a kind of distributed Denial-of-Service attack to a router. This feature can be re-enabled by using a new sysctl variable net.inet6.ip6.mcast_pmtu. &merged; The &man.ipfw.4; IP packet filter now supports IPv6. &merged; - The &man.ipfw.4; now supports substitution of the action + The &man.ipfw.4; firewall system now supports substitution of the action argument with the value obtained from table lookup, which allows some optimization of rulesets. This is now applicable only to pipe, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jul 3 17:33:47 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 134AD16A779 for ; Mon, 3 Jul 2006 17:33:47 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AF4A43DBD for ; Mon, 3 Jul 2006 17:33:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B774946BDE for ; Mon, 3 Jul 2006 13:33:37 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4C3215B8EC; Mon, 3 Jul 2006 17:30:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A637116A547; Mon, 3 Jul 2006 17:30:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8260F16A504 for ; Mon, 3 Jul 2006 17:30:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 459E645418 for ; Mon, 3 Jul 2006 17:10: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.6/8.13.6) with ESMTP id k63HAXR0019037 for ; Mon, 3 Jul 2006 17:10:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k63HAUcF019034 for perforce@freebsd.org; Mon, 3 Jul 2006 17:10:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 3 Jul 2006 17:10:30 GMT Message-Id: <200607031710.k63HAUcF019034@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 100513 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jul 2006 17:33:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=100513 Change 100513 by rwatson@rwatson_peppercorn on 2006/07/03 17:09:36 Start on OpenBSM 1.0 alpha 8. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#16 edit .. //depot/projects/trustedbsd/openbsm/VERSION#10 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#25 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#16 (text+ko) ==== @@ -1,3 +1,5 @@ +OpenBSM 1.0 alpha 8 + OpenBSM 1.0 alpha 7 - Adopted Solaris-compatible format for subject32_ex and subject64_ex @@ -175,4 +177,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#15 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#16 $ ==== //depot/projects/trustedbsd/openbsm/VERSION#10 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_7 +OPENBSM_1_0_ALPHA_8 ==== //depot/projects/trustedbsd/openbsm/configure.ac#25 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0a7], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#24 $]) +AC_INIT([OpenBSM], [1.0a8], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#25 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jul 3 17:36:39 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EFD616A40F for ; Mon, 3 Jul 2006 17:36:39 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBE2043D9D for ; Mon, 3 Jul 2006 17:36:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A6B6146BD6 for ; Mon, 3 Jul 2006 13:36:35 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AD228732DC; Mon, 3 Jul 2006 17:31:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B978116A59B; Mon, 3 Jul 2006 17:31:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 973DC16A592 for ; Mon, 3 Jul 2006 17:31:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E15E4541B for ; Mon, 3 Jul 2006 17:10: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.6/8.13.6) with ESMTP id k63HAXEQ019043 for ; Mon, 3 Jul 2006 17:10:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k63HAXXh019040 for perforce@freebsd.org; Mon, 3 Jul 2006 17:10:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 3 Jul 2006 17:10:33 GMT Message-Id: <200607031710.k63HAXXh019040@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 100514 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jul 2006 17:36:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=100514 Change 100514 by rwatson@rwatson_peppercorn on 2006/07/03 17:10:24 Correct typo in definition of AUR_INT. Submitted by: Martin Fong Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#20 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#20 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#20 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -184,7 +184,7 @@ #define AUR_CHAR AUR_BYTE #define AUR_SHORT 1 #define AUR_INT32 2 -#define AUR_INT AUR_INT +#define AUR_INT AUR_INT32 #define AUR_INT64 3 /* ... and their sizes */ From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jul 3 17:40:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5350A16A403 for ; Mon, 3 Jul 2006 17:40:07 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A407143D81 for ; Mon, 3 Jul 2006 17:40:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E5EB146B1C for ; Mon, 3 Jul 2006 13:40:04 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1A3E691C98; Mon, 3 Jul 2006 17:33:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7964416A560; Mon, 3 Jul 2006 17:31:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 495F016A535 for ; Mon, 3 Jul 2006 17:31:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62BC14549E for ; Mon, 3 Jul 2006 17:11:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k63HBZBx019107 for ; Mon, 3 Jul 2006 17:11:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k63HBZOP019104 for perforce@freebsd.org; Mon, 3 Jul 2006 17:11:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 3 Jul 2006 17:11:35 GMT Message-Id: <200607031711.k63HBZOP019104@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 100515 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jul 2006 17:40:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=100515 Change 100515 by rwatson@rwatson_peppercorn on 2006/07/03 17:10:48 Start adding alpha8 history. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#17 (text+ko) ==== @@ -1,5 +1,7 @@ OpenBSM 1.0 alpha 8 +- Correct typo in definition of AUR_INT. + OpenBSM 1.0 alpha 7 - Adopted Solaris-compatible format for subject32_ex and subject64_ex @@ -177,4 +179,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#16 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#17 $ From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jul 3 20:35:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B63A16A4A0 for ; Mon, 3 Jul 2006 20:35:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFF4443D5C for ; Mon, 3 Jul 2006 20:35:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 393D046C1F for ; Mon, 3 Jul 2006 16:35:27 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 37FD55553E; Mon, 3 Jul 2006 20:35:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3783516A4AB; Mon, 3 Jul 2006 20:35:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B36F16A47C for ; Mon, 3 Jul 2006 20:35:26 +0000 (UTC) (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 4FC0443D79 for ; Mon, 3 Jul 2006 20:35:16 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k63KZFjS033267 for ; Mon, 3 Jul 2006 20:35:15 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k63KZFwC033264 for perforce@freebsd.org; Mon, 3 Jul 2006 20:35:15 GMT (envelope-from wsalamon@computer.org) Date: Mon, 3 Jul 2006 20:35:15 GMT Message-Id: <200607032035.k63KZFwC033264@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 100524 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jul 2006 20:35:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=100524 Change 100524 by wsalamon@vh3 on 2006/07/03 20:34:16 Break the handling of EXTATTR events into separate cases for clarity. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#17 (text+ko) ==== @@ -238,6 +238,29 @@ } \ } while (0) \ +#define EXTATTR_TOKENS do { \ + if (ARG_IS_VALID(kar, ARG_VALUE)) { \ + switch (ar->ar_arg_value) { \ + case EXTATTR_NAMESPACE_USER: \ + tok = au_to_text(EXTATTR_NAMESPACE_USER_STRING);\ + break; \ + case EXTATTR_NAMESPACE_SYSTEM: \ + tok = au_to_text(EXTATTR_NAMESPACE_SYSTEM_STRING);\ + break; \ + default: \ + tok = au_to_arg32(3, "attrnamespace", \ + ar->ar_arg_value); \ + break; \ + } \ + kau_write(rec, tok); \ + } \ + /* attrname is in the text field */ \ + if (ARG_IS_VALID(kar, ARG_TEXT)) { \ + tok = au_to_text(ar->ar_arg_text); \ + kau_write(rec, tok); \ + } \ +} while (0) + /* * Implement auditing for the auditon() system call. The audit tokens that * are generated depend on the command that was sent into the auditon() @@ -626,6 +649,18 @@ UPATH1_VNODE1_TOKENS; break; + case AUE_EXTATTRCTL: + UPATH1_VNODE1_TOKENS; + if (ARG_IS_VALID(kar, ARG_CMD)) { + tok = au_to_arg32(2, "cmd", ar->ar_arg_cmd); + kau_write(rec, tok); + } + /* extattrctl(2) filename parameter is in upath2/vnode2 */ + UPATH2_TOKENS; + VNODE2_TOKENS; + EXTATTR_TOKENS; + break; + case AUE_EXTATTR_GET_FILE: case AUE_EXTATTR_SET_FILE: case AUE_EXTATTR_LIST_FILE: @@ -634,16 +669,10 @@ case AUE_EXTATTR_SET_LINK: case AUE_EXTATTR_LIST_LINK: case AUE_EXTATTR_DELETE_LINK: - case AUE_EXTATTRCTL: UPATH1_VNODE1_TOKENS; - if (ARG_IS_VALID(kar, ARG_CMD)) { - tok = au_to_arg32(2, "cmd", ar->ar_arg_cmd); - kau_write(rec, tok); - } - /* extattrctl(2) filename parameter is in upath2/vnode2 */ - UPATH2_TOKENS; - VNODE2_TOKENS; - /* fall through */ + EXTATTR_TOKENS; + break; + case AUE_EXTATTR_GET_FD: case AUE_EXTATTR_SET_FD: case AUE_EXTATTR_LIST_FD: @@ -652,26 +681,7 @@ tok = au_to_arg32(2, "fd", ar->ar_arg_fd); kau_write(rec, tok); } - if (ARG_IS_VALID(kar, ARG_VALUE)) { - switch (ar->ar_arg_value) { - case EXTATTR_NAMESPACE_USER: - tok = au_to_text(EXTATTR_NAMESPACE_USER_STRING); - break; - case EXTATTR_NAMESPACE_SYSTEM: - tok = au_to_text(EXTATTR_NAMESPACE_SYSTEM_STRING); - break; - default: - tok = au_to_arg32(3, "attrnamespace", - ar->ar_arg_value); - break; - } - kau_write(rec, tok); - } - /* attrname is in the text field */ - if (ARG_IS_VALID(kar, ARG_TEXT)) { - tok = au_to_text(ar->ar_arg_text); - kau_write(rec, tok); - } + EXTATTR_TOKENS; break; case AUE_FCHMOD: From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 11:02:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A58F616A4EF for ; Wed, 5 Jul 2006 11:02:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 901C043D53 for ; Wed, 5 Jul 2006 11:02:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8835F46CAF for ; Wed, 5 Jul 2006 07:02:12 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C0771554A6; Wed, 5 Jul 2006 11:02:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BC88116A4E6; Wed, 5 Jul 2006 11:02:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 662F116A4DF for ; Wed, 5 Jul 2006 11:02:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2E5F43D46 for ; Wed, 5 Jul 2006 11:02:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65B28pe014056 for ; Wed, 5 Jul 2006 11:02:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65B2798014050 for perforce@freebsd.org; Wed, 5 Jul 2006 11:02:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 11:02:07 GMT Message-Id: <200607051102.k65B2798014050@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 100615 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 11:02:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100615 Change 100615 by rwatson@rwatson_zoo on 2006/07/05 11:01:35 Integrate TrustedBSD base branch from FreeBSD CVS: - Loop back merge of OpenBSM 1.0 alpha 7 changes from contrib to src/sys. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#40 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.c#17 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_scalbf.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient.c#6 integrate .. //depot/projects/trustedbsd/base/sys/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#31 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#24 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_record.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-lowlevel.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbdc_isa.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#33 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#56 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/ieeefp.h#4 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#42 integrate .. //depot/projects/trustedbsd/base/sys/net/if_enc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/libalias/libalias.3#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/trustedbsd/base/tools/kerneldoc/Doxyfile#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Dependencies#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-cam#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-geom#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-kern#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-linux#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Doxyfile-vm#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/README#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/common-Doxyfile#1 branch .. //depot/projects/trustedbsd/base/tools/kerneldoc/subsys/notreviewed.dox#1 branch .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#50 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/misc.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/mtree.8#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/mtree.h#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/spec.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/test/test05.sh#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/mtree/verify.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/command.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/config.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/devices.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/disks.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/dispatch.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/dmenu.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/globals.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/help/partition.hlp#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/help/slice.hlp#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/install.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/keymap.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/label.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/list.h#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/main.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/menus.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/misc.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/msg.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/rtermcap.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/sade.8#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/sade.h#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/system.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/termcap.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/usb.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/variable.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sade/wizard.c#1 branch Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#40 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.136 2006/07/01 10:51:54 markm Exp $ +$FreeBSD: src/MAINTAINERS,v 1.137 2006/07/04 02:01:48 brooks Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -59,8 +59,6 @@ Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. -dhcp mbr Needs to pre-approve commits to contrib/isc-dhcp, so - changes can be made to the isc.org CVS repository. libfetch des Advance notification requested. fetch des Advance notification requested. libpam des Pre-commit review requested. @@ -140,7 +138,6 @@ bin/dd/Makefile:MAINTAINER= green@FreeBSD.org games/fortune/datfiles/Makefile:MAINTAINER= jkh gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch -sbin/dhclient/Makefile.inc:MAINTAINER= mbr sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org ==== //depot/projects/trustedbsd/base/bin/cp/cp.c#17 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.52 2005/09/05 04:36:08 csjp Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.53 2006/07/04 20:52:36 maxim Exp $"); /* * Cp copies source files to target files. @@ -476,6 +476,7 @@ } if (errno) err(1, "fts_read"); + fts_close(ftsp); return (rval); } ==== //depot/projects/trustedbsd/base/lib/msun/src/e_scalbf.c#6 (text+ko) ==== @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.10 2005/12/06 20:12:38 obrien Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.11 2006/07/05 02:16:29 bde Exp $"; #endif #include "math.h" @@ -42,5 +42,3 @@ return scalbnf(x,(int)fn); #endif } - -__weak_reference(scalbf, ldexpf); ==== //depot/projects/trustedbsd/base/sbin/dhclient/dhclient.c#6 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/dhclient/dhclient.c,v 1.15 2006/05/23 16:57:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sbin/dhclient/dhclient.c,v 1.16 2006/07/03 22:05:38 jkim Exp $"); #include "dhcpd.h" #include "privsep.h" @@ -1480,7 +1480,6 @@ } } -#ifdef SEND_CLIENT_IDENTIFIER /* set unique client identifier */ char client_ident[sizeof(struct hardware)]; if (!options[DHO_DHCP_CLIENT_IDENTIFIER]) { @@ -1494,7 +1493,6 @@ options[DHO_DHCP_CLIENT_IDENTIFIER]->buf_size = hwlen+1; options[DHO_DHCP_CLIENT_IDENTIFIER]->timeout = 0xFFFFFFFF; } -#endif /* Set up the option buffer... */ ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0, @@ -1606,7 +1604,6 @@ } } -#ifdef SEND_CLIENT_IDENTIFIER /* set unique client identifier */ char client_ident[sizeof(struct hardware)]; if (!options[DHO_DHCP_CLIENT_IDENTIFIER]) { @@ -1620,7 +1617,6 @@ options[DHO_DHCP_CLIENT_IDENTIFIER]->buf_size = hwlen+1; options[DHO_DHCP_CLIENT_IDENTIFIER]->timeout = 0xFFFFFFFF; } -#endif /* Set up the option buffer... */ ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0, ==== //depot/projects/trustedbsd/base/sys/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.36 2006/05/29 19:29:41 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.37 2006/07/04 14:14:16 maxim Exp $ .include @@ -10,7 +10,7 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ +CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \ ==== //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#31 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.563 2006/07/02 18:22:46 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.564 2006/07/05 07:04:31 alc Exp $"); /* * Manages physical address maps. @@ -207,7 +207,7 @@ static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); -static void pmap_clear_ptes(vm_page_t m, long bit); +static void pmap_clear_write(vm_page_t m); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); @@ -2969,47 +2969,36 @@ } /* - * Clear the given bit in each of the given page's ptes. + * Clear the write and modified bits in each of the given page's mappings. */ static __inline void -pmap_clear_ptes(vm_page_t m, long bit) +pmap_clear_write(vm_page_t m) { pv_entry_t pv; pmap_t pmap; - pt_entry_t pbits, *pte; + pt_entry_t oldpte, *pte; - if ((m->flags & PG_FICTITIOUS) || - (bit == PG_RW && (m->flags & PG_WRITEABLE) == 0)) + if ((m->flags & PG_FICTITIOUS) != 0 || + (m->flags & PG_WRITEABLE) == 0) return; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - /* - * Loop over all current mappings setting/clearing as appropos If - * setting RO do we need to clear the VAC? - */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); retry: - pbits = *pte; - if (pbits & bit) { - if (bit == PG_RW) { - if (!atomic_cmpset_long(pte, pbits, - pbits & ~(PG_RW | PG_M))) - goto retry; - if (pbits & PG_M) { - vm_page_dirty(m); - } - } else { - atomic_clear_long(pte, bit); - } + oldpte = *pte; + if (oldpte & PG_RW) { + if (!atomic_cmpset_long(pte, oldpte, oldpte & + ~(PG_RW | PG_M))) + goto retry; + if ((oldpte & PG_M) != 0) + vm_page_dirty(m); pmap_invalidate_page(pmap, pv->pv_va); } PMAP_UNLOCK(pmap); } - if (bit == PG_RW) - vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_flag_clear(m, PG_WRITEABLE); } /* @@ -3022,7 +3011,7 @@ { if ((prot & VM_PROT_WRITE) == 0) { if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_clear_ptes(m, PG_RW); + pmap_clear_write(m); } else { pmap_remove_all(m); } @@ -3082,7 +3071,23 @@ void pmap_clear_modify(vm_page_t m) { - pmap_clear_ptes(m, PG_M); + pv_entry_t pv; + pmap_t pmap; + pt_entry_t *pte; + + if ((m->flags & PG_FICTITIOUS) != 0) + return; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); + if (*pte & PG_M) { + atomic_clear_long(pte, PG_M); + pmap_invalidate_page(pmap, pv->pv_va); + } + PMAP_UNLOCK(pmap); + } } /* @@ -3093,7 +3098,23 @@ void pmap_clear_reference(vm_page_t m) { - pmap_clear_ptes(m, PG_A); + pv_entry_t pv; + pmap_t pmap; + pt_entry_t *pte; + + if ((m->flags & PG_FICTITIOUS) != 0) + return; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); + if (*pte & PG_A) { + atomic_clear_long(pte, PG_A); + pmap_invalidate_page(pmap, pv->pv_va); + } + PMAP_UNLOCK(pmap); + } } /* ==== //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#24 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.462 2006/06/26 22:03:20 babkin Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.463 2006/07/05 02:32:55 davidxu Exp $ cpu HAMMER ident GENERIC @@ -28,7 +28,6 @@ #options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler -#options SCHED_CORE # CORE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols ==== //depot/projects/trustedbsd/base/sys/bsm/audit_kevents.h#4 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/base/sys/bsm/audit_kevents.h#3 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.5 2006/02/06 01:12:46 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/base/sys/bsm/audit_kevents.h#4 $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.6 2006/07/03 14:45:43 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -384,7 +384,24 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_SYSARCH 406 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ +#define AUE_SYSARCH 410 /* FreeBSD. */ +#define AUE_EXTATTRCTL 411 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/base/sys/bsm/audit_record.h#3 (text) ==== @@ -31,12 +31,14 @@ * @APPLE_BSD_LICENSE_HEADER_END@ * * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#13 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.2 2006/06/05 13:00:52 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.3 2006/07/03 14:44:13 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ +#include /* struct timeval */ + /* * Token type identifiers. */ ==== //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#38 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.164 2006/06/28 09:59:09 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.165 2006/07/04 20:36:03 sos Exp $"); #include "opt_ata.h" #include @@ -142,6 +142,7 @@ static void ata_promise_queue_hpkt(struct ata_pci_controller *ctlr, u_int32_t hpkt); static void ata_promise_next_hpkt(struct ata_pci_controller *ctlr); static int ata_serverworks_chipinit(device_t dev); +static int ata_serverworks_allocate(device_t dev); static void ata_serverworks_setmode(device_t dev, int mode); static int ata_sii_chipinit(device_t dev); static int ata_cmd_allocate(device_t dev); @@ -1894,6 +1895,8 @@ for (i = ATA_DATA; i < ATA_MAX_RES; i++) ch->r_io[i].res = ctlr->r_res2; + + /* setup ATA registers */ ch->r_io[ATA_DATA].offset = ch_offset + 0x00; ch->r_io[ATA_FEATURE].offset = ch_offset + 0x06; ch->r_io[ATA_COUNT].offset = ch_offset + 0x08; @@ -1906,9 +1909,13 @@ ch->r_io[ATA_STATUS].offset = ch_offset + 0x1c; ch->r_io[ATA_ALTSTAT].offset = ch_offset + 0x28; ch->r_io[ATA_CONTROL].offset = ch_offset + 0x29; + + /* setup DMA registers */ ch->r_io[ATA_SSTATUS].offset = ch_offset + 0x100; ch->r_io[ATA_SERROR].offset = ch_offset + 0x104; ch->r_io[ATA_SCONTROL].offset = ch_offset + 0x108; + + /* setup SATA registers */ ch->r_io[ATA_BMCMD_PORT].offset = ch_offset + 0x70; ch->r_io[ATA_BMSTAT_PORT].offset = ch_offset + 0x72; ch->r_io[ATA_BMDTP_PORT].offset = ch_offset + 0x74; @@ -3890,11 +3897,14 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_ROSB4, 0x00, SWKS33, 0x00, ATA_UDMA2, "ROSB4" }, - { ATA_CSB5, 0x92, SWKS100, 0x00, ATA_UDMA5, "CSB5" }, - { ATA_CSB5, 0x00, SWKS66, 0x00, ATA_UDMA4, "CSB5" }, - { ATA_CSB6, 0x00, SWKS100, 0x00, ATA_UDMA5, "CSB6" }, - { ATA_CSB6_1, 0x00, SWKS66, 0x00, ATA_UDMA4, "CSB6" }, + {{ ATA_ROSB4, 0x00, SWKS33, 0x00, ATA_UDMA2, "ROSB4" }, + { ATA_CSB5, 0x92, SWKS100, 0x00, ATA_UDMA5, "CSB5" }, + { ATA_CSB5, 0x00, SWKS66, 0x00, ATA_UDMA4, "CSB5" }, + { ATA_CSB6, 0x00, SWKS100, 0x00, ATA_UDMA5, "CSB6" }, + { ATA_CSB6_1, 0x00, SWKS66, 0x00, ATA_UDMA4, "CSB6" }, + { ATA_HT1000, 0x00, SWKS100, 0x00, ATA_UDMA5, "HT1000" }, + { ATA_HT1000_S1, 0x00, SWKS100, 0x00, ATA_SA150, "HT1000 SATA" }, + { ATA_HT1000_S2, 0x00, SWKSMIO, 0x00, ATA_SA150, "HT1000 SATA mmio" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; @@ -3917,7 +3927,19 @@ if (ata_setup_interrupt(dev)) return ENXIO; - if (ctlr->chip->cfg1 == SWKS33) { + if (ctlr->chip->cfg1 == SWKSMIO) { + ctlr->r_type2 = SYS_RES_MEMORY; + ctlr->r_rid2 = PCIR_BAR(5); + if (!(ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, + &ctlr->r_rid2, RF_ACTIVE))) + return ENXIO; + + ctlr->channels = 4; + ctlr->allocate = ata_serverworks_allocate; + ctlr->setmode = ata_sata_setmode; + return 0; + } + else if (ctlr->chip->cfg1 == SWKS33) { device_t *children; int nchildren, i; @@ -3943,6 +3965,46 @@ return 0; } +static int +ata_serverworks_allocate(device_t dev) +{ + struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); + struct ata_channel *ch = device_get_softc(dev); + int ch_offset; + int i; + + ch_offset = ch->unit * 0x100; + + for (i = ATA_DATA; i < ATA_MAX_RES; i++) + ch->r_io[i].res = ctlr->r_res2; + + /* setup ATA registers */ + ch->r_io[ATA_DATA].offset = ch_offset + 0x00; + ch->r_io[ATA_FEATURE].offset = ch_offset + 0x04; + ch->r_io[ATA_COUNT].offset = ch_offset + 0x08; + ch->r_io[ATA_SECTOR].offset = ch_offset + 0x0c; + ch->r_io[ATA_CYL_LSB].offset = ch_offset + 0x10; + ch->r_io[ATA_CYL_MSB].offset = ch_offset + 0x14; + ch->r_io[ATA_DRIVE].offset = ch_offset + 0x18; + ch->r_io[ATA_COMMAND].offset = ch_offset + 0x1c; + ch->r_io[ATA_CONTROL].offset = ch_offset + 0x20; + ata_default_registers(dev); + + /* setup DMA registers */ + ch->r_io[ATA_BMCMD_PORT].offset = ch_offset + 0x30; + ch->r_io[ATA_BMSTAT_PORT].offset = ch_offset + 0x32; + ch->r_io[ATA_BMDTP_PORT].offset = ch_offset + 0x34; + + /* setup SATA registers */ + ch->r_io[ATA_SSTATUS].offset = ch_offset + 0x40; + ch->r_io[ATA_SERROR].offset = ch_offset + 0x44; + ch->r_io[ATA_SCONTROL].offset = ch_offset + 0x48; + + ch->flags |= ATA_NO_SLAVE; + ata_pci_hw(dev); + return 0; +} + static void ata_serverworks_setmode(device_t dev, int mode) { @@ -4200,6 +4262,7 @@ ch->r_io[ATA_CONTROL].offset = 0x8a + (unit01 << 6) + (unit10 << 8); ch->r_io[ATA_IDX_ADDR].res = ctlr->r_res2; ata_default_registers(dev); + ch->r_io[ATA_BMCMD_PORT].res = ctlr->r_res2; ch->r_io[ATA_BMCMD_PORT].offset = 0x00 + (unit01 << 3) + (unit10 << 8); ch->r_io[ATA_BMSTAT_PORT].res = ctlr->r_res2; ==== //depot/projects/trustedbsd/base/sys/dev/ata/ata-lowlevel.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.76 2006/01/18 09:14:55 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.77 2006/07/04 20:36:03 sos Exp $"); #include "opt_ata.h" #include @@ -719,7 +719,7 @@ DELAY(20); } if (timeout <= 0) { - device_printf(request->dev,"timeout waiting for ATAPI ready\n"); + device_printf(request->dev, "timeout waiting for ATAPI ready\n"); request->result = EIO; return -1; } ==== //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#28 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.64 2006/03/13 14:01:37 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.65 2006/07/04 20:36:03 sos Exp $ */ /* structure holding chipset config info */ @@ -249,6 +249,9 @@ #define ATA_CSB5 0x02121166 #define ATA_CSB6 0x02131166 #define ATA_CSB6_1 0x02171166 +#define ATA_HT1000 0x02141166 +#define ATA_HT1000_S1 0x024b1166 +#define ATA_HT1000_S2 0x024a1166 #define ATA_SILICON_IMAGE_ID 0x1095 #define ATA_SII3114 0x31141095 @@ -362,6 +365,7 @@ #define SWKS33 0 #define SWKS66 1 #define SWKS100 2 +#define SWKSMIO 3 #define SIIMEMIO 1 #define SIIINTR 0x01 ==== //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbdc_isa.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc_isa.c,v 1.35 2006/06/12 14:46:44 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc_isa.c,v 1.36 2006/07/03 23:40:58 jkim Exp $"); #include "opt_kbd.h" @@ -112,15 +112,21 @@ * The AT keyboard controller uses two ports (a command/data port * 0x60 and a status port 0x64), which may be given to us in * one resource (0x60 through 0x64) or as two separate resources - * (0x60 and 0x64). Furthermore, /boot/device.hints may contain - * just one port, 0x60. We shall adjust resource settings - * so that these two ports are available as two separate resources. + * (0x60 and 0x64). Some brain-damaged ACPI BIOS has reversed + * command/data port and status port. Furthermore, /boot/device.hints + * may contain just one port, 0x60. We shall adjust resource settings + * so that these two ports are available as two separate resources + * in correct order. */ device_quiet(dev); rid = 0; if (bus_get_resource(dev, SYS_RES_IOPORT, rid, &start, &count) != 0) return ENXIO; - if (count > 1) /* adjust the count */ + if (start == IO_KBD + KBD_STATUS_PORT) { + start = IO_KBD; + count++; + } + if (count > 1) /* adjust the count and/or start port */ bus_set_resource(dev, SYS_RES_IOPORT, rid, start, 1); port0 = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE); if (port0 == NULL) ==== //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#33 (text+ko) ==== @@ -34,7 +34,7 @@ */ #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.120 2006/07/03 08:24:09 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.121 2006/07/03 20:56:48 mjacob Exp $"); #endif /* @@ -1329,7 +1329,11 @@ icbp->icb_hardaddr = 0; } - if (IS_2322(isp) || IS_24XX(isp)) { + /* + * Our life seems so much better with 2200s and later with + * the latest f/w if we set Hard Address. + */ + if (ISP_FW_NEWER_THAN(isp, 2, 2, 5)) { icbp->icb_fwoptions |= ICBOPT_HARD_ADDRESS; } @@ -2238,7 +2242,7 @@ hival = FC_PORT_ID; break; default: - isp_prt(isp, ISP_LOGDEBUG0, "no loop scasn\n"); + isp_prt(isp, ISP_LOGDEBUG0, "no loop topology to scan"); fcp->isp_loopstate = LOOP_LSCAN_DONE; return (0); } ==== //depot/projects/trustedbsd/base/sys/dev/sk/if_sk.c#3 (text) ==== @@ -48,7 +48,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.125 2006/06/07 09:05:20 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.126 2006/07/05 04:56:50 yongari Exp $"); /* * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports @@ -140,7 +140,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.125 2006/06/07 09:05:20 yongari Exp $"; + "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.126 2006/07/05 04:56:50 yongari Exp $"; #endif static struct sk_type sk_devs[] = { @@ -2871,8 +2871,8 @@ SK_IF_LOCK(sc_if); /* - * Reclaim first as there is a possibility of loosing Tx completion - * interrupt. + * Reclaim first as there is a possibility of losing Tx completion + * interrupts. */ sk_txeof(sc_if); if (sc_if->sk_cdata.sk_tx_cnt != 0) { ==== //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#33 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.96 2006/02/14 12:44:55 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.97 2006/07/05 00:49:26 thompsa Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -524,6 +524,7 @@ struct ifnet *ifp; struct ifmultiaddr *ifma; u_int32_t h = 0, i; + u_int8_t hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; ifp = sc->aue_ifp; @@ -534,10 +535,6 @@ AUE_CLRBIT(sc, AUE_CTL0, AUE_CTL0_ALLMULTI); - /* first, zot all the existing hash bits */ - for (i = 0; i < 8; i++) - aue_csr_write_1(sc, AUE_MAR0 + i, 0); - /* now program new ones */ IF_ADDR_LOCK(ifp); #if __FreeBSD_version >= 500000 @@ -550,10 +547,14 @@ continue; h = ether_crc32_le(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN) & ((1 << AUE_BITS) - 1); - AUE_SETBIT(sc, AUE_MAR + (h >> 3), 1 << (h & 0x7)); + hashtbl[(h >> 3)] |= 1 << (h & 0x7); } IF_ADDR_UNLOCK(ifp); + /* write the hashtable */ + for (i = 0; i < 8; i++) + aue_csr_write_1(sc, AUE_MAR0 + i, hashtbl[i]); + return; } ==== //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#56 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.452 2006/06/26 22:03:21 babkin Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.453 2006/07/05 02:32:54 davidxu Exp $ cpu I486_CPU cpu I586_CPU @@ -30,7 +30,6 @@ #options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler -#options SCHED_CORE # CORE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols ==== //depot/projects/trustedbsd/base/sys/ia64/include/ieeefp.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/ieeefp.h,v 1.4 2003/08/11 21:25:19 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/ieeefp.h,v 1.5 2006/07/05 06:10:21 bde Exp $ */ #ifndef _MACHINE_IEEEFP_H_ @@ -39,10 +39,10 @@ #define FP_X_IMP IA64_FPSR_TRAP_ID /* imprecise(inexact) exception */ typedef enum { - FP_RZ=0, /* round to zero (truncate) */ - FP_RM=1, /* round toward negative infinity */ - FP_RN=2, /* round to nearest representable number */ - FP_RP=3 /* round toward positive infinity */ + FP_RN = 0, /* round to nearest */ + FP_RM, /* round toward minus infinity */ + FP_RP, /* round toward plus infinity */ + FP_RZ /* round toward zero */ } fp_rnd_t; -#endif /* _MACHINE_IEEEFP_H_ */ +#endif /* !_MACHINE_IEEEFP_H_ */ ==== //depot/projects/trustedbsd/base/sys/net/bpf.c#42 (text+ko) ==== @@ -33,7 +33,7 @@ * * @(#)bpf.c 8.4 (Berkeley) 1/9/95 * - * $FreeBSD: src/sys/net/bpf.c,v 1.168 2006/06/15 15:39:12 csjp Exp $ + * $FreeBSD: src/sys/net/bpf.c,v 1.169 2006/07/03 20:02:06 csjp Exp $ */ #include "opt_bpf.h" @@ -1152,7 +1152,7 @@ d->bd_pid = curthread->td_proc->p_pid; kn->kn_fop = &bpfread_filtops; kn->kn_hook = d; - knlist_add(&d->bd_sel.si_note, kn, 0); + knlist_add(&d->bd_sel.si_note, kn, 1); BPFD_UNLOCK(d); return (0); @@ -1163,9 +1163,7 @@ { struct bpf_d *d = (struct bpf_d *)kn->kn_hook; - BPFD_LOCK(d); knlist_remove(&d->bd_sel.si_note, kn, 0); - BPFD_UNLOCK(d); } static int ==== //depot/projects/trustedbsd/base/sys/net/if_enc.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_enc.c,v 1.3 2006/06/28 21:57:35 thompsa Exp $ + * $FreeBSD: src/sys/net/if_enc.c,v 1.4 2006/07/04 23:09:11 thompsa Exp $ */ #include @@ -86,27 +86,18 @@ static int enc_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rt); static int enc_clone_create(struct if_clone *, int); -static int enc_clone_destroy(struct ifnet *); +static void enc_clone_destroy(struct ifnet *); IFC_SIMPLE_DECLARE(enc, 1); -static int +static void enc_clone_destroy(struct ifnet *ifp) { + KASSERT(ifp != encif, ("%s: destroying encif", __func__)); - mtx_lock(&enc_mtx); - /* do not allow enc0 to be destroyed */ - if (encif == ifp) { - mtx_unlock(&enc_mtx); - return (EBUSY); - } - mtx_unlock(&enc_mtx); - bpfdetach(ifp); if_detach(ifp); if_free(ifp); - - return (0); } static int ==== //depot/projects/trustedbsd/base/sys/netinet/libalias/libalias.3#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/netinet/libalias/libalias.3,v 1.54 2005/11/24 14:17:35 ru Exp $ +.\" $FreeBSD: src/sys/netinet/libalias/libalias.3,v 1.55 2006/07/04 20:39:38 maxim Exp $ .\" -.Dd January 17, 2004 +.Dd July 04, 2006 .Dt LIBALIAS 3 .Os .Sh NAME @@ -1011,8 +1011,3 @@ a unique aliasing link can be established. In an alternate operating mode, the first choice of an aliasing port is also random and unrelated to the local port number. -.Sh BUGS -PPTP aliasing does not work when more than one internal client -connects to the same external server at the same time, because -PPTP requires a single TCP control connection to be established -between any two IP addresses. ==== //depot/projects/trustedbsd/base/sys/security/audit/audit.h#3 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.h,v 1.6 2006/03/19 17:34:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit.h,v 1.7 2006/07/03 14:55:55 rwatson Exp $ */ /* @@ -151,7 +151,7 @@ void audit_arg_process(struct proc *p); void audit_arg_signum(u_int signum); void audit_arg_socket(int sodomain, int sotype, int soprotocol); -void audit_arg_sockaddr(struct thread *td, struct sockaddr *so); +void audit_arg_sockaddr(struct thread *td, struct sockaddr *sa); void audit_arg_auid(uid_t auid); void audit_arg_auditinfo(struct auditinfo *au_info); void audit_arg_upath(struct thread *td, char *upath, u_int64_t flags); ==== //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#4 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_arg.c,v 1.4 2006/06/05 16:12:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_arg.c,v 1.5 2006/07/03 14:55:55 rwatson Exp $ */ #include @@ -357,13 +357,14 @@ { struct kaudit_record *ar; + KASSERT(p != NULL, ("audit_arg_process: p == NULL")); + + PROC_LOCK_ASSERT(p, MA_OWNED); + ar = currecord(); - if ((ar == NULL) || (p == NULL)) + if (ar == NULL) return; - /* - * 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]; @@ -404,21 +405,21 @@ ARG_SET_VALID(ar, 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) +audit_arg_sockaddr(struct thread *td, struct sockaddr *sa) { struct kaudit_record *ar; + KASSERT(td != NULL, ("audit_arg_sockaddr: td == NULL")); + KASSERT(sa != NULL, ("audit_arg_sockaddr: sa == NULL")); + ar = currecord(); - if (ar == NULL || td == NULL || so == NULL) + if (ar == NULL) return; - bcopy(so, &ar->k_ar.ar_arg_sockaddr, sizeof(ar->k_ar.ar_arg_sockaddr)); - switch (so->sa_family) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 11:21:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA12616A4DA for ; Wed, 5 Jul 2006 11:21:50 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E4A143D4C for ; Wed, 5 Jul 2006 11:21:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 72B9D46C41 for ; Wed, 5 Jul 2006 07:21:42 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B30B8562E0; Wed, 5 Jul 2006 11:21:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AE06016A4E1; Wed, 5 Jul 2006 11:21:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F75716A4EB for ; Wed, 5 Jul 2006 11:21:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD0C343D64 for ; Wed, 5 Jul 2006 11:21: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.6/8.13.6) with ESMTP id k65BLaqH016818 for ; Wed, 5 Jul 2006 11:21:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65BLYtj016815 for perforce@freebsd.org; Wed, 5 Jul 2006 11:21:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 11:21:34 GMT Message-Id: <200607051121.k65BLYtj016815@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 100616 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 11:21:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=100616 Change 100616 by rwatson@rwatson_zoo on 2006/07/05 11:20:32 Integrate TrustedBSD audit3 branch from TrustedBSD base branch: - Loop back merge of OpenBSM 1.0 alpha 7 changes to src/sys/bsm and src/sys/security/audit from src/contrib/openbsm. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#10 integrate .. //depot/projects/trustedbsd/audit3/bin/cp/cp.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/src/e_scalbf.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/dhclient.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#24 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#16 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/atkbdc/atkbdc_isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_aue.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/include/ieeefp.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_enc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/libalias/libalias.3#3 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#17 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#19 integrate .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/Doxyfile#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Dependencies#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-cam#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-geom#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-kern#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-linux#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Doxyfile-vm#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/README#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/common-Doxyfile#1 branch .. //depot/projects/trustedbsd/audit3/tools/kerneldoc/subsys/notreviewed.dox#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#12 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mtree/misc.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mtree/mtree.8#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mtree/mtree.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mtree/spec.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mtree/test/test05.sh#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/mtree/verify.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/command.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/config.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/devices.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/disks.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/dispatch.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/dmenu.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/globals.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/help/partition.hlp#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/help/slice.hlp#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/install.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/keymap.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/label.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/list.h#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/main.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/menus.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/misc.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/msg.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/rtermcap.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/sade.8#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/sade.h#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/system.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/termcap.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/usb.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/variable.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/wizard.c#1 branch Differences ... ==== //depot/projects/trustedbsd/audit3/MAINTAINERS#10 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.136 2006/07/01 10:51:54 markm Exp $ +$FreeBSD: src/MAINTAINERS,v 1.137 2006/07/04 02:01:48 brooks Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -59,8 +59,6 @@ Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. -dhcp mbr Needs to pre-approve commits to contrib/isc-dhcp, so - changes can be made to the isc.org CVS repository. libfetch des Advance notification requested. fetch des Advance notification requested. libpam des Pre-commit review requested. @@ -140,7 +138,6 @@ bin/dd/Makefile:MAINTAINER= green@FreeBSD.org games/fortune/datfiles/Makefile:MAINTAINER= jkh gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch -sbin/dhclient/Makefile.inc:MAINTAINER= mbr sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org ==== //depot/projects/trustedbsd/audit3/bin/cp/cp.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.52 2005/09/05 04:36:08 csjp Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.53 2006/07/04 20:52:36 maxim Exp $"); /* * Cp copies source files to target files. @@ -476,6 +476,7 @@ } if (errno) err(1, "fts_read"); + fts_close(ftsp); return (rval); } ==== //depot/projects/trustedbsd/audit3/lib/msun/src/e_scalbf.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.10 2005/12/06 20:12:38 obrien Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_scalbf.c,v 1.11 2006/07/05 02:16:29 bde Exp $"; #endif #include "math.h" @@ -42,5 +42,3 @@ return scalbnf(x,(int)fn); #endif } - -__weak_reference(scalbf, ldexpf); ==== //depot/projects/trustedbsd/audit3/sbin/dhclient/dhclient.c#4 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/dhclient/dhclient.c,v 1.15 2006/05/23 16:57:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sbin/dhclient/dhclient.c,v 1.16 2006/07/03 22:05:38 jkim Exp $"); #include "dhcpd.h" #include "privsep.h" @@ -1480,7 +1480,6 @@ } } -#ifdef SEND_CLIENT_IDENTIFIER /* set unique client identifier */ char client_ident[sizeof(struct hardware)]; if (!options[DHO_DHCP_CLIENT_IDENTIFIER]) { @@ -1494,7 +1493,6 @@ options[DHO_DHCP_CLIENT_IDENTIFIER]->buf_size = hwlen+1; options[DHO_DHCP_CLIENT_IDENTIFIER]->timeout = 0xFFFFFFFF; } -#endif /* Set up the option buffer... */ ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0, @@ -1606,7 +1604,6 @@ } } -#ifdef SEND_CLIENT_IDENTIFIER /* set unique client identifier */ char client_ident[sizeof(struct hardware)]; if (!options[DHO_DHCP_CLIENT_IDENTIFIER]) { @@ -1620,7 +1617,6 @@ options[DHO_DHCP_CLIENT_IDENTIFIER]->buf_size = hwlen+1; options[DHO_DHCP_CLIENT_IDENTIFIER]->timeout = 0xFFFFFFFF; } -#endif /* Set up the option buffer... */ ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0, ==== //depot/projects/trustedbsd/audit3/sys/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.36 2006/05/29 19:29:41 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.37 2006/07/04 14:14:16 maxim Exp $ .include @@ -10,7 +10,7 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ +CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \ ==== //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.563 2006/07/02 18:22:46 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.564 2006/07/05 07:04:31 alc Exp $"); /* * Manages physical address maps. @@ -207,7 +207,7 @@ static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); -static void pmap_clear_ptes(vm_page_t m, long bit); +static void pmap_clear_write(vm_page_t m); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); @@ -2969,47 +2969,36 @@ } /* - * Clear the given bit in each of the given page's ptes. + * Clear the write and modified bits in each of the given page's mappings. */ static __inline void -pmap_clear_ptes(vm_page_t m, long bit) +pmap_clear_write(vm_page_t m) { pv_entry_t pv; pmap_t pmap; - pt_entry_t pbits, *pte; + pt_entry_t oldpte, *pte; - if ((m->flags & PG_FICTITIOUS) || - (bit == PG_RW && (m->flags & PG_WRITEABLE) == 0)) + if ((m->flags & PG_FICTITIOUS) != 0 || + (m->flags & PG_WRITEABLE) == 0) return; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - /* - * Loop over all current mappings setting/clearing as appropos If - * setting RO do we need to clear the VAC? - */ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); retry: - pbits = *pte; - if (pbits & bit) { - if (bit == PG_RW) { - if (!atomic_cmpset_long(pte, pbits, - pbits & ~(PG_RW | PG_M))) - goto retry; - if (pbits & PG_M) { - vm_page_dirty(m); - } - } else { - atomic_clear_long(pte, bit); - } + oldpte = *pte; + if (oldpte & PG_RW) { + if (!atomic_cmpset_long(pte, oldpte, oldpte & + ~(PG_RW | PG_M))) + goto retry; + if ((oldpte & PG_M) != 0) + vm_page_dirty(m); pmap_invalidate_page(pmap, pv->pv_va); } PMAP_UNLOCK(pmap); } - if (bit == PG_RW) - vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_flag_clear(m, PG_WRITEABLE); } /* @@ -3022,7 +3011,7 @@ { if ((prot & VM_PROT_WRITE) == 0) { if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_clear_ptes(m, PG_RW); + pmap_clear_write(m); } else { pmap_remove_all(m); } @@ -3082,7 +3071,23 @@ void pmap_clear_modify(vm_page_t m) { - pmap_clear_ptes(m, PG_M); + pv_entry_t pv; + pmap_t pmap; + pt_entry_t *pte; + + if ((m->flags & PG_FICTITIOUS) != 0) + return; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); + if (*pte & PG_M) { + atomic_clear_long(pte, PG_M); + pmap_invalidate_page(pmap, pv->pv_va); + } + PMAP_UNLOCK(pmap); + } } /* @@ -3093,7 +3098,23 @@ void pmap_clear_reference(vm_page_t m) { - pmap_clear_ptes(m, PG_A); + pv_entry_t pv; + pmap_t pmap; + pt_entry_t *pte; + + if ((m->flags & PG_FICTITIOUS) != 0) + return; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte(pmap, pv->pv_va); + if (*pte & PG_A) { + atomic_clear_long(pte, PG_A); + pmap_invalidate_page(pmap, pv->pv_va); + } + PMAP_UNLOCK(pmap); + } } /* ==== //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#8 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.462 2006/06/26 22:03:20 babkin Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.463 2006/07/05 02:32:55 davidxu Exp $ cpu HAMMER ident GENERIC @@ -28,7 +28,6 @@ #options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler -#options SCHED_CORE # CORE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#24 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#23 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.5 2006/02/06 01:12:46 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#24 $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.6 2006/07/03 14:45:43 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#16 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#15 $ - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.2 2006/06/05 13:00:52 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#16 $ + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.3 2006/07/03 14:44:13 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.164 2006/06/28 09:59:09 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.165 2006/07/04 20:36:03 sos Exp $"); #include "opt_ata.h" #include @@ -142,6 +142,7 @@ static void ata_promise_queue_hpkt(struct ata_pci_controller *ctlr, u_int32_t hpkt); static void ata_promise_next_hpkt(struct ata_pci_controller *ctlr); static int ata_serverworks_chipinit(device_t dev); +static int ata_serverworks_allocate(device_t dev); static void ata_serverworks_setmode(device_t dev, int mode); static int ata_sii_chipinit(device_t dev); static int ata_cmd_allocate(device_t dev); @@ -1894,6 +1895,8 @@ for (i = ATA_DATA; i < ATA_MAX_RES; i++) ch->r_io[i].res = ctlr->r_res2; + + /* setup ATA registers */ ch->r_io[ATA_DATA].offset = ch_offset + 0x00; ch->r_io[ATA_FEATURE].offset = ch_offset + 0x06; ch->r_io[ATA_COUNT].offset = ch_offset + 0x08; @@ -1906,9 +1909,13 @@ ch->r_io[ATA_STATUS].offset = ch_offset + 0x1c; ch->r_io[ATA_ALTSTAT].offset = ch_offset + 0x28; ch->r_io[ATA_CONTROL].offset = ch_offset + 0x29; + + /* setup DMA registers */ ch->r_io[ATA_SSTATUS].offset = ch_offset + 0x100; ch->r_io[ATA_SERROR].offset = ch_offset + 0x104; ch->r_io[ATA_SCONTROL].offset = ch_offset + 0x108; + + /* setup SATA registers */ ch->r_io[ATA_BMCMD_PORT].offset = ch_offset + 0x70; ch->r_io[ATA_BMSTAT_PORT].offset = ch_offset + 0x72; ch->r_io[ATA_BMDTP_PORT].offset = ch_offset + 0x74; @@ -3890,11 +3897,14 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_ROSB4, 0x00, SWKS33, 0x00, ATA_UDMA2, "ROSB4" }, - { ATA_CSB5, 0x92, SWKS100, 0x00, ATA_UDMA5, "CSB5" }, - { ATA_CSB5, 0x00, SWKS66, 0x00, ATA_UDMA4, "CSB5" }, - { ATA_CSB6, 0x00, SWKS100, 0x00, ATA_UDMA5, "CSB6" }, - { ATA_CSB6_1, 0x00, SWKS66, 0x00, ATA_UDMA4, "CSB6" }, + {{ ATA_ROSB4, 0x00, SWKS33, 0x00, ATA_UDMA2, "ROSB4" }, + { ATA_CSB5, 0x92, SWKS100, 0x00, ATA_UDMA5, "CSB5" }, + { ATA_CSB5, 0x00, SWKS66, 0x00, ATA_UDMA4, "CSB5" }, + { ATA_CSB6, 0x00, SWKS100, 0x00, ATA_UDMA5, "CSB6" }, + { ATA_CSB6_1, 0x00, SWKS66, 0x00, ATA_UDMA4, "CSB6" }, + { ATA_HT1000, 0x00, SWKS100, 0x00, ATA_UDMA5, "HT1000" }, + { ATA_HT1000_S1, 0x00, SWKS100, 0x00, ATA_SA150, "HT1000 SATA" }, + { ATA_HT1000_S2, 0x00, SWKSMIO, 0x00, ATA_SA150, "HT1000 SATA mmio" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; @@ -3917,7 +3927,19 @@ if (ata_setup_interrupt(dev)) return ENXIO; - if (ctlr->chip->cfg1 == SWKS33) { + if (ctlr->chip->cfg1 == SWKSMIO) { + ctlr->r_type2 = SYS_RES_MEMORY; + ctlr->r_rid2 = PCIR_BAR(5); + if (!(ctlr->r_res2 = bus_alloc_resource_any(dev, ctlr->r_type2, + &ctlr->r_rid2, RF_ACTIVE))) + return ENXIO; + + ctlr->channels = 4; + ctlr->allocate = ata_serverworks_allocate; + ctlr->setmode = ata_sata_setmode; + return 0; + } + else if (ctlr->chip->cfg1 == SWKS33) { device_t *children; int nchildren, i; @@ -3943,6 +3965,46 @@ return 0; } +static int +ata_serverworks_allocate(device_t dev) +{ + struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); + struct ata_channel *ch = device_get_softc(dev); + int ch_offset; + int i; + + ch_offset = ch->unit * 0x100; + + for (i = ATA_DATA; i < ATA_MAX_RES; i++) + ch->r_io[i].res = ctlr->r_res2; + + /* setup ATA registers */ + ch->r_io[ATA_DATA].offset = ch_offset + 0x00; + ch->r_io[ATA_FEATURE].offset = ch_offset + 0x04; + ch->r_io[ATA_COUNT].offset = ch_offset + 0x08; + ch->r_io[ATA_SECTOR].offset = ch_offset + 0x0c; + ch->r_io[ATA_CYL_LSB].offset = ch_offset + 0x10; + ch->r_io[ATA_CYL_MSB].offset = ch_offset + 0x14; + ch->r_io[ATA_DRIVE].offset = ch_offset + 0x18; + ch->r_io[ATA_COMMAND].offset = ch_offset + 0x1c; + ch->r_io[ATA_CONTROL].offset = ch_offset + 0x20; + ata_default_registers(dev); + + /* setup DMA registers */ + ch->r_io[ATA_BMCMD_PORT].offset = ch_offset + 0x30; + ch->r_io[ATA_BMSTAT_PORT].offset = ch_offset + 0x32; + ch->r_io[ATA_BMDTP_PORT].offset = ch_offset + 0x34; + + /* setup SATA registers */ + ch->r_io[ATA_SSTATUS].offset = ch_offset + 0x40; + ch->r_io[ATA_SERROR].offset = ch_offset + 0x44; + ch->r_io[ATA_SCONTROL].offset = ch_offset + 0x48; + + ch->flags |= ATA_NO_SLAVE; + ata_pci_hw(dev); + return 0; +} + static void ata_serverworks_setmode(device_t dev, int mode) { @@ -4200,6 +4262,7 @@ ch->r_io[ATA_CONTROL].offset = 0x8a + (unit01 << 6) + (unit10 << 8); ch->r_io[ATA_IDX_ADDR].res = ctlr->r_res2; ata_default_registers(dev); + ch->r_io[ATA_BMCMD_PORT].res = ctlr->r_res2; ch->r_io[ATA_BMCMD_PORT].offset = 0x00 + (unit01 << 3) + (unit10 << 8); ch->r_io[ATA_BMSTAT_PORT].res = ctlr->r_res2; ==== //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-lowlevel.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.76 2006/01/18 09:14:55 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.77 2006/07/04 20:36:03 sos Exp $"); #include "opt_ata.h" #include @@ -719,7 +719,7 @@ DELAY(20); } if (timeout <= 0) { - device_printf(request->dev,"timeout waiting for ATAPI ready\n"); + device_printf(request->dev, "timeout waiting for ATAPI ready\n"); request->result = EIO; return -1; } ==== //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.64 2006/03/13 14:01:37 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.65 2006/07/04 20:36:03 sos Exp $ */ /* structure holding chipset config info */ @@ -249,6 +249,9 @@ #define ATA_CSB5 0x02121166 #define ATA_CSB6 0x02131166 #define ATA_CSB6_1 0x02171166 +#define ATA_HT1000 0x02141166 +#define ATA_HT1000_S1 0x024b1166 +#define ATA_HT1000_S2 0x024a1166 #define ATA_SILICON_IMAGE_ID 0x1095 #define ATA_SII3114 0x31141095 @@ -362,6 +365,7 @@ #define SWKS33 0 #define SWKS66 1 #define SWKS100 2 +#define SWKSMIO 3 #define SIIMEMIO 1 #define SIIINTR 0x01 ==== //depot/projects/trustedbsd/audit3/sys/dev/atkbdc/atkbdc_isa.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc_isa.c,v 1.35 2006/06/12 14:46:44 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbdc_isa.c,v 1.36 2006/07/03 23:40:58 jkim Exp $"); #include "opt_kbd.h" @@ -112,15 +112,21 @@ * The AT keyboard controller uses two ports (a command/data port * 0x60 and a status port 0x64), which may be given to us in * one resource (0x60 through 0x64) or as two separate resources - * (0x60 and 0x64). Furthermore, /boot/device.hints may contain - * just one port, 0x60. We shall adjust resource settings - * so that these two ports are available as two separate resources. + * (0x60 and 0x64). Some brain-damaged ACPI BIOS has reversed + * command/data port and status port. Furthermore, /boot/device.hints + * may contain just one port, 0x60. We shall adjust resource settings + * so that these two ports are available as two separate resources + * in correct order. */ device_quiet(dev); rid = 0; if (bus_get_resource(dev, SYS_RES_IOPORT, rid, &start, &count) != 0) return ENXIO; - if (count > 1) /* adjust the count */ + if (start == IO_KBD + KBD_STATUS_PORT) { + start = IO_KBD; + count++; + } + if (count > 1) /* adjust the count and/or start port */ bus_set_resource(dev, SYS_RES_IOPORT, rid, start, 1); port0 = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE); if (port0 == NULL) ==== //depot/projects/trustedbsd/audit3/sys/dev/isp/isp.c#9 (text+ko) ==== @@ -34,7 +34,7 @@ */ #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.120 2006/07/03 08:24:09 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.121 2006/07/03 20:56:48 mjacob Exp $"); #endif /* @@ -1329,7 +1329,11 @@ icbp->icb_hardaddr = 0; } - if (IS_2322(isp) || IS_24XX(isp)) { + /* + * Our life seems so much better with 2200s and later with + * the latest f/w if we set Hard Address. + */ + if (ISP_FW_NEWER_THAN(isp, 2, 2, 5)) { icbp->icb_fwoptions |= ICBOPT_HARD_ADDRESS; } @@ -2238,7 +2242,7 @@ hival = FC_PORT_ID; break; default: - isp_prt(isp, ISP_LOGDEBUG0, "no loop scasn\n"); + isp_prt(isp, ISP_LOGDEBUG0, "no loop topology to scan"); fcp->isp_loopstate = LOOP_LSCAN_DONE; return (0); } ==== //depot/projects/trustedbsd/audit3/sys/dev/sk/if_sk.c#3 (text) ==== @@ -48,7 +48,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.125 2006/06/07 09:05:20 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.126 2006/07/05 04:56:50 yongari Exp $"); /* * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports @@ -140,7 +140,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.125 2006/06/07 09:05:20 yongari Exp $"; + "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.126 2006/07/05 04:56:50 yongari Exp $"; #endif static struct sk_type sk_devs[] = { @@ -2871,8 +2871,8 @@ SK_IF_LOCK(sc_if); /* - * Reclaim first as there is a possibility of loosing Tx completion - * interrupt. + * Reclaim first as there is a possibility of losing Tx completion + * interrupts. */ sk_txeof(sc_if); if (sc_if->sk_cdata.sk_tx_cnt != 0) { ==== //depot/projects/trustedbsd/audit3/sys/dev/usb/if_aue.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.96 2006/02/14 12:44:55 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.97 2006/07/05 00:49:26 thompsa Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -524,6 +524,7 @@ struct ifnet *ifp; struct ifmultiaddr *ifma; u_int32_t h = 0, i; + u_int8_t hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; ifp = sc->aue_ifp; @@ -534,10 +535,6 @@ AUE_CLRBIT(sc, AUE_CTL0, AUE_CTL0_ALLMULTI); - /* first, zot all the existing hash bits */ - for (i = 0; i < 8; i++) - aue_csr_write_1(sc, AUE_MAR0 + i, 0); - /* now program new ones */ IF_ADDR_LOCK(ifp); #if __FreeBSD_version >= 500000 @@ -550,10 +547,14 @@ continue; h = ether_crc32_le(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN) & ((1 << AUE_BITS) - 1); - AUE_SETBIT(sc, AUE_MAR + (h >> 3), 1 << (h & 0x7)); + hashtbl[(h >> 3)] |= 1 << (h & 0x7); } IF_ADDR_UNLOCK(ifp); + /* write the hashtable */ + for (i = 0; i < 8; i++) + aue_csr_write_1(sc, AUE_MAR0 + i, hashtbl[i]); + return; } ==== //depot/projects/trustedbsd/audit3/sys/i386/conf/GENERIC#9 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.452 2006/06/26 22:03:21 babkin Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.453 2006/07/05 02:32:54 davidxu Exp $ cpu I486_CPU cpu I586_CPU @@ -30,7 +30,6 @@ #options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler -#options SCHED_CORE # CORE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols ==== //depot/projects/trustedbsd/audit3/sys/ia64/include/ieeefp.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/ieeefp.h,v 1.4 2003/08/11 21:25:19 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/ieeefp.h,v 1.5 2006/07/05 06:10:21 bde Exp $ */ #ifndef _MACHINE_IEEEFP_H_ @@ -39,10 +39,10 @@ #define FP_X_IMP IA64_FPSR_TRAP_ID /* imprecise(inexact) exception */ typedef enum { - FP_RZ=0, /* round to zero (truncate) */ - FP_RM=1, /* round toward negative infinity */ - FP_RN=2, /* round to nearest representable number */ - FP_RP=3 /* round toward positive infinity */ + FP_RN = 0, /* round to nearest */ + FP_RM, /* round toward minus infinity */ + FP_RP, /* round toward plus infinity */ + FP_RZ /* round toward zero */ } fp_rnd_t; -#endif /* _MACHINE_IEEEFP_H_ */ +#endif /* !_MACHINE_IEEEFP_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/net/bpf.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ * * @(#)bpf.c 8.4 (Berkeley) 1/9/95 * - * $FreeBSD: src/sys/net/bpf.c,v 1.168 2006/06/15 15:39:12 csjp Exp $ + * $FreeBSD: src/sys/net/bpf.c,v 1.169 2006/07/03 20:02:06 csjp Exp $ */ #include "opt_bpf.h" @@ -1152,7 +1152,7 @@ d->bd_pid = curthread->td_proc->p_pid; kn->kn_fop = &bpfread_filtops; kn->kn_hook = d; - knlist_add(&d->bd_sel.si_note, kn, 0); + knlist_add(&d->bd_sel.si_note, kn, 1); BPFD_UNLOCK(d); return (0); @@ -1163,9 +1163,7 @@ { struct bpf_d *d = (struct bpf_d *)kn->kn_hook; - BPFD_LOCK(d); knlist_remove(&d->bd_sel.si_note, kn, 0); - BPFD_UNLOCK(d); } static int ==== //depot/projects/trustedbsd/audit3/sys/net/if_enc.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_enc.c,v 1.3 2006/06/28 21:57:35 thompsa Exp $ + * $FreeBSD: src/sys/net/if_enc.c,v 1.4 2006/07/04 23:09:11 thompsa Exp $ */ #include @@ -86,27 +86,18 @@ static int enc_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rt); static int enc_clone_create(struct if_clone *, int); -static int enc_clone_destroy(struct ifnet *); +static void enc_clone_destroy(struct ifnet *); IFC_SIMPLE_DECLARE(enc, 1); -static int +static void enc_clone_destroy(struct ifnet *ifp) { + KASSERT(ifp != encif, ("%s: destroying encif", __func__)); - mtx_lock(&enc_mtx); - /* do not allow enc0 to be destroyed */ - if (encif == ifp) { - mtx_unlock(&enc_mtx); - return (EBUSY); - } - mtx_unlock(&enc_mtx); - bpfdetach(ifp); if_detach(ifp); if_free(ifp); - - return (0); } static int ==== //depot/projects/trustedbsd/audit3/sys/netinet/libalias/libalias.3#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/netinet/libalias/libalias.3,v 1.54 2005/11/24 14:17:35 ru Exp $ +.\" $FreeBSD: src/sys/netinet/libalias/libalias.3,v 1.55 2006/07/04 20:39:38 maxim Exp $ .\" -.Dd January 17, 2004 +.Dd July 04, 2006 .Dt LIBALIAS 3 .Os .Sh NAME @@ -1011,8 +1011,3 @@ a unique aliasing link can be established. In an alternate operating mode, the first choice of an aliasing port is also random and unrelated to the local port number. -.Sh BUGS -PPTP aliasing does not work when more than one internal client -connects to the same external server at the same time, because -PPTP requires a single TCP control connection to be established -between any two IP addresses. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#17 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.h,v 1.6 2006/03/19 17:34:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit.h,v 1.7 2006/07/03 14:55:55 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_arg.c,v 1.4 2006/06/05 16:12:00 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_arg.c,v 1.5 2006/07/03 14:55:55 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#12 (text+ko) ==== @@ -1,7 +1,7 @@ /* * FreeBSD * - * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.181 2006/06/22 14:22:20 bsam Exp $ + * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.183 2006/07/04 23:52:12 yongari Exp $ */ #ifndef _calendar_freebsd_ @@ -139,7 +139,7 @@ 06/29 Daniel Harris born in Lubbock, Texas, United States, 1985 06/29 Andrew Pantyukhin born in Moscow, Russian Federation, 1985 06/30 Guido van Rooij born in Best, Noord-Brabant, the Netherlands, 1965 -07/01 Matthew Dillon born in San Francisco, California, United States, 1966 +07/01 Matthew Dillon born in San Francisco, California, United States, 1966 07/02 Mark Christopher Ovens born in Preston, Lancashire, United Kingdom, 1958 07/02 Vasil Venelinov Dimov born in Shumen, Bulgaria, 1982 07/04 Motoyuki Konno born in Musashino, Tokyo, Japan, 1969 @@ -186,6 +186,7 @@ 08/28 Norikatsu Shigemura born in Fujisawa, Kanagawa, Japan, 1974 08/29 Thomas Gellekum born in Moenchengladbach, Nordrhein-Westfalen, Germany, 1967 08/29 Max Laier born in Karlsruhe, Germany, 1981 +09/01 Pyun YongHyeon born in Kimcheon, Korea, 1968 09/03 Max Khon born in Novosibirsk, USSR, 1976 09/03 Cheng-Lung Sung born in Taipei, Taiwan, Republic of China, 1977 09/05 Mark Robert Vaughan Murray born in Harare, Mashonaland, Zimbabwe, 1961 ==== //depot/projects/trustedbsd/audit3/usr.sbin/mtree/misc.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /*not lint */ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/mtree/misc.c,v 1.16 2005/03/29 11:44:17 tobez Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/mtree/misc.c,v 1.17 2006/07/03 10:55:21 maxim Exp $"); #include #include @@ -66,6 +66,7 @@ {"mode", F_MODE, NEEDVALUE}, {"nlink", F_NLINK, NEEDVALUE}, {"nochange", F_NOCHANGE, 0}, + {"optional", F_OPT, 0}, #ifdef RMD160 {"ripemd160digest", F_RMD160, NEEDVALUE}, #endif ==== //depot/projects/trustedbsd/audit3/usr.sbin/mtree/mtree.8#5 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)mtree.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/usr.sbin/mtree/mtree.8,v 1.53 2005/07/31 03:30:47 keramida Exp $ +.\" $FreeBSD: src/usr.sbin/mtree/mtree.8,v 1.54 2006/07/03 10:55:21 maxim Exp $ .\" -.Dd March 29, 2005 +.Dd July 03, 2006 .Dt MTREE 8 .Os .Sh NAME @@ -221,6 +221,9 @@ The number of hard links the file is expected to have. .It Cm nochange Make sure this file or directory exists but otherwise ignore all attributes. +.It Cm optional +The file is optional; do not complain about the file if it is +not in the file hierarchy. .It Cm uid The file owner as a numeric value. .It Cm uname ==== //depot/projects/trustedbsd/audit3/usr.sbin/mtree/mtree.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mtree.h 8.1 (Berkeley) 6/6/93 - * $FreeBSD: src/usr.sbin/mtree/mtree.h,v 1.7 2005/03/29 11:44:17 tobez Exp $ + * $FreeBSD: src/usr.sbin/mtree/mtree.h,v 1.8 2006/07/03 10:55:21 maxim Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 11:46:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB93216A4EA for ; Wed, 5 Jul 2006 11:46:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9AE943D96 for ; Wed, 5 Jul 2006 11:46:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0C9CF46CCE for ; Wed, 5 Jul 2006 07:46:22 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8423B56724; Wed, 5 Jul 2006 11:46:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CD7116A4ED; Wed, 5 Jul 2006 11:46:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C7EF16A4EC for ; Wed, 5 Jul 2006 11:46:09 +0000 (UTC) (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 BBCC743D66 for ; Wed, 5 Jul 2006 11:46:07 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65Bk73w018674 for ; Wed, 5 Jul 2006 11:46:07 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65Bk7mc018671 for perforce@freebsd.org; Wed, 5 Jul 2006 11:46:07 GMT (envelope-from wsalamon@computer.org) Date: Wed, 5 Jul 2006 11:46:07 GMT Message-Id: <200607051146.k65Bk7mc018671@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 100617 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 11:46:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=100617 Change 100617 by wsalamon@vh3 on 2006/07/05 11:45:21 Revert unecessary line break change added @99910. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#36 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#36 (text+ko) ==== @@ -610,8 +610,8 @@ acl_type_t type, struct acl *aclp); } 350 AUE_NULL MSTD { int __acl_set_fd(int filedes, \ acl_type_t type, struct acl *aclp); } -351 AUE_NULL MSTD { int __acl_delete_file( \ - const char *path, acl_type_t type); } +351 AUE_NULL MSTD { int __acl_delete_file(const char *path, \ + acl_type_t type); } 352 AUE_NULL MSTD { int __acl_delete_fd(int filedes, \ acl_type_t type); } 353 AUE_NULL MSTD { int __acl_aclcheck_file(const char *path, \ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 12:13:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96A9B16A4E7 for ; Wed, 5 Jul 2006 12:13:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF98B43D60 for ; Wed, 5 Jul 2006 12:13:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 541C546CCF for ; Wed, 5 Jul 2006 08:13:40 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9462B5B6DB; Wed, 5 Jul 2006 12:11:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D01616A4DE; Wed, 5 Jul 2006 12:11:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6873E16A4DA for ; Wed, 5 Jul 2006 12:11:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0B4F43D5F for ; Wed, 5 Jul 2006 12:11:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65CBeJ9021028 for ; Wed, 5 Jul 2006 12:11:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65CBeKM021025 for perforce@freebsd.org; Wed, 5 Jul 2006 12:11:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 12:11:40 GMT Message-Id: <200607051211.k65CBeKM021025@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 100619 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 12:13:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=100619 Change 100619 by rwatson@rwatson_zoo on 2006/07/05 12:10:44 Adopt OpenSolaris constant values for audit configuration flags. Leave the old values in for the time being for reference purposes. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#17 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#17 $ */ #ifndef _BSM_AUDIT_H @@ -146,6 +146,7 @@ /* * Audit policy controls. */ +#ifdef OLD_WORLD_ORDER #define AUDIT_CNT 0x0001 #define AUDIT_AHLT 0x0002 #define AUDIT_ARGV 0x0004 @@ -157,6 +158,22 @@ #define AUDIT_GROUP 0x0100 #define AUDIT_TRAIL 0x0200 #define AUDIT_PATH 0x0400 +#else /* !OLD_WORLD_ORDER */ +#define AUDIT_CNT 0x0001 +#define AUDIT_AHLT 0x0002 +#define AUDIT_ARGV 0x0004 +#define AUDIT_ARGE 0x0008 +#define AUDIT_SEQ 0x0010 +#define AUDIT_WINDATA 0x0020 +#define AUDIT_USER 0x0040 +#define AUDIT_GROUP 0x0080 +#define AUDIT_TRAIL 0x0100 +#define AUDIT_PATH 0x0200 +#define AUDIT_SCNT 0x0400 +#define AUDIT_PUBLIC 0x0800 +#define AUDIT_ZONENAME 0x1000 +#define AUDIT_PERZONE 0x2000 +#endif /* !OLD_WORLD_ORDER */ /* * Audit queue control parameters From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 12:14:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 15B7A16A4E5 for ; Wed, 5 Jul 2006 12:14:06 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CFF243D6A for ; Wed, 5 Jul 2006 12:13:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 032D046CD1 for ; Wed, 5 Jul 2006 08:13:45 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A17385C8FA; Wed, 5 Jul 2006 12:11:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B53AE16A562; Wed, 5 Jul 2006 12:11:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 924CE16A55B for ; Wed, 5 Jul 2006 12:11:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CBDE43D60 for ; Wed, 5 Jul 2006 12:11:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65CBfT4021034 for ; Wed, 5 Jul 2006 12:11:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65CBe97021031 for perforce@freebsd.org; Wed, 5 Jul 2006 12:11:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 12:11:40 GMT Message-Id: <200607051211.k65CBe97021031@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 100620 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 12:14:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=100620 Change 100620 by rwatson@rwatson_zoo on 2006/07/05 12:11:16 Update history. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#18 (text+ko) ==== @@ -1,6 +1,7 @@ OpenBSM 1.0 alpha 8 - Correct typo in definition of AUR_INT. +- Adopt OpenSolaris constant values for AUDIT_* configuration flags. OpenBSM 1.0 alpha 7 @@ -179,4 +180,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#17 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#18 $ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 14:25:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4128C16A4F0 for ; Wed, 5 Jul 2006 14:25:52 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F9DA43D46 for ; Wed, 5 Jul 2006 14:25:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9F8E646CCA for ; Wed, 5 Jul 2006 10:25:46 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 20AE256DAD; Wed, 5 Jul 2006 14:25:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 11B9D16A4E2; Wed, 5 Jul 2006 14:25:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A92E616A4DD for ; Wed, 5 Jul 2006 14:25:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59D0543D53 for ; Wed, 5 Jul 2006 14:25:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65EPhaL039972 for ; Wed, 5 Jul 2006 14:25:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65EOXRg039925 for perforce@freebsd.org; Wed, 5 Jul 2006 14:24:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 14:24:33 GMT Message-Id: <200607051424.k65EOXRg039925@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 100630 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 14:25:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=100630 Change 100630 by rwatson@rwatson_zoo on 2006/07/05 14:24:28 Integrate TrustedBSD MAC branch from TrustedBSD base branch, merging changes from base integrations @96149, @98005, @98537, @98552, @98565, @98572, @100149, @100493, @100615. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#33 integrate .. //depot/projects/trustedbsd/mac/Makefile#39 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#66 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#7 integrate .. //depot/projects/trustedbsd/mac/README#7 integrate .. //depot/projects/trustedbsd/mac/UPDATING#56 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.c#17 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.1#11 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/cd.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.c#14 integrate .. //depot/projects/trustedbsd/mac/bin/sh/input.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#23 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-sparc.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/NEWS#10 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmpdef/gensnmpdef.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmpdef/gensnmpdef.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/file/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/adventure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/amigaos#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/animation#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/apple#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/archive#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/audio#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/basis#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/bflt#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/bout#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/btsnoop#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/c64#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/cad#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/commands#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/compress#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/console#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/cracklib#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/ctags#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/database#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/diff#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/digital#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/dump#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/elf#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/filesystems#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/flash#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/fsav#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/gnu#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/iff#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/images#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/java#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/linux#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/lisp#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/mach#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/macintosh#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/mail.news#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/maple#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/msdos#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/mup#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/ncr#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/perl#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/printer#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/psion#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/python#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/riff#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/scientific#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/sgi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/sharc#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/sql#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/varied.out#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.am#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/aclocal.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/apprentice.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/ascmagic.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/compress.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/config.h.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/configure#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/configure.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.man#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/fsmagic.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/funcs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/libmagic.man#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.man#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.mime#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic2mime#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/patchlevel.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/print.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/readelf.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/readelf.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/softmagic.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/netcat/atomicio.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/netcat/atomicio.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/netcat/nc.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/netcat/netcat.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/netcat/socks.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/TODO#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/VERSION#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/auditd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditfilterd/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditfilterd/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditfilterd/auditfilterd.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditfilterd/auditfilterd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditfilterd/auditfilterd.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit_filter.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/audit_record.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/configure#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_filter#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_open.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/audit_submit.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_notify.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_wrappers.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/modules/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/modules/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/modules/auditfilter_noop/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/modules/auditfilter_noop/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/bsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/bsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/openbsm/test/bsm/generate.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/pf/man/pfsync.4#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#19 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/PGPKEYS#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.mc#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/dnsbl.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/enhdnsbl.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/mfapi.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_header.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/engine.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-memstat.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/bf.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#18 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#21 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/domain.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/envelope.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/helpfile#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mime.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/savemail.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/tls.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/util.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#17 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump.1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/top/top.X#8 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/traceroute.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/traceroute.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_namespace.h#1 branch .. //depot/projects/trustedbsd/mac/etc/Makefile#49 integrate .. //depot/projects/trustedbsd/mac/etc/bluetooth/hcsecd.conf#3 integrate .. //depot/projects/trustedbsd/mac/etc/cached.conf#1 branch .. //depot/projects/trustedbsd/mac/etc/defaults/periodic.conf#16 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#47 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#18 integrate .. //depot/projects/trustedbsd/mac/etc/hosts.allow#7 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.root.dist#15 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#38 integrate .. //depot/projects/trustedbsd/mac/etc/netstart#8 integrate .. //depot/projects/trustedbsd/mac/etc/nsswitch.conf#1 branch .. //depot/projects/trustedbsd/mac/etc/periodic/daily/470.status-named#7 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/600.ip6fwdenied#6 delete .. //depot/projects/trustedbsd/mac/etc/periodic/security/650.ip6fwlimit#7 delete .. //depot/projects/trustedbsd/mac/etc/periodic/security/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#33 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/abi#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/auditd#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/bridge#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/cached#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/devd#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ip6fw#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/isdnd#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/jail#14 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ldconfig#13 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mdconfig#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/mdconfig2#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/moused#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/netif#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/nsswitch#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pcvt#5 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/pf#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/syscons#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/sysctl#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.firewall6#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#24 integrate .. //depot/projects/trustedbsd/mac/etc/sendmail/freebsd.mc#11 integrate .. //depot/projects/trustedbsd/mac/etc/sendmail/freebsd.submit.mc#3 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#42 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libgcc_r/Makefile#2 delete .. //depot/projects/trustedbsd/mac/include/arpa/nameser.h#5 integrate .. //depot/projects/trustedbsd/mac/include/glob.h#4 integrate .. //depot/projects/trustedbsd/mac/include/malloc_np.h#2 integrate .. //depot/projects/trustedbsd/mac/include/netdb.h#13 integrate .. //depot/projects/trustedbsd/mac/include/nsswitch.h#4 integrate .. //depot/projects/trustedbsd/mac/include/res_update.h#2 integrate .. //depot/projects/trustedbsd/mac/include/resolv.h#10 integrate .. //depot/projects/trustedbsd/mac/include/rpc/rpcent.h#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libroken/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/csu/common/crtbegin.c#3 delete .. //depot/projects/trustedbsd/mac/lib/csu/common/crtend.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_extract.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libatm/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libbsm/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/Makefile#23 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/SYS.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getgrent.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/gethostname.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getpwent.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/glob.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/glob.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/signal.3#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/syslog.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/_ctx_start.S#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_set_watch.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/isc/list.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/include/nscache.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/include/nscachedcli.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/nameser/Symbol.map#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/nameser/ns_samedomain.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/Makefile.inc#15 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/Symbol.map#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gai_strerror.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#23 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbydns.c#16 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbyht.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbyname.3#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbynis.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostnamadr.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnameinfo.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnetnamadr.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getproto.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getprotoent.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getprotoname.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservbyname.c#6 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/getservbyport.c#6 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/getservent.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/name6.c#21 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/netdb_private.h#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/nscache.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/nscachedcli.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/nsdispatch.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/nsparser.y#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_mkupdate.c#6 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/res_update.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/resolv/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/resolv/h_errno.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_findzonecut.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_mkupdate.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_state.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/resolv/res_update.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/rpc/getrpcent.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/a64l.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#24 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtol.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoul.3#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/tsearch.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strlcpy.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/chflags.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mincore.2#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/stat.2#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/truncate.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/wait.2#7 integrate .. //depot/projects/trustedbsd/mac/lib/libcam/camlib.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/ftp.c#18 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_minidump_amd64.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_minidump_i386.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libmagic/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libmagic/config.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_ssh/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/i386/thr_getcontext.S#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/pthread.map#12 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#23 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#17 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigaction.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_symbols.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libsdp/sdp.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libsdp/util.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/pthread.map#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_attr.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_getschedparam.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_init.c#16 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex.c#15 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutexattr.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_private.h#16 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_setschedparam.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_spec.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libpthread_db.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libpthread_db.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libthr_db.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/kld.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_class.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/pidfile.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/e_scalbf.c#6 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpcmd.y#21 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#70 integrate .. //depot/projects/trustedbsd/mac/release/doc/README#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/alpha/Makefile#4 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml#3 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#26 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#7 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#58 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#7 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml#3 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/install.sgml#15 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#4 delete .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#86 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#22 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#8 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/examples/Makefile.relnotesng#10 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#11 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#7 integrate .. //depot/projects/trustedbsd/mac/release/i386/mkisoimages.sh#7 integrate .. //depot/projects/trustedbsd/mac/release/pc98/fixit-small_crunch.conf#7 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/build/picobsd#12 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#35 integrate .. //depot/projects/trustedbsd/mac/sbin/adjkerntz/adjkerntz.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/devfs/devfs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/dhclient.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpon/dumpon.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#23 integrate .. //depot/projects/trustedbsd/mac/sbin/ffsinfo/ffsinfo.8#10 integrate .. //depot/projects/trustedbsd/mac/sbin/fsdb/fsdb.8#10 integrate .. //depot/projects/trustedbsd/mac/sbin/fsdb/fsdb.c#11 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/eli/geli.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/eli/geom_eli.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/ggatec/ggatec.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/add.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.8#11 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.c#11 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.h#9 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/label.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/remove.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/show.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#35 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifgroup.c#1 branch .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifieee80211.c#16 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifpfsync.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/init/init.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/ip6fw/Makefile#4 delete .. //depot/projects/trustedbsd/mac/sbin/ip6fw/ip6fw.8#13 delete .. //depot/projects/trustedbsd/mac/sbin/ip6fw/ip6fw.c#11 delete .. //depot/projects/trustedbsd/mac/sbin/ip6fw/sample.sh#2 delete .. //depot/projects/trustedbsd/mac/sbin/ipf/ipf/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#38 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#33 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.8#21 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.c#22 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_msdosfs/mount_msdosfs.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_std/mount_std.8#10 integrate .. //depot/projects/trustedbsd/mac/sbin/rcorder/rcorder.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/setkey/setkey.8#3 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/secure/libexec/sftp-server/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/secure/libexec/ssh-keysign/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/scp/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/sftp/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh-add/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh-agent/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh-keygen/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh-keyscan/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#19 integrate .. //depot/projects/trustedbsd/mac/share/examples/diskless/clone_root#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/README.examples#5 integrate .. //depot/projects/trustedbsd/mac/share/examples/kld/cdev/module/cdevmod.c#4 integrate .. //depot/projects/trustedbsd/mac/share/examples/mdoc/example.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#60 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/aac.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi.4#22 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi_dock.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/adv.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/adw.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/aha.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ahb.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ahc.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ahd.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/altq.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/amd.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/amr.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/arcmsr.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ath.4#16 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/atkbd.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/audit.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/auditpipe.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/bge.4#15 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/bt.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/carp.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ciss.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/cpufreq.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/dc.4#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ddb.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/dpt.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/enc.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/esp.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fast_ipsec.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fdc.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fxp.4#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/geom.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/hptmv.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ida.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/if_bridge.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/iir.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ip.4#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ips.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/isp.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ispfw.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/kbdmux.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ktr.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/lmc.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.alpha/Makefile#2 delete .. //depot/projects/trustedbsd/mac/share/man/man4/man4.alpha/linux.4#4 delete .. //depot/projects/trustedbsd/mac/share/man/man4/man4.alpha/osf1.4#4 delete .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/Makefile#19 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/linux.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/lnc.4#8 delete .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/padlock.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mlx.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mly.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mpt.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mxge.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/myri10ge.4#2 delete .. //depot/projects/trustedbsd/mac/share/man/man4/ncr.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ncv.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/nfe.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ng_etf.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_netflow.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_tag.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/nsp.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/pcvt.4#7 delete .. //depot/projects/trustedbsd/mac/share/man/man4/pst.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/re.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/rr232x.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/sched_4bsd.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sched_core.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/sched_ule.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sio.4#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/smp.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_csa.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_envy24.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/snd_gusc.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_ich.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_sbc.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/splash.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/stg.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sym.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/trm.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/twa.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/twe.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/umodem.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uplcom.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uscanner.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uvisor.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vinum.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vkbd.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/wi.4#23 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/Makefile#20 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/devfs.5#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/ext2fs.5#1 branch .. //depot/projects/trustedbsd/mac/share/man/man5/linprocfs.5#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/linsysfs.5#1 branch .. //depot/projects/trustedbsd/mac/share/man/man5/mailer.conf.5#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#38 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/nsswitch.conf.5#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/periodic.conf.5#17 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/procfs.5#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#47 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/reiserfs.5#1 branch .. //depot/projects/trustedbsd/mac/share/man/man5/src.conf.5#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/build.7#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/hier.7#23 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/security.7#15 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/rc.subr.8#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/Makefile#46 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/bus_dma.9#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/crypto.9#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/device_get_sysctl.9#1 branch .. //depot/projects/trustedbsd/mac/share/man/man9/lock.9#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/make_dev.9#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/suser.9#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/sysctl.9#1 branch .. //depot/projects/trustedbsd/mac/share/man/man9/sysctl_add_oid.9#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/sysctl_ctx_init.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/vflush.9#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/vgone.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/zero_copy.9#8 integrate .. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#26 integrate .. //depot/projects/trustedbsd/mac/share/misc/iso3166#8 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.README#12 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.own.mk#14 integrate .. //depot/projects/trustedbsd/mac/share/monetdef/pt_PT.ISO8859-1.src#3 integrate .. //depot/projects/trustedbsd/mac/share/syscons/fonts/iso15-8x14.fnt#3 integrate .. //depot/projects/trustedbsd/mac/share/syscons/fonts/iso15-8x16.fnt#3 integrate .. //depot/projects/trustedbsd/mac/share/syscons/fonts/iso15-8x8.fnt#3 integrate .. //depot/projects/trustedbsd/mac/share/syscons/fonts/iso15-thin-8x16.fnt#3 integrate .. //depot/projects/trustedbsd/mac/share/termcap/termcap.src#17 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/africa#5 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/antarctica#5 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/asia#10 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/australasia#9 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/backward#7 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/etcetera#3 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/europe#10 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/factory#2 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/leapseconds#9 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/northamerica#10 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/southamerica#11 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/systemv#3 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/yearistype.sh#3 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/zone.tab#11 integrate .. //depot/projects/trustedbsd/mac/sys/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/api_up1000.c#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/atomic.s#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/autoconf.c#12 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/busdma_machdep.c#19 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/busspace.c#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/clock.c#16 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/clock_if.m#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/cpuconf.c#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/db_disasm.c#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/db_instruction.h#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/db_interface.c#9 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/db_trace.c#13 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_1000a.c#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_2100_a50.c#9 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_2100_a500.c#9 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_3000_300.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_3000_500.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_axppci_33.c#10 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_eb164.c#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_eb64plus.c#9 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_kn20aa.c#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_kn300.c#9 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_kn8ae.c#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_st550.c#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_st6600.c#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/divrem.m4#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dump_machdep.c#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/elf_machdep.c#13 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/exception.s#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/fp_emulate.c#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/gdb_machdep.c#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/genassym.c#13 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/ieee_float.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/in_cksum.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/interrupt.c#22 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/locore.s#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#39 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mem.c#12 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mp_machdep.c#23 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pal.s#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#42 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/prom.c#11 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/prom_disp.s#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/promcons.c#13 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/sgmap.c#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/support.s#10 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/swtch.s#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/sys_machdep.c#14 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#32 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/uio_machdep.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/uma_machdep.c#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#29 delete .. //depot/projects/trustedbsd/mac/sys/alpha/compile/.cvsignore#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/conf/.cvsignore#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/conf/DEFAULTS#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#39 delete .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC.hints#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/conf/MAC#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/conf/Makefile#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/conf/NOTES#9 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/_bus.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/_inttypes.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/_limits.h#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/_stdint.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/_types.h#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/alpha_cpu.h#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/asm.h#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/atomic.h#12 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/bootinfo.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/bus.h#18 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/bus_dma.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/bwx.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/chipset.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/clock.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/clockvar.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/cpu.h#11 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/cpuconf.h#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/cpufunc.h#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/db_machdep.h#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/elf.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/endian.h#10 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/exec.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/float.h#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/floatingpoint.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/fpu.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/frame.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/gdb_machdep.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/ieee.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/ieeefp.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/in_cksum.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/inst.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/intr.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/intrcnt.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/ioctl_bt848.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/ioctl_meteor.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/kdb.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/limits.h#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/md_var.h#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/memdev.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/mutex.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/pal.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/param.h#12 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/pc/bios.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/pc/display.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/pc/vesa.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/pcb.h#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/pcpu.h#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/pmap.h#17 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/pmc_mdep.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/ppireg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/proc.h#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/profile.h#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/prom.h#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/pte.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/ptrace.h#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/reg.h#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/reloc.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/resource.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/rpb.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/runq.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/setjmp.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/sf_buf.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/sgmap.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/sigframe.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/signal.h#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/smp.h#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/stdarg.h#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/swiz.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/sysarch.h#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/timerreg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/ucontext.h#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/varargs.h#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/vmparam.h#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/isa/isa.c#12 delete .. //depot/projects/trustedbsd/mac/sys/alpha/isa/isa_dma.c#10 delete .. //depot/projects/trustedbsd/mac/sys/alpha/isa/isavar.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/isa/mcclock_isa.c#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux.h#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_dummy.c#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_genassym.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_locore.s#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_machdep.c#15 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_proto.h#17 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_syscall.h#16 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysent.c#16 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysvec.c#19 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/syscalls.conf#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/linux/syscalls.master#16 delete .. //depot/projects/trustedbsd/mac/sys/alpha/mcbus/mcbus.c#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/mcbus/mcbusreg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/mcbus/mcbusvar.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/mcbus/mcmem.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/mcbus/mcpcia.c#14 delete .. //depot/projects/trustedbsd/mac/sys/alpha/mcbus/mcpciareg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/mcbus/mcpciavar.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/Makefile#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/exec_ecoff.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/imgact_osf1.c#14 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_ioctl.c#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_misc.c#25 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#18 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_proto.h#9 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_signal.c#18 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_signal.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_syscall.h#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_sysent.c#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_sysvec.c#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_util.h#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/syscalls.conf#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/syscalls.master#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/alphapci_if.m#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/apecs.c#10 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/apecs_pci.c#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/apecsreg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/apecsvar.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/bwx.c#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/cia.c#10 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/cia_pci.c#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/ciareg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/ciavar.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/irongate.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/irongate_pci.c#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/irongatereg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/irongatevar.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/lca.c#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/lca_pci.c#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/lcareg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/lcavar.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/pci_eb164_intr.s#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/pci_eb64plus_intr.s#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/pcibus.c#9 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/pcibus.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/swiz.c#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/t2.c#10 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/t2_pci.c#7 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/t2reg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/t2var.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/tsunami.c#9 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/tsunami_pci.c#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/tsunamireg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/dwlpx.c#11 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/dwlpxreg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/dwlpxvar.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/gbus.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/kftxx.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/kftxxreg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/mcclock_tlsb.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/tlsb.c#6 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/tlsbcpu.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/tlsbmem.c#5 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/tlsbreg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/tlsbvar.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/zs_tlsb.c#12 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/apic_vector.S#10 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/busdma_machdep.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/fpu.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/initcpu.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/pmap.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/apicvar.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/clock.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/cpu.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/md_var.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/mutex.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/pmap.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/smp.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/specialreg.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/busdma_machdep.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/inckern.S#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/locore.S#7 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/machdep.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/pmap.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/vm_machdep.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/files.at91#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/IQ31244#7 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/KB920X#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/SIMICS#6 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/SKYEYE#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/_types.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/atomic.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/cpu.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/cpuconf.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/pmap.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/sa11x0/sa11x0_io.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/sa11x0/sa11x0_reg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/sa11x0/sa11x0_var.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/sa11x0/uart_cpu_sa1110.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/sa11x0/uart_dev_sa1110.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/i80321_space.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/iq31244_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/iq80321.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/sys/boot/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/Makefile.inc#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/boot1/Makefile#8 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/boot1/boot1.c#5 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/cdboot/Makefile#5 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/cdboot/version#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/common/Makefile.common#7 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/common/conf.c#5 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/common/help.alpha#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/common/ldscript#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/common/main.c#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/Makefile#5 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/OSFpal.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/alpha_copy.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/alpha_module.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/bootinfo.c#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/common.h#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/delay.c#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/devicename.c#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/elf_freebsd.c#5 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/getsecs.c#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/libalpha.h#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/prom.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/reboot.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/srmdisk.c#5 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/srmnet.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/time.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/loader/Makefile#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/loader/version#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/netboot/Makefile#5 delete .. //depot/projects/trustedbsd/mac/sys/boot/alpha/netboot/version#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/Makefile.inc#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/include/arcfuncs.h#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/include/arctypes.h#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/include/libarc.h#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/Makefile#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/abort.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/arcconsole.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/arcdisk.c#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/bootinfo.c#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/delay.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/devicename.c#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/elf_freebsd.c#5 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/module.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/prom.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/setjmperr.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/time.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/loader/Makefile#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/loader/conf.c#4 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/loader/help.alpha#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/loader/main.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/arc/loader/version#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/common/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/load_elf.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/loader.8#29 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/bootinfo.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ficl/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ficl/alpha/sysdep.c#3 delete .. //depot/projects/trustedbsd/mac/sys/boot/ficl/alpha/sysdep.h#5 delete .. //depot/projects/trustedbsd/mac/sys/boot/ficl/loader.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.4th#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#32 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot0/boot0.S#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/biosdisk.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ia64/ski/bootinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ia64/ski/conf.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/boot2/io.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/powerpc/loader/conf.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/bsm/audit.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/bsm/audit_record.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_ccb.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_debug.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_periph.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_xpt.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_all.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_target.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/coda/cnode.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_misc.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_proto.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linprocfs/linprocfs.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ipc.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_signal.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_socket.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_util.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_util.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/kern_ndis.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_hal.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_ndis.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_ntoskrnl.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_ipc.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_proto.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_syscall.h#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 15:49:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D4C916A4E1 for ; Wed, 5 Jul 2006 15:49:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFF8443D64 for ; Wed, 5 Jul 2006 15:49:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9250E46CC0 for ; Wed, 5 Jul 2006 11:49:31 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B5B4F55ED8; Wed, 5 Jul 2006 15:49:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A11E216A4E5; Wed, 5 Jul 2006 15:49:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 436CB16A4DA for ; Wed, 5 Jul 2006 15:49:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFE0443D5F for ; Wed, 5 Jul 2006 15:49:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65FnSkU061432 for ; Wed, 5 Jul 2006 15:49:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65FnSUu061429 for perforce@freebsd.org; Wed, 5 Jul 2006 15:49:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 15:49:28 GMT Message-Id: <200607051549.k65FnSUu061429@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 100634 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 15:49:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=100634 Change 100634 by rwatson@rwatson_zoo on 2006/07/05 15:49:02 Integrate trustedbsd_mac2 branch, which will hold structural changes targeted at the 7.x branch. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/io.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/support.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/MAC#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/NOTES#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/_bus.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/_limits.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/_types.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/asm.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/atomic.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/bus.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/clock.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/cpu.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/elf.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/endian.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/exec.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/float.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/fpu.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/frame.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/iodev.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/kdb.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/limits.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/md_var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/memdev.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/metadata.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/minidump.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/mptable.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/mutex.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/param.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pcb.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pmap.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/proc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/profile.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/psl.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/reg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/reloc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/resource.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/runq.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/segments.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/signal.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/smp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/trap.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/tss.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/varargs.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/isa/clock.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/isa/icu.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/isa/isa.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/isa/isa.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/blockio.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/copystr.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/disassem.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/exception.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/fiq.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/fusu.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/genassym.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/inckern.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/intr.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/locore.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/mem.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/nexus.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/pmap.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/setstack.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/support.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/swtch.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/trap.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/undefined.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/vectors.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/files.at91#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/std.at91#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/conf/IQ31244#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/conf/KB920X#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/conf/SIMICS#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/_bus.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/_limits.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/_types.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/armreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/asm.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/asmacros.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/atomic.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/blockio.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/bus.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/clock.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/cpu.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/disassem.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/elf.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/endian.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/exec.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/fiq.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/float.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/fp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/frame.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/ieee.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/intr.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/katelib.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/kdb.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/limits.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/machdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/md_var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/memdev.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/metadata.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/mutex.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/param.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/pcb.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/pcpu.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/pmap.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/proc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/profile.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/psl.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/pte.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/ptrace.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/reg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/reloc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/resource.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/runq.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/setjmp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/sigframe.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/signal.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/smp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/stdarg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/swi.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/sysarch.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/trap.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/ucontext.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/undefined.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/utrap.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/include/vmparam.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/README#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/bcache.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/boot.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/commands.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/console.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/dev_net.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/dev_net.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/devopen.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/help.common#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/interp.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/isapnp.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/isapnp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/load.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/load_elf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/loader.8#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/ls.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/misc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/module.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/newvers.sh#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/panic.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/pnp.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/pnpdata#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/common/ufsread.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/README#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/dict.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/float.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/loader.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/math64.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/math64.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/search.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/stack.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/tools.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/unix.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/vm.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ficl/words.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/forth/frames.4th#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/forth/loader.4th#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/forth/loader.conf#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/forth/loader.rc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/forth/screen.4th#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/forth/support.4th#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/loader/version#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/efi/version#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/copy.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ia64/ski/version#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/trustedbsd/mac2/sys/bsm/audit.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/bsm/audit_internal.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/bsm/audit_record.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_ccb.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_debug.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_periph.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_periph.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_queue.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_queue.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_sim.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_sim.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_xpt.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_xpt.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/00READ#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/README#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/TODO#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/cnode.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_io.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_kernel.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_namecache.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_namecache.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_opstats.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_psdev.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_psdev.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_subr.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_subr.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_venus.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_venus.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_vnops.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/coda/coda_vnops.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_fcntl.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_filio.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_filio.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_fuser.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_hrt.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ioctl.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ioctl.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ipc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ipc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_mman.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_proto.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_resource.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_resource.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_siginfo.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_signal.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_signal.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_socket.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_socket.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sockio.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sockio.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sockmod.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stat.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stat.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_statvfs.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stropts.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscall.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscallnames.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sysconfig.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sysent.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_systeminfo.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sysvec.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_termios.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_termios.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_time.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_timod.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ttold.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ttold.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_types.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ucontext.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ulimit.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ustat.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_util.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_utsname.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_wait.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/syscalls.conf#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/syscalls.master#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/Makefile.amd64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/Makefile.arm#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/Makefile.i386#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/Makefile.ia64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/Makefile.pc98#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/Makefile.powerpc#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/Makefile.sparc64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/NOTES#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/defines#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/files#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/files.amd64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/files.arm#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/files.i386#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/files.ia64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/files.pc98#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/files.powerpc#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/files.sparc64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/kern.mk#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/kern.post.mk#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/kern.pre.mk#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/kmod.mk#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/ldscript.amd64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/ldscript.arm#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/ldscript.i386#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/ldscript.ia64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/ldscript.powerpc#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/ldscript.sparc64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/makeLINT.mk#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/makeLINT.sed#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/newvers.sh#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/options#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/options.amd64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/options.arm#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/options.i386#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/options.ia64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/options.pc98#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/options.powerpc#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/options.sparc64#1 branch .. //depot/projects/trustedbsd/mac2/sys/conf/systags.sh#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_cbq.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_cbq.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_cdnr.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_cdnr.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_classq.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_hfsc.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_hfsc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_priq.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_priq.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_red.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_red.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_rio.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_rio.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_rmclass.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_rmclass.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_subr.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altq_var.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/altqconf.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/altq/altq/if_altq.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/CHANGES.txt#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acapps.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acconfig.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acdebug.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acdispat.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acefi.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acenv.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acevents.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acexcep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acfreebsd.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acgcc.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acglobal.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/achware.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acinterp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/aclocal.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 16:10:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 998D116A4DF for ; Wed, 5 Jul 2006 16:10:59 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDB5643D45 for ; Wed, 5 Jul 2006 16:10:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9405F46CD1 for ; Wed, 5 Jul 2006 12:10:57 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id EA120559F7; Wed, 5 Jul 2006 16:10:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DA7CB16A4E0; Wed, 5 Jul 2006 16:10:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 84E0116A4DE for ; Wed, 5 Jul 2006 16:10:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5427743D4C for ; Wed, 5 Jul 2006 16:10:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65GAtvB093657 for ; Wed, 5 Jul 2006 16:10:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65GAtvN093641 for perforce@freebsd.org; Wed, 5 Jul 2006 16:10:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 16:10:55 GMT Message-Id: <200607051610.k65GAtvN093641@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 100636 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 16:10:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=100636 Change 100636 by rwatson@rwatson_zoo on 2006/07/05 16:10:19 Start dropping in the basics of the new entry point naming scheme. Much to be fleshed out. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#2 (text+ko) ==== @@ -54,6 +54,24 @@ * * Operations are sorted first by general class of operation, then * alphabetically. + * + * XXX: New World Order + * + * MAC entry points are generally named using the following template: + * + * mpo__() + * + * or: + * + * mpo__check_() + * + * Entry points are sorted by object type; when a single method refers to + * more than one object type, one is considered the "primary" according to + * the following sort order: + * + * inpcb > socket > mbuf + * bpfdesc > ifnet > mbuf + * * > cred */ struct acl; struct bpf_d; From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 17:16:26 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D52516A4E5 for ; Wed, 5 Jul 2006 17:16:26 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0505D43D46 for ; Wed, 5 Jul 2006 17:16:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7803F46C06 for ; Wed, 5 Jul 2006 13:16:23 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CD7BA55A69; Wed, 5 Jul 2006 17:16:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BD94616A4E7; Wed, 5 Jul 2006 17:16:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80B0D16A4DD for ; Wed, 5 Jul 2006 17:16:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC1FC43D53 for ; Wed, 5 Jul 2006 17:16:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65HGLIe032639 for ; Wed, 5 Jul 2006 17:16:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65HGJ5o032636 for perforce@freebsd.org; Wed, 5 Jul 2006 17:16:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 17:16:19 GMT Message-Id: <200607051716.k65HGJ5o032636@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 100642 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 17:16:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=100642 Change 100642 by rwatson@rwatson_zoo on 2006/07/05 17:16:17 Start resort of entry points by object type. No renaming yet. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#3 (text+ko) ==== @@ -72,6 +72,9 @@ * inpcb > socket > mbuf * bpfdesc > ifnet > mbuf * * > cred + * + * It may be desirable also to consider some subsystems as "objects", such + * as system, netinet, etc. */ struct acl; struct bpf_d; @@ -104,6 +107,11 @@ /* * Policy module operations. + * + * XXXRW: There should probably be separate init/attach/detach/destroy + * operations so that policies can perform sleeping memory allocation before + * attaching, which occurs with locks held. We might also want to allow + * attach to fail. */ typedef void (*mpo_destroy_t)(struct mac_policy_conf *mpc); typedef void (*mpo_init_t)(struct mac_policy_conf *mpc); @@ -121,103 +129,28 @@ typedef void (*mpo_placeholder_t)(void); /* - * Label operations. Initialize label storage, destroy label - * storage, recycle for re-use without init/destroy, copy a label to - * initialized storage, and externalize/internalize from/to - * initialized storage. + * Object: struct bpfdesc (BPF descriptor) */ typedef void (*mpo_init_bpfdesc_label_t)(struct label *label); -typedef void (*mpo_init_cred_label_t)(struct label *label); -typedef void (*mpo_init_devfsdirent_label_t)(struct label *label); -typedef void (*mpo_init_ifnet_label_t)(struct label *label); -typedef int (*mpo_init_inpcb_label_t)(struct label *label, int flag); -typedef void (*mpo_init_sysv_msgmsg_label_t)(struct label *label); -typedef void (*mpo_init_sysv_msgqueue_label_t)(struct label *label); -typedef void (*mpo_init_sysv_sem_label_t)(struct label *label); -typedef void (*mpo_init_sysv_shm_label_t)(struct label *label); -typedef int (*mpo_init_ipq_label_t)(struct label *label, int flag); -typedef int (*mpo_init_mbuf_label_t)(struct label *label, int flag); -typedef void (*mpo_init_mount_label_t)(struct label *label); -typedef void (*mpo_init_mount_fs_label_t)(struct label *label); -typedef int (*mpo_init_socket_label_t)(struct label *label, int flag); -typedef int (*mpo_init_socket_peer_label_t)(struct label *label, - int flag); -typedef void (*mpo_init_pipe_label_t)(struct label *label); -typedef void (*mpo_init_posix_sem_label_t)(struct label *label); -typedef void (*mpo_init_proc_label_t)(struct label *label); -typedef void (*mpo_init_vnode_label_t)(struct label *label); typedef void (*mpo_destroy_bpfdesc_label_t)(struct label *label); -typedef void (*mpo_destroy_cred_label_t)(struct label *label); -typedef void (*mpo_destroy_devfsdirent_label_t)(struct label *label); -typedef void (*mpo_destroy_ifnet_label_t)(struct label *label); -typedef void (*mpo_destroy_inpcb_label_t)(struct label *label); -typedef void (*mpo_destroy_sysv_msgmsg_label_t)(struct label *label); -typedef void (*mpo_destroy_sysv_msgqueue_label_t)(struct label *label); -typedef void (*mpo_destroy_sysv_sem_label_t)(struct label *label); -typedef void (*mpo_destroy_sysv_shm_label_t)(struct label *label); -typedef void (*mpo_destroy_ipq_label_t)(struct label *label); -typedef void (*mpo_destroy_mbuf_label_t)(struct label *label); -typedef void (*mpo_destroy_mount_label_t)(struct label *label); -typedef void (*mpo_destroy_mount_fs_label_t)(struct label *label); -typedef void (*mpo_destroy_socket_label_t)(struct label *label); -typedef void (*mpo_destroy_socket_peer_label_t)(struct label *label); -typedef void (*mpo_destroy_pipe_label_t)(struct label *label); -typedef void (*mpo_destroy_posix_sem_label_t)(struct label *label); -typedef void (*mpo_destroy_proc_label_t)(struct label *label); -typedef void (*mpo_destroy_vnode_label_t)(struct label *label); -typedef void (*mpo_cleanup_sysv_msgmsg_t)(struct label *msglabel); -typedef void (*mpo_cleanup_sysv_msgqueue_t)(struct label *msqlabel); -typedef void (*mpo_cleanup_sysv_sem_t)(struct label *semalabel); -typedef void (*mpo_cleanup_sysv_shm_t)(struct label *shmlabel); -typedef void (*mpo_copy_cred_label_t)(struct label *src, - struct label *dest); -typedef void (*mpo_copy_ifnet_label_t)(struct label *src, - struct label *dest); -typedef void (*mpo_copy_mbuf_label_t)(struct label *src, - struct label *dest); -typedef void (*mpo_copy_pipe_label_t)(struct label *src, - struct label *dest); -typedef void (*mpo_copy_socket_label_t)(struct label *src, - struct label *dest); -typedef void (*mpo_copy_vnode_label_t)(struct label *src, - struct label *dest); -typedef int (*mpo_externalize_cred_label_t)(struct label *label, - char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_externalize_ifnet_label_t)(struct label *label, - char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_externalize_pipe_label_t)(struct label *label, - char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_externalize_socket_label_t)(struct label *label, - char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_externalize_socket_peer_label_t)(struct label *label, - char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_externalize_vnode_label_t)(struct label *label, - char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_internalize_cred_label_t)(struct label *label, - char *element_name, char *element_data, int *claimed); -typedef int (*mpo_internalize_ifnet_label_t)(struct label *label, - char *element_name, char *element_data, int *claimed); -typedef int (*mpo_internalize_pipe_label_t)(struct label *label, - char *element_name, char *element_data, int *claimed); -typedef int (*mpo_internalize_socket_label_t)(struct label *label, - char *element_name, char *element_data, int *claimed); -typedef int (*mpo_internalize_vnode_label_t)(struct label *label, - char *element_name, char *element_data, int *claimed); +typedef void (*mpo_create_bpfdesc_t)(struct ucred *cred, + struct bpf_d *bpf_d, struct label *bpflabel); +typedef void (*mpo_create_mbuf_from_bpfdesc_t)(struct bpf_d *bpf_d, + struct label *bpflabel, struct mbuf *mbuf, + struct label *mbuflabel); +typedef int (*mpo_check_bpfdesc_receive_t)(struct bpf_d *bpf_d, + struct label *bpflabel, struct ifnet *ifnet, + struct label *ifnetlabel); /* - * Labeling event operations: file system objects, and things that - * look a lot like file system objects. + * Object: struct devfsdirent (Devfs directory entry) */ +typedef void (*mpo_init_devfsdirent_label_t)(struct label *label); +typedef void (*mpo_destroy_devfsdirent_label_t)(struct label *label); typedef void (*mpo_associate_vnode_devfs_t)(struct mount *mp, struct label *fslabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel); -typedef int (*mpo_associate_vnode_extattr_t)(struct mount *mp, - struct label *fslabel, struct vnode *vp, - struct label *vlabel); -typedef void (*mpo_associate_vnode_singlelabel_t)(struct mount *mp, - struct label *fslabel, struct vnode *vp, - struct label *vlabel); typedef void (*mpo_create_devfs_device_t)(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *de, struct label *label); @@ -228,157 +161,181 @@ struct mount *mp, struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel); -typedef int (*mpo_create_vnode_extattr_t)(struct ucred *cred, - struct mount *mp, struct label *fslabel, - struct vnode *dvp, struct label *dlabel, - struct vnode *vp, struct label *vlabel, - struct componentname *cnp); -typedef void (*mpo_create_mount_t)(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel); -typedef void (*mpo_relabel_vnode_t)(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel, struct label *label); -typedef int (*mpo_setlabel_vnode_extattr_t)(struct ucred *cred, - struct vnode *vp, struct label *vlabel, - struct label *intlabel); typedef void (*mpo_update_devfsdirent_t)(struct mount *mp, struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel); /* - * Labeling event operations: IPC objects. + * Object: struct ucred (User credential) */ -typedef void (*mpo_create_mbuf_from_socket_t)(struct socket *so, - struct label *socketlabel, struct mbuf *m, - struct label *mbuflabel); -typedef void (*mpo_create_socket_t)(struct ucred *cred, struct socket *so, - struct label *socketlabel); -typedef void (*mpo_create_socket_from_socket_t)(struct socket *oldsocket, - struct label *oldsocketlabel, struct socket *newsocket, - struct label *newsocketlabel); -typedef void (*mpo_relabel_socket_t)(struct ucred *cred, struct socket *so, - struct label *oldlabel, struct label *newlabel); -typedef void (*mpo_relabel_pipe_t)(struct ucred *cred, struct pipepair *pp, - struct label *oldlabel, struct label *newlabel); -typedef void (*mpo_set_socket_peer_from_mbuf_t)(struct mbuf *mbuf, - struct label *mbuflabel, struct socket *so, - struct label *socketpeerlabel); -typedef void (*mpo_set_socket_peer_from_socket_t)(struct socket *oldsocket, - struct label *oldsocketlabel, struct socket *newsocket, - struct label *newsocketpeerlabel); -typedef void (*mpo_create_pipe_t)(struct ucred *cred, struct pipepair *pp, - struct label *pipelabel); +typedef void (*mpo_init_cred_label_t)(struct label *label); +typedef void (*mpo_destroy_cred_label_t)(struct label *label); +typedef void (*mpo_copy_cred_label_t)(struct label *src, + struct label *dest); +typedef int (*mpo_externalize_cred_label_t)(struct label *label, + char *element_name, struct sbuf *sb, int *claimed); +typedef int (*mpo_internalize_cred_label_t)(struct label *label, + char *element_name, char *element_data, int *claimed); +typedef void (*mpo_relabel_cred_t)(struct ucred *cred, + struct label *newlabel); +typedef int (*mpo_check_cred_relabel_t)(struct ucred *cred, + struct label *newlabel); +typedef int (*mpo_check_cred_visible_t)(struct ucred *u1, + struct ucred *u2); /* - * Labeling event operations: System V IPC primitives. + * Object: struct ifnet (Network interface) */ -typedef void (*mpo_create_sysv_msgmsg_t)(struct ucred *cred, - struct msqid_kernel *msqkptr, struct label *msqlabel, - struct msg *msgptr, struct label *msglabel); -typedef void (*mpo_create_sysv_msgqueue_t)(struct ucred *cred, - struct msqid_kernel *msqkptr, struct label *msqlabel); -typedef void (*mpo_create_sysv_sem_t)(struct ucred *cred, - struct semid_kernel *semakptr, struct label *semalabel); -typedef void (*mpo_create_sysv_shm_t)(struct ucred *cred, - struct shmid_kernel *shmsegptr, struct label *shmlabel); +typedef void (*mpo_init_ifnet_label_t)(struct label *label); +typedef void (*mpo_destroy_ifnet_label_t)(struct label *label); +typedef void (*mpo_copy_ifnet_label_t)(struct label *src, + struct label *dest); +typedef int (*mpo_externalize_ifnet_label_t)(struct label *label, + char *element_name, struct sbuf *sb, int *claimed); +typedef int (*mpo_internalize_ifnet_label_t)(struct label *label, + char *element_name, char *element_data, int *claimed); +typedef void (*mpo_create_ifnet_t)(struct ifnet *ifnet, + struct label *ifnetlabel); +typedef void (*mpo_create_mbuf_linklayer_t)(struct ifnet *ifnet, + struct label *ifnetlabel, struct mbuf *mbuf, + struct label *mbuflabel); +typedef void (*mpo_create_mbuf_from_ifnet_t)(struct ifnet *ifnet, + struct label *ifnetlabel, struct mbuf *mbuf, + struct label *mbuflabel); +typedef void (*mpo_create_mbuf_multicast_encap_t)(struct mbuf *oldmbuf, + struct label *oldmbuflabel, struct ifnet *ifnet, + struct label *ifnetlabel, struct mbuf *newmbuf, + struct label *newmbuflabel); +typedef void (*mpo_relabel_ifnet_t)(struct ucred *cred, + struct ifnet *ifnet, struct label *ifnetlabel, + struct label *newlabel); +typedef int (*mpo_check_ifnet_relabel_t)(struct ucred *cred, + struct ifnet *ifnet, struct label *ifnetlabel, + struct label *newlabel); +typedef int (*mpo_check_ifnet_transmit_t)(struct ifnet *ifnet, + struct label *ifnetlabel, struct mbuf *m, + struct label *mbuflabel); /* - * Labeling event operations: POSIX (global/inter-process) semaphores. + * Object: struct inpcb (Internet protocol control block) */ -typedef void (*mpo_create_posix_sem_t)(struct ucred *cred, - struct ksem *ksemptr, struct label *ks_label); +typedef int (*mpo_init_inpcb_label_t)(struct label *label, int flag); +typedef void (*mpo_destroy_inpcb_label_t)(struct label *label); +typedef void (*mpo_create_inpcb_from_socket_t)(struct socket *so, + struct label *solabel, struct inpcb *inp, + struct label *inplabel); +typedef void (*mpo_create_mbuf_from_inpcb_t)(struct inpcb *inp, + struct label *inplabel, struct mbuf *m, + struct label *mlabel); +typedef void (*mpo_inpcb_sosetlabel_t)(struct socket *so, + struct label *label, struct inpcb *inp, + struct label *inplabel); +typedef int (*mpo_check_inpcb_deliver_t)(struct inpcb *inp, + struct label *inplabel, struct mbuf *m, + struct label *mlabel); /* - * Labeling event operations: network objects. + * Object: struct ipq (IP fragment reassembly queue) */ -typedef void (*mpo_create_bpfdesc_t)(struct ucred *cred, - struct bpf_d *bpf_d, struct label *bpflabel); -typedef void (*mpo_create_ifnet_t)(struct ifnet *ifnet, - struct label *ifnetlabel); -typedef void (*mpo_create_inpcb_from_socket_t)(struct socket *so, - struct label *solabel, struct inpcb *inp, - struct label *inplabel); +typedef int (*mpo_init_ipq_label_t)(struct label *label, int flag); +typedef void (*mpo_destroy_ipq_label_t)(struct label *label); typedef void (*mpo_create_ipq_t)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); typedef void (*mpo_create_datagram_from_ipq) (struct ipq *ipq, struct label *ipqlabel, struct mbuf *datagram, struct label *datagramlabel); +typedef int (*mpo_fragment_match_t)(struct mbuf *fragment, + struct label *fragmentlabel, struct ipq *ipq, + struct label *ipqlabel); +typedef void (*mpo_update_ipq_t)(struct mbuf *fragment, + struct label *fragmentlabel, struct ipq *ipq, + struct label *ipqlabel); + +/* + * Object: kenv (Kernel environment) + */ +typedef int (*mpo_check_kenv_dump_t)(struct ucred *cred); +typedef int (*mpo_check_kenv_get_t)(struct ucred *cred, char *name); +typedef int (*mpo_check_kenv_set_t)(struct ucred *cred, char *name, + char *value); +typedef int (*mpo_check_kenv_unset_t)(struct ucred *cred, char *name); + +/* + * Object: kld (Loadable kernel module) + */ +typedef int (*mpo_check_kld_load_t)(struct ucred *cred, struct vnode *vp, + struct label *vlabel); +typedef int (*mpo_check_kld_stat_t)(struct ucred *cred); +typedef int (*mpo_check_kld_unload_t)(struct ucred *cred); + +/* + * Object: struct ksem (POSIX semaphore) + */ +typedef void (*mpo_init_posix_sem_label_t)(struct label *label); +typedef void (*mpo_destroy_posix_sem_label_t)(struct label *label); +typedef void (*mpo_create_posix_sem_t)(struct ucred *cred, + struct ksem *ksemptr, struct label *ks_label); +typedef int (*mpo_check_posix_sem_destroy_t)(struct ucred *cred, + struct ksem *ksemptr, struct label *ks_label); +typedef int (*mpo_check_posix_sem_getvalue_t)(struct ucred *cred, + struct ksem *ksemptr, struct label *ks_label); +typedef int (*mpo_check_posix_sem_open_t)(struct ucred *cred, + struct ksem *ksemptr, struct label *ks_label); +typedef int (*mpo_check_posix_sem_post_t)(struct ucred *cred, + struct ksem *ksemptr, struct label *ks_label); +typedef int (*mpo_check_posix_sem_unlink_t)(struct ucred *cred, + struct ksem *ksemptr, struct label *ks_label); +typedef int (*mpo_check_posix_sem_wait_t)(struct ucred *cred, + struct ksem *ksemptr, struct label *ks_label); + +/* + * Object: struct mbuf (Message buffer) + */ +typedef int (*mpo_init_mbuf_label_t)(struct label *label, int flag); +typedef void (*mpo_destroy_mbuf_label_t)(struct label *label); +typedef void (*mpo_copy_mbuf_label_t)(struct label *src, + struct label *dest); +typedef void (*mpo_create_mbuf_from_socket_t)(struct socket *so, + struct label *socketlabel, struct mbuf *m, + struct label *mbuflabel); +typedef void (*mpo_set_socket_peer_from_mbuf_t)(struct mbuf *mbuf, + struct label *mbuflabel, struct socket *so, + struct label *socketpeerlabel); typedef void (*mpo_create_fragment_t)(struct mbuf *datagram, struct label *datagramlabel, struct mbuf *fragment, struct label *fragmentlabel); -typedef void (*mpo_create_mbuf_from_inpcb_t)(struct inpcb *inp, - struct label *inplabel, struct mbuf *m, - struct label *mlabel); -typedef void (*mpo_create_mbuf_linklayer_t)(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *mbuf, - struct label *mbuflabel); -typedef void (*mpo_create_mbuf_from_bpfdesc_t)(struct bpf_d *bpf_d, - struct label *bpflabel, struct mbuf *mbuf, - struct label *mbuflabel); -typedef void (*mpo_create_mbuf_from_ifnet_t)(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *mbuf, - struct label *mbuflabel); -typedef void (*mpo_create_mbuf_multicast_encap_t)(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *newmbuf, - struct label *newmbuflabel); typedef void (*mpo_create_mbuf_netlayer_t)(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel); -typedef int (*mpo_fragment_match_t)(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, - struct label *ipqlabel); typedef void (*mpo_reflect_mbuf_icmp_t)(struct mbuf *m, struct label *mlabel); typedef void (*mpo_reflect_mbuf_tcp_t)(struct mbuf *m, struct label *mlabel); -typedef void (*mpo_relabel_ifnet_t)(struct ucred *cred, - struct ifnet *ifnet, struct label *ifnetlabel, - struct label *newlabel); -typedef void (*mpo_update_ipq_t)(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, - struct label *ipqlabel); -typedef void (*mpo_inpcb_sosetlabel_t)(struct socket *so, - struct label *label, struct inpcb *inp, - struct label *inplabel); /* - * Labeling event operations: processes. + * Object: struct mount (File system mountpoint) */ -typedef void (*mpo_execve_transition_t)(struct ucred *old, - struct ucred *new, struct vnode *vp, - struct label *vnodelabel, struct label *interpvnodelabel, - struct image_params *imgp, struct label *execlabel); -typedef int (*mpo_execve_will_transition_t)(struct ucred *old, - struct vnode *vp, struct label *vnodelabel, - struct label *interpvnodelabel, - struct image_params *imgp, struct label *execlabel); -typedef void (*mpo_create_proc0_t)(struct ucred *cred); -typedef void (*mpo_create_proc1_t)(struct ucred *cred); -typedef void (*mpo_relabel_cred_t)(struct ucred *cred, - struct label *newlabel); -typedef void (*mpo_thread_userret_t)(struct thread *thread); +typedef void (*mpo_init_mount_label_t)(struct label *label); +typedef void (*mpo_init_mount_fs_label_t)(struct label *label); +typedef void (*mpo_destroy_mount_label_t)(struct label *label); +typedef void (*mpo_destroy_mount_fs_label_t)(struct label *label); +typedef int (*mpo_check_mount_stat_t)(struct ucred *cred, + struct mount *mp, struct label *mntlabel); /* - * Access control checks. + * Object: struct msqid_kernel (System V message queue) */ -typedef int (*mpo_check_bpfdesc_receive_t)(struct bpf_d *bpf_d, - struct label *bpflabel, struct ifnet *ifnet, - struct label *ifnetlabel); -typedef int (*mpo_check_cred_relabel_t)(struct ucred *cred, - struct label *newlabel); -typedef int (*mpo_check_cred_visible_t)(struct ucred *u1, - struct ucred *u2); -typedef int (*mpo_check_ifnet_relabel_t)(struct ucred *cred, - struct ifnet *ifnet, struct label *ifnetlabel, - struct label *newlabel); -typedef int (*mpo_check_ifnet_transmit_t)(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *m, - struct label *mbuflabel); -typedef int (*mpo_check_inpcb_deliver_t)(struct inpcb *inp, - struct label *inplabel, struct mbuf *m, - struct label *mlabel); +typedef void (*mpo_init_sysv_msgqueue_label_t)(struct label *label); +typedef void (*mpo_destroy_sysv_msgqueue_label_t)(struct label *label); +typedef void (*mpo_cleanup_sysv_msgqueue_t)(struct label *msqlabel); +typedef void (*mpo_create_sysv_msgmsg_t)(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqlabel, + struct msg *msgptr, struct label *msglabel); +typedef void (*mpo_create_sysv_msgqueue_t)(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqlabel); + typedef int (*mpo_check_sysv_msgmsq_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel, struct msqid_kernel *msqkptr, struct label *msqklabel); @@ -395,40 +352,28 @@ typedef int (*mpo_check_sysv_msqctl_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd); -typedef int (*mpo_check_sysv_semctl_t)(struct ucred *cred, - struct semid_kernel *semakptr, struct label *semaklabel, - int cmd); -typedef int (*mpo_check_sysv_semget_t)(struct ucred *cred, - struct semid_kernel *semakptr, struct label *semaklabel); -typedef int (*mpo_check_sysv_semop_t)(struct ucred *cred, - struct semid_kernel *semakptr, struct label *semaklabel, - size_t accesstype); -typedef int (*mpo_check_sysv_shmat_t)(struct ucred *cred, - struct shmid_kernel *shmsegptr, - struct label *shmseglabel, int shmflg); -typedef int (*mpo_check_sysv_shmctl_t)(struct ucred *cred, - struct shmid_kernel *shmsegptr, - struct label *shmseglabel, int cmd); -typedef int (*mpo_check_sysv_shmdt_t)(struct ucred *cred, - struct shmid_kernel *shmsegptr, - struct label *shmseglabel); -typedef int (*mpo_check_sysv_shmget_t)(struct ucred *cred, - struct shmid_kernel *shmsegptr, - struct label *shmseglabel, int shmflg); -typedef int (*mpo_check_kenv_dump_t)(struct ucred *cred); -typedef int (*mpo_check_kenv_get_t)(struct ucred *cred, char *name); -typedef int (*mpo_check_kenv_set_t)(struct ucred *cred, char *name, - char *value); -typedef int (*mpo_check_kenv_unset_t)(struct ucred *cred, char *name); -typedef int (*mpo_check_kld_load_t)(struct ucred *cred, struct vnode *vp, - struct label *vlabel); -typedef int (*mpo_check_kld_stat_t)(struct ucred *cred); -typedef int (*mpo_check_kld_unload_t)(struct ucred *cred); -typedef int (*mpo_mpo_placeholder19_t)(void); -typedef int (*mpo_mpo_placeholder20_t)(void); -typedef int (*mpo_check_mount_stat_t)(struct ucred *cred, - struct mount *mp, struct label *mntlabel); -typedef int (*mpo_mpo_placeholder21_t)(void); +/* + * Object: struct msg (System V message) + */ +typedef void (*mpo_init_sysv_msgmsg_label_t)(struct label *label); +typedef void (*mpo_destroy_sysv_msgmsg_label_t)(struct label *label); +typedef void (*mpo_cleanup_sysv_msgmsg_t)(struct label *msglabel); + +/* + * Object: struct pipepair (Pipe) + */ +typedef void (*mpo_init_pipe_label_t)(struct label *label); +typedef void (*mpo_destroy_pipe_label_t)(struct label *label); +typedef void (*mpo_copy_pipe_label_t)(struct label *src, + struct label *dest); +typedef int (*mpo_externalize_pipe_label_t)(struct label *label, + char *element_name, struct sbuf *sb, int *claimed); +typedef int (*mpo_internalize_pipe_label_t)(struct label *label, + char *element_name, char *element_data, int *claimed); +typedef void (*mpo_relabel_pipe_t)(struct ucred *cred, struct pipepair *pp, + struct label *oldlabel, struct label *newlabel); +typedef void (*mpo_create_pipe_t)(struct ucred *cred, struct pipepair *pp, + struct label *pipelabel); typedef int (*mpo_check_pipe_ioctl_t)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, unsigned long cmd, void *data); @@ -443,18 +388,15 @@ struct pipepair *pp, struct label *pipelabel); typedef int (*mpo_check_pipe_write_t)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel); -typedef int (*mpo_check_posix_sem_destroy_t)(struct ucred *cred, - struct ksem *ksemptr, struct label *ks_label); -typedef int (*mpo_check_posix_sem_getvalue_t)(struct ucred *cred, - struct ksem *ksemptr, struct label *ks_label); -typedef int (*mpo_check_posix_sem_open_t)(struct ucred *cred, - struct ksem *ksemptr, struct label *ks_label); -typedef int (*mpo_check_posix_sem_post_t)(struct ucred *cred, - struct ksem *ksemptr, struct label *ks_label); -typedef int (*mpo_check_posix_sem_unlink_t)(struct ucred *cred, - struct ksem *ksemptr, struct label *ks_label); -typedef int (*mpo_check_posix_sem_wait_t)(struct ucred *cred, - struct ksem *ksemptr, struct label *ks_label); + +/* + * Object: struct proc (Process) + */ +typedef void (*mpo_init_proc_label_t)(struct label *label); +typedef void (*mpo_destroy_proc_label_t)(struct label *label); +typedef void (*mpo_create_proc0_t)(struct ucred *cred); +typedef void (*mpo_create_proc1_t)(struct ucred *cred); +typedef void (*mpo_thread_userret_t)(struct thread *thread); typedef int (*mpo_check_proc_debug_t)(struct ucred *cred, struct proc *proc); typedef int (*mpo_check_proc_sched_t)(struct ucred *cred, @@ -477,6 +419,71 @@ struct proc *proc, int signum); typedef int (*mpo_check_proc_wait_t)(struct ucred *cred, struct proc *proc); + +/* + * Object: struct semid_kernel (System V IPC semaphore) + */ +typedef void (*mpo_init_sysv_sem_label_t)(struct label *label); +typedef void (*mpo_destroy_sysv_sem_label_t)(struct label *label); +typedef void (*mpo_cleanup_sysv_sem_t)(struct label *semalabel); +typedef void (*mpo_create_sysv_sem_t)(struct ucred *cred, + struct semid_kernel *semakptr, struct label *semalabel); +typedef int (*mpo_check_sysv_semctl_t)(struct ucred *cred, + struct semid_kernel *semakptr, struct label *semaklabel, + int cmd); +typedef int (*mpo_check_sysv_semget_t)(struct ucred *cred, + struct semid_kernel *semakptr, struct label *semaklabel); +typedef int (*mpo_check_sysv_semop_t)(struct ucred *cred, + struct semid_kernel *semakptr, struct label *semaklabel, + size_t accesstype); + +/* + * Object: struct shmid_kernel (System V shared memory segment) + */ +typedef void (*mpo_init_sysv_shm_label_t)(struct label *label); +typedef void (*mpo_destroy_sysv_shm_label_t)(struct label *label); +typedef void (*mpo_cleanup_sysv_shm_t)(struct label *shmlabel); +typedef void (*mpo_create_sysv_shm_t)(struct ucred *cred, + struct shmid_kernel *shmsegptr, struct label *shmlabel); +typedef int (*mpo_check_sysv_shmat_t)(struct ucred *cred, + struct shmid_kernel *shmsegptr, + struct label *shmseglabel, int shmflg); +typedef int (*mpo_check_sysv_shmctl_t)(struct ucred *cred, + struct shmid_kernel *shmsegptr, + struct label *shmseglabel, int cmd); +typedef int (*mpo_check_sysv_shmdt_t)(struct ucred *cred, + struct shmid_kernel *shmsegptr, + struct label *shmseglabel); +typedef int (*mpo_check_sysv_shmget_t)(struct ucred *cred, + struct shmid_kernel *shmsegptr, + struct label *shmseglabel, int shmflg); + +/* + * Object: struct socket (Socket) + */ +typedef int (*mpo_init_socket_label_t)(struct label *label, int flag); +typedef int (*mpo_init_socket_peer_label_t)(struct label *label, + int flag); +typedef void (*mpo_destroy_socket_label_t)(struct label *label); +typedef void (*mpo_destroy_socket_peer_label_t)(struct label *label); +typedef void (*mpo_copy_socket_label_t)(struct label *src, + struct label *dest); +typedef int (*mpo_externalize_socket_label_t)(struct label *label, + char *element_name, struct sbuf *sb, int *claimed); +typedef int (*mpo_externalize_socket_peer_label_t)(struct label *label, + char *element_name, struct sbuf *sb, int *claimed); +typedef int (*mpo_internalize_socket_label_t)(struct label *label, + char *element_name, char *element_data, int *claimed); +typedef void (*mpo_create_socket_t)(struct ucred *cred, struct socket *so, + struct label *socketlabel); +typedef void (*mpo_create_socket_from_socket_t)(struct socket *oldsocket, + struct label *oldsocketlabel, struct socket *newsocket, + struct label *newsocketlabel); +typedef void (*mpo_relabel_socket_t)(struct ucred *cred, struct socket *so, + struct label *oldlabel, struct label *newlabel); +typedef void (*mpo_set_socket_peer_from_socket_t)(struct socket *oldsocket, + struct label *oldsocketlabel, struct socket *newsocket, + struct label *newsocketpeerlabel); typedef int (*mpo_check_socket_accept_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); typedef int (*mpo_check_socket_bind_t)(struct ucred *cred, @@ -505,6 +512,10 @@ struct socket *so, struct label *socketlabel); typedef int (*mpo_check_socket_visible_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); + +/* + * Object: system (Global system state) + */ typedef int (*mpo_check_sysarch_ioperm_t)(struct ucred *cred); typedef int (*mpo_check_system_acct_t)(struct ucred *cred, struct vnode *vp, struct label *vlabel); @@ -518,6 +529,44 @@ typedef int (*mpo_check_system_sysctl_t)(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); + +/* + * Object: struct vnode (VFS node) + */ +typedef void (*mpo_init_vnode_label_t)(struct label *label); +typedef void (*mpo_destroy_vnode_label_t)(struct label *label); +typedef int (*mpo_associate_vnode_extattr_t)(struct mount *mp, + struct label *fslabel, struct vnode *vp, + struct label *vlabel); +typedef void (*mpo_associate_vnode_singlelabel_t)(struct mount *mp, + struct label *fslabel, struct vnode *vp, + struct label *vlabel); +typedef int (*mpo_create_vnode_extattr_t)(struct ucred *cred, + struct mount *mp, struct label *fslabel, + struct vnode *dvp, struct label *dlabel, + struct vnode *vp, struct label *vlabel, + struct componentname *cnp); +typedef void (*mpo_create_mount_t)(struct ucred *cred, struct mount *mp, + struct label *mntlabel, struct label *fslabel); +typedef void (*mpo_relabel_vnode_t)(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel, struct label *label); +typedef int (*mpo_setlabel_vnode_extattr_t)(struct ucred *cred, + struct vnode *vp, struct label *vlabel, + struct label *intlabel); +typedef void (*mpo_copy_vnode_label_t)(struct label *src, + struct label *dest); +typedef int (*mpo_externalize_vnode_label_t)(struct label *label, + char *element_name, struct sbuf *sb, int *claimed); +typedef int (*mpo_internalize_vnode_label_t)(struct label *label, + char *element_name, char *element_data, int *claimed); +typedef void (*mpo_execve_transition_t)(struct ucred *old, + struct ucred *new, struct vnode *vp, + struct label *vnodelabel, struct label *interpvnodelabel, + struct image_params *imgp, struct label *execlabel); +typedef int (*mpo_execve_will_transition_t)(struct ucred *old, + struct vnode *vp, struct label *vnodelabel, + struct label *interpvnodelabel, + struct image_params *imgp, struct label *execlabel); typedef int (*mpo_check_vnode_access_t)(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode); typedef int (*mpo_check_vnode_chdir_t)(struct ucred *cred, From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 19:16:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 70C6116A4DA for ; Wed, 5 Jul 2006 19:16:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCDCC43D49 for ; Wed, 5 Jul 2006 19:16:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2C48146C30 for ; Wed, 5 Jul 2006 15:16:57 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4BBCE5568D; Wed, 5 Jul 2006 19:16:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E84916A4E8; Wed, 5 Jul 2006 19:16:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0013116A4DE for ; Wed, 5 Jul 2006 19:16:54 +0000 (UTC) (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 B657443D53 for ; Wed, 5 Jul 2006 19:16:54 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65JGsRP040610 for ; Wed, 5 Jul 2006 19:16:54 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65JGs3t040607 for perforce@freebsd.org; Wed, 5 Jul 2006 19:16:54 GMT (envelope-from wsalamon@computer.org) Date: Wed, 5 Jul 2006 19:16:54 GMT Message-Id: <200607051916.k65JGs3t040607@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 100647 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 19:16:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=100647 Change 100647 by wsalamon@vh3 on 2006/07/05 19:15:56 Regen the syscall files to bring them in sync with the syscalls.master. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#31 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#22 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#21 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#22 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#25 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#31 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.216 2006/06/27 14:46:31 jhb Exp */ #include "opt_compat.h" @@ -50,8 +50,8 @@ { compat4(SYF_MPSAFE | AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT }, /* 18 = old getfsstat */ { compat(SYF_MPSAFE | AS(olseek_args),lseek), AUE_LSEEK }, /* 19 = old lseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ - { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ - { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ + { SYF_MPSAFE | AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ + { SYF_MPSAFE | AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 25 = geteuid */ @@ -407,7 +407,7 @@ { AS(nfsclnt_args), (sy_call_t *)nosys, AUE_NULL }, /* 375 = nfsclnt */ { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT }, /* 378 = nmount */ + { SYF_MPSAFE | AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT }, /* 378 = nmount */ { SYF_MPSAFE | 0, (sy_call_t *)kse_exit, AUE_NULL }, /* 379 = kse_exit */ { SYF_MPSAFE | AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL }, /* 380 = kse_wakeup */ { SYF_MPSAFE | AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL }, /* 381 = kse_create */ ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#22 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.216 2006/06/27 14:46:31 jhb Exp */ const char *syscallnames[] = { ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#21 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.216 2006/06/27 14:46:31 jhb Exp */ #define SYS_syscall 0 ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#22 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. # $FreeBSD$ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.216 2006/06/27 14:46:31 jhb Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#25 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.215 2006/03/28 14:32:37 des Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.216 2006/06/27 14:46:31 jhb Exp */ #ifndef _SYS_SYSPROTO_H_ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 21:53:39 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8243116A4E0 for ; Wed, 5 Jul 2006 21:53:39 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E8A643D69 for ; Wed, 5 Jul 2006 21:53:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 13BAD46BDA for ; Wed, 5 Jul 2006 17:53:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 92CB76458F; Wed, 5 Jul 2006 21:52:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C38F16A4E0; Wed, 5 Jul 2006 21:52:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F291E16A4DA for ; Wed, 5 Jul 2006 21:52:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 469D043D6A for ; Wed, 5 Jul 2006 21:52:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65LqGRx071162 for ; Wed, 5 Jul 2006 21:52:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65LqGCF071159 for perforce@freebsd.org; Wed, 5 Jul 2006 21:52:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 21:52:16 GMT Message-Id: <200607052152.k65LqGCF071159@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 100660 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 21:53:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=100660 Change 100660 by rwatson@rwatson_zoo on 2006/07/05 21:51:38 Some renaming. (checkpoint) Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#4 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#4 (text+ko) ==== @@ -113,8 +113,8 @@ * attaching, which occurs with locks held. We might also want to allow * attach to fail. */ -typedef void (*mpo_destroy_t)(struct mac_policy_conf *mpc); -typedef void (*mpo_init_t)(struct mac_policy_conf *mpc); +typedef void (*mpo_policy_destroy_t)(struct mac_policy_conf *mpc); +typedef void (*mpo_policy_init_t)(struct mac_policy_conf *mpc); /* * General policy-directed security system call so that policies may @@ -131,37 +131,37 @@ /* * Object: struct bpfdesc (BPF descriptor) */ -typedef void (*mpo_init_bpfdesc_label_t)(struct label *label); -typedef void (*mpo_destroy_bpfdesc_label_t)(struct label *label); -typedef void (*mpo_create_bpfdesc_t)(struct ucred *cred, +typedef void (*mpo_bpfdesc_init_label_t)(struct label *label); +typedef void (*mpo_bpfdesc_destroy_label_t)(struct label *label); +typedef void (*mpo_bpfdesc_create_t)(struct ucred *cred, struct bpf_d *bpf_d, struct label *bpflabel); -typedef void (*mpo_create_mbuf_from_bpfdesc_t)(struct bpf_d *bpf_d, +typedef void (*mpo_bpfdesc_create_mbuf_t)(struct bpf_d *bpf_d, struct label *bpflabel, struct mbuf *mbuf, struct label *mbuflabel); -typedef int (*mpo_check_bpfdesc_receive_t)(struct bpf_d *bpf_d, +typedef int (*mpo_bpfdesc_check_receive_t)(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel); /* * Object: struct devfsdirent (Devfs directory entry) */ -typedef void (*mpo_init_devfsdirent_label_t)(struct label *label); -typedef void (*mpo_destroy_devfsdirent_label_t)(struct label *label); -typedef void (*mpo_associate_vnode_devfs_t)(struct mount *mp, +typedef void (*mpo_devfsdirent_init_label_t)(struct label *label); +typedef void (*mpo_devfsdirent_destroy_label_t)(struct label *label); +typedef void (*mpo_devfs_vnode_associate_t)(struct mount *mp, struct label *fslabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel); -typedef void (*mpo_create_devfs_device_t)(struct ucred *cred, +typedef void (*mpo_devfs_create_device_t)(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *de, struct label *label); -typedef void (*mpo_create_devfs_directory_t)(struct mount *mp, +typedef void (*mpo_devfs_create_directory_t)(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *de, struct label *label); -typedef void (*mpo_create_devfs_symlink_t)(struct ucred *cred, +typedef void (*mpo_devfs_create_symlink_t)(struct ucred *cred, struct mount *mp, struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel); -typedef void (*mpo_update_devfsdirent_t)(struct mount *mp, +typedef void (*mpo_devfsdirent_update_t)(struct mount *mp, struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel); @@ -169,171 +169,165 @@ /* * Object: struct ucred (User credential) */ -typedef void (*mpo_init_cred_label_t)(struct label *label); -typedef void (*mpo_destroy_cred_label_t)(struct label *label); -typedef void (*mpo_copy_cred_label_t)(struct label *src, +typedef void (*mpo_cred_init_label_t)(struct label *label); +typedef void (*mpo_cred_destroy_cred_label_t)(struct label *label); +typedef void (*mpo_cred_copy_label_t)(struct label *src, struct label *dest); -typedef int (*mpo_externalize_cred_label_t)(struct label *label, +typedef int (*mpo_cred_externalize_label_t)(struct label *label, char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_internalize_cred_label_t)(struct label *label, +typedef int (*mpo_cred_internalize_label_t)(struct label *label, char *element_name, char *element_data, int *claimed); -typedef void (*mpo_relabel_cred_t)(struct ucred *cred, +typedef void (*mpo_cred_relabel_t)(struct ucred *cred, struct label *newlabel); -typedef int (*mpo_check_cred_relabel_t)(struct ucred *cred, +typedef int (*mpo_cred_check_relabel_t)(struct ucred *cred, struct label *newlabel); -typedef int (*mpo_check_cred_visible_t)(struct ucred *u1, +typedef int (*mpo_cred_check_visible_t)(struct ucred *u1, struct ucred *u2); /* * Object: struct ifnet (Network interface) */ -typedef void (*mpo_init_ifnet_label_t)(struct label *label); -typedef void (*mpo_destroy_ifnet_label_t)(struct label *label); -typedef void (*mpo_copy_ifnet_label_t)(struct label *src, +typedef void (*mpo_ifnet_init_label_t)(struct label *label); +typedef void (*mpo_ifnet_destroy_label_t)(struct label *label); +typedef void (*mpo_ifnet_copy_label_t)(struct label *src, struct label *dest); -typedef int (*mpo_externalize_ifnet_label_t)(struct label *label, +typedef int (*mpo_ifnet_externalize_label_t)(struct label *label, char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_internalize_ifnet_label_t)(struct label *label, +typedef int (*mpo_ifnet_internalize_label_t)(struct label *label, char *element_name, char *element_data, int *claimed); -typedef void (*mpo_create_ifnet_t)(struct ifnet *ifnet, +typedef void (*mpo_ifnet_create_t)(struct ifnet *ifnet, struct label *ifnetlabel); typedef void (*mpo_create_mbuf_linklayer_t)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel); -typedef void (*mpo_create_mbuf_from_ifnet_t)(struct ifnet *ifnet, +typedef void (*mpo_ifnet_create_mbuf_t)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel); typedef void (*mpo_create_mbuf_multicast_encap_t)(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel); -typedef void (*mpo_relabel_ifnet_t)(struct ucred *cred, +typedef void (*mpo_ifnet_relabel_t)(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel); -typedef int (*mpo_check_ifnet_relabel_t)(struct ucred *cred, +typedef int (*mpo_ifnet_check_relabel_t)(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel); -typedef int (*mpo_check_ifnet_transmit_t)(struct ifnet *ifnet, +typedef int (*mpo_ifnet_check_transmit_t)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel); /* * Object: struct inpcb (Internet protocol control block) */ -typedef int (*mpo_init_inpcb_label_t)(struct label *label, int flag); -typedef void (*mpo_destroy_inpcb_label_t)(struct label *label); -typedef void (*mpo_create_inpcb_from_socket_t)(struct socket *so, +typedef int (*mpo_inpcb_init_label_t)(struct label *label, int flag); +typedef void (*mpo_inpcb_destroy_label_t)(struct label *label); +typedef void (*mpo_inpcb_create_from_socket_t)(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel); -typedef void (*mpo_create_mbuf_from_inpcb_t)(struct inpcb *inp, +typedef void (*mpo_inpcb_create_mbuf_t)(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel); typedef void (*mpo_inpcb_sosetlabel_t)(struct socket *so, struct label *label, struct inpcb *inp, struct label *inplabel); -typedef int (*mpo_check_inpcb_deliver_t)(struct inpcb *inp, +typedef int (*mpo_inpcb_check_deliver_t)(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel); /* * Object: struct ipq (IP fragment reassembly queue) */ -typedef int (*mpo_init_ipq_label_t)(struct label *label, int flag); -typedef void (*mpo_destroy_ipq_label_t)(struct label *label); -typedef void (*mpo_create_ipq_t)(struct mbuf *fragment, +typedef int (*mpo_ipq_init_label_t)(struct label *label, int flag); +typedef void (*mpo_ipq_destroy_label_t)(struct label *label); +typedef void (*mpo_ipq_create_t)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); -typedef void (*mpo_create_datagram_from_ipq) +typedef void (*mpo_ipq_create_datagram_t) (struct ipq *ipq, struct label *ipqlabel, struct mbuf *datagram, struct label *datagramlabel); -typedef int (*mpo_fragment_match_t)(struct mbuf *fragment, +typedef int (*mpo_ipq_fragment_match_t)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); -typedef void (*mpo_update_ipq_t)(struct mbuf *fragment, +typedef void (*mpo_ipq_update_t)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); /* * Object: kenv (Kernel environment) */ -typedef int (*mpo_check_kenv_dump_t)(struct ucred *cred); -typedef int (*mpo_check_kenv_get_t)(struct ucred *cred, char *name); -typedef int (*mpo_check_kenv_set_t)(struct ucred *cred, char *name, +typedef int (*mpo_kenv_check_dump_t)(struct ucred *cred); +typedef int (*mpo_kenv_check_get_t)(struct ucred *cred, char *name); +typedef int (*mpo_kenv_check_set_t)(struct ucred *cred, char *name, char *value); -typedef int (*mpo_check_kenv_unset_t)(struct ucred *cred, char *name); +typedef int (*mpo_kenv_check_unset_t)(struct ucred *cred, char *name); /* * Object: kld (Loadable kernel module) */ -typedef int (*mpo_check_kld_load_t)(struct ucred *cred, struct vnode *vp, +typedef int (*mpo_kld_check_load_t)(struct ucred *cred, struct vnode *vp, struct label *vlabel); -typedef int (*mpo_check_kld_stat_t)(struct ucred *cred); -typedef int (*mpo_check_kld_unload_t)(struct ucred *cred); +typedef int (*mpo_kld_check_stat_t)(struct ucred *cred); +typedef int (*mpo_kld_check_unload_t)(struct ucred *cred); /* * Object: struct ksem (POSIX semaphore) */ -typedef void (*mpo_init_posix_sem_label_t)(struct label *label); -typedef void (*mpo_destroy_posix_sem_label_t)(struct label *label); -typedef void (*mpo_create_posix_sem_t)(struct ucred *cred, +typedef void (*mpo_posix_sem_init_label_t)(struct label *label); +typedef void (*mpo_posix_sem_destroy_label_t)(struct label *label); +typedef void (*mpo_posix_sem_create_t)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); -typedef int (*mpo_check_posix_sem_destroy_t)(struct ucred *cred, +typedef int (*mpo_posix_sem_check_destroy_t)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); -typedef int (*mpo_check_posix_sem_getvalue_t)(struct ucred *cred, +typedef int (*mpo_posix_sem_check_getvalue_t)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); -typedef int (*mpo_check_posix_sem_open_t)(struct ucred *cred, +typedef int (*mpo_posix_sem_check_open_t)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); -typedef int (*mpo_check_posix_sem_post_t)(struct ucred *cred, +typedef int (*mpo_posix_sem_check_post_t)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); -typedef int (*mpo_check_posix_sem_unlink_t)(struct ucred *cred, +typedef int (*mpo_posix_sem_check_unlink_t)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); -typedef int (*mpo_check_posix_sem_wait_t)(struct ucred *cred, +typedef int (*mpo_posix_sem_check_wait_t)(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label); /* * Object: struct mbuf (Message buffer) */ -typedef int (*mpo_init_mbuf_label_t)(struct label *label, int flag); -typedef void (*mpo_destroy_mbuf_label_t)(struct label *label); -typedef void (*mpo_copy_mbuf_label_t)(struct label *src, +typedef int (*mpo_mbuf_init_label_t)(struct label *label, int flag); +typedef void (*mpo_mbuf_destroy_label_t)(struct label *label); +typedef void (*mpo_mbuf_copy_label_t)(struct label *src, struct label *dest); -typedef void (*mpo_create_mbuf_from_socket_t)(struct socket *so, - struct label *socketlabel, struct mbuf *m, - struct label *mbuflabel); -typedef void (*mpo_set_socket_peer_from_mbuf_t)(struct mbuf *mbuf, - struct label *mbuflabel, struct socket *so, - struct label *socketpeerlabel); -typedef void (*mpo_create_fragment_t)(struct mbuf *datagram, +typedef void (*mpo_mbuf_create_fragment_t)(struct mbuf *datagram, struct label *datagramlabel, struct mbuf *fragment, struct label *fragmentlabel); -typedef void (*mpo_create_mbuf_netlayer_t)(struct mbuf *oldmbuf, +typedef void (*mpo_mbuf_create_netlayer_t)(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel); -typedef void (*mpo_reflect_mbuf_icmp_t)(struct mbuf *m, +typedef void (*mpo_mbuf_reflect_icmp_t)(struct mbuf *m, struct label *mlabel); -typedef void (*mpo_reflect_mbuf_tcp_t)(struct mbuf *m, +typedef void (*mpo_mbuf_reflect_tcp_t)(struct mbuf *m, struct label *mlabel); /* * Object: struct mount (File system mountpoint) */ -typedef void (*mpo_init_mount_label_t)(struct label *label); -typedef void (*mpo_init_mount_fs_label_t)(struct label *label); -typedef void (*mpo_destroy_mount_label_t)(struct label *label); -typedef void (*mpo_destroy_mount_fs_label_t)(struct label *label); -typedef int (*mpo_check_mount_stat_t)(struct ucred *cred, +typedef void (*mpo_mount_init_label_t)(struct label *label); +typedef void (*mpo_mount_fs_init_label_t)(struct label *label); +typedef void (*mpo_mount_destroy_label_t)(struct label *label); +typedef void (*mpo_mount_fs_destroy_label_t)(struct label *label); +typedef int (*mpo_mount_check_stat_t)(struct ucred *cred, struct mount *mp, struct label *mntlabel); /* * Object: struct msqid_kernel (System V message queue) */ -typedef void (*mpo_init_sysv_msgqueue_label_t)(struct label *label); -typedef void (*mpo_destroy_sysv_msgqueue_label_t)(struct label *label); -typedef void (*mpo_cleanup_sysv_msgqueue_t)(struct label *msqlabel); -typedef void (*mpo_create_sysv_msgmsg_t)(struct ucred *cred, +typedef void (*mpo_sysv_msgqueue_init_label_t)(struct label *label); +typedef void (*mpo_sysv_msgqueue_destroy_t)(struct label *label); +typedef void (*mpo_sysv_msgqueue_cleanup_t)(struct label *msqlabel); +typedef void (*mpo_sysv_msgmsg_create_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel); -typedef void (*mpo_create_sysv_msgqueue_t)(struct ucred *cred, +typedef void (*mpo_sysv_msgqueue_create_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel); typedef int (*mpo_check_sysv_msgmsq_t)(struct ucred *cred, @@ -355,95 +349,95 @@ /* * Object: struct msg (System V message) */ -typedef void (*mpo_init_sysv_msgmsg_label_t)(struct label *label); -typedef void (*mpo_destroy_sysv_msgmsg_label_t)(struct label *label); -typedef void (*mpo_cleanup_sysv_msgmsg_t)(struct label *msglabel); +typedef void (*mpo_sysv_msgmsg_init_label_t)(struct label *label); +typedef void (*mpo_sysv_msgmsg_destroy_label_t)(struct label *label); +typedef void (*mpo_sysv_msgmsg_cleanup_t)(struct label *msglabel); /* * Object: struct pipepair (Pipe) */ -typedef void (*mpo_init_pipe_label_t)(struct label *label); -typedef void (*mpo_destroy_pipe_label_t)(struct label *label); -typedef void (*mpo_copy_pipe_label_t)(struct label *src, +typedef void (*mpo_pipe_init_label_t)(struct label *label); +typedef void (*mpo_pipe_destroy_label_t)(struct label *label); +typedef void (*mpo_pipe_copy_label_t)(struct label *src, struct label *dest); -typedef int (*mpo_externalize_pipe_label_t)(struct label *label, +typedef int (*mpo_pipe_externalize_label_t)(struct label *label, char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_internalize_pipe_label_t)(struct label *label, +typedef int (*mpo_pipe_internalize_label_t)(struct label *label, char *element_name, char *element_data, int *claimed); -typedef void (*mpo_relabel_pipe_t)(struct ucred *cred, struct pipepair *pp, +typedef void (*mpo_pipe_relabel_t)(struct ucred *cred, struct pipepair *pp, struct label *oldlabel, struct label *newlabel); -typedef void (*mpo_create_pipe_t)(struct ucred *cred, struct pipepair *pp, +typedef void (*mpo_pipe_create_t)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel); -typedef int (*mpo_check_pipe_ioctl_t)(struct ucred *cred, +typedef int (*mpo_pipe_check_ioctl_t)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, unsigned long cmd, void *data); -typedef int (*mpo_check_pipe_poll_t)(struct ucred *cred, +typedef int (*mpo_pipe_check_poll_t)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel); -typedef int (*mpo_check_pipe_read_t)(struct ucred *cred, +typedef int (*mpo_pipe_check_read_t)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel); -typedef int (*mpo_check_pipe_relabel_t)(struct ucred *cred, +typedef int (*mpo_pipe_check_relabel_t)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel); -typedef int (*mpo_check_pipe_stat_t)(struct ucred *cred, +typedef int (*mpo_pipe_check_stat_t)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel); -typedef int (*mpo_check_pipe_write_t)(struct ucred *cred, +typedef int (*mpo_pipe_check_write_t)(struct ucred *cred, struct pipepair *pp, struct label *pipelabel); /* * Object: struct proc (Process) */ -typedef void (*mpo_init_proc_label_t)(struct label *label); -typedef void (*mpo_destroy_proc_label_t)(struct label *label); -typedef void (*mpo_create_proc0_t)(struct ucred *cred); -typedef void (*mpo_create_proc1_t)(struct ucred *cred); -typedef void (*mpo_thread_userret_t)(struct thread *thread); -typedef int (*mpo_check_proc_debug_t)(struct ucred *cred, +typedef void (*mpo_proc_init_label_t)(struct label *label); +typedef void (*mpo_proc_destroy_label_t)(struct label *label); +typedef void (*mpo_proc_create_init_t)(struct ucred *cred); +typedef void (*mpo_proc_create_swapper_t)(struct ucred *cred); +typedef void (*mpo_proc_thread_userret_t)(struct thread *thread); +typedef int (*mpo_proc_check_debug_t)(struct ucred *cred, struct proc *proc); -typedef int (*mpo_check_proc_sched_t)(struct ucred *cred, +typedef int (*mpo_proc_check_sched_t)(struct ucred *cred, struct proc *proc); -typedef int (*mpo_check_proc_setuid_t)(struct ucred *cred, uid_t uid); -typedef int (*mpo_check_proc_seteuid_t)(struct ucred *cred, uid_t euid); -typedef int (*mpo_check_proc_setgid_t)(struct ucred *cred, gid_t gid); -typedef int (*mpo_check_proc_setegid_t)(struct ucred *cred, gid_t egid); -typedef int (*mpo_check_proc_setgroups_t)(struct ucred *cred, int ngroups, +typedef int (*mpo_proc_check_setuid_t)(struct ucred *cred, uid_t uid); +typedef int (*mpo_proc_check_seteuid_t)(struct ucred *cred, uid_t euid); +typedef int (*mpo_proc_check_setgid_t)(struct ucred *cred, gid_t gid); +typedef int (*mpo_proc_check_setegid_t)(struct ucred *cred, gid_t egid); +typedef int (*mpo_proc_check_setgroups_t)(struct ucred *cred, int ngroups, gid_t *gidset); -typedef int (*mpo_check_proc_setreuid_t)(struct ucred *cred, uid_t ruid, +typedef int (*mpo_proc_check_setreuid_t)(struct ucred *cred, uid_t ruid, uid_t euid); -typedef int (*mpo_check_proc_setregid_t)(struct ucred *cred, gid_t rgid, +typedef int (*mpo_proc_check_setregid_t)(struct ucred *cred, gid_t rgid, gid_t egid); -typedef int (*mpo_check_proc_setresuid_t)(struct ucred *cred, uid_t ruid, +typedef int (*mpo_proc_check_setresuid_t)(struct ucred *cred, uid_t ruid, uid_t euid, uid_t suid); -typedef int (*mpo_check_proc_setresgid_t)(struct ucred *cred, gid_t rgid, +typedef int (*mpo_proc_check_setresgid_t)(struct ucred *cred, gid_t rgid, gid_t egid, gid_t sgid); -typedef int (*mpo_check_proc_signal_t)(struct ucred *cred, +typedef int (*mpo_proc_check_signal_t)(struct ucred *cred, struct proc *proc, int signum); -typedef int (*mpo_check_proc_wait_t)(struct ucred *cred, +typedef int (*mpo_proc_check_wait_t)(struct ucred *cred, struct proc *proc); /* * Object: struct semid_kernel (System V IPC semaphore) */ -typedef void (*mpo_init_sysv_sem_label_t)(struct label *label); -typedef void (*mpo_destroy_sysv_sem_label_t)(struct label *label); -typedef void (*mpo_cleanup_sysv_sem_t)(struct label *semalabel); -typedef void (*mpo_create_sysv_sem_t)(struct ucred *cred, +typedef void (*mpo_sysv_sem_init_label_t)(struct label *label); +typedef void (*mpo_sysv_sem_destroy_label_t)(struct label *label); +typedef void (*mpo_sysv_sem_cleanup_t)(struct label *semalabel); +typedef void (*mpo_sysv_sem_create_t)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel); -typedef int (*mpo_check_sysv_semctl_t)(struct ucred *cred, +typedef int (*mpo_sysv_sem_check_semctl_t)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, int cmd); -typedef int (*mpo_check_sysv_semget_t)(struct ucred *cred, +typedef int (*mpo_sysv_sem_check_semget_t)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel); -typedef int (*mpo_check_sysv_semop_t)(struct ucred *cred, +typedef int (*mpo_sysv_sem_check_semop_t)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, size_t accesstype); /* * Object: struct shmid_kernel (System V shared memory segment) */ -typedef void (*mpo_init_sysv_shm_label_t)(struct label *label); -typedef void (*mpo_destroy_sysv_shm_label_t)(struct label *label); -typedef void (*mpo_cleanup_sysv_shm_t)(struct label *shmlabel); -typedef void (*mpo_create_sysv_shm_t)(struct ucred *cred, +typedef void (*mpo_sysv_shm_init_label_t)(struct label *label); +typedef void (*mpo_sysv_shm_destroy_label_t)(struct label *label); +typedef void (*mpo_sysv_shm_cleanup_t)(struct label *shmlabel); +typedef void (*mpo_sysv_shm_create_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmlabel); typedef int (*mpo_check_sysv_shmat_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, @@ -461,199 +455,205 @@ /* * Object: struct socket (Socket) */ -typedef int (*mpo_init_socket_label_t)(struct label *label, int flag); -typedef int (*mpo_init_socket_peer_label_t)(struct label *label, +typedef int (*mpo_socket_init_label_t)(struct label *label, int flag); +typedef int (*mpo_socket_init_peer_label_t)(struct label *label, int flag); -typedef void (*mpo_destroy_socket_label_t)(struct label *label); -typedef void (*mpo_destroy_socket_peer_label_t)(struct label *label); -typedef void (*mpo_copy_socket_label_t)(struct label *src, +typedef void (*mpo_socket_destroy_label_t)(struct label *label); +typedef void (*mpo_socket_destroy_peer_label_t)(struct label *label); +typedef void (*mpo_socket_copy_label_t)(struct label *src, struct label *dest); -typedef int (*mpo_externalize_socket_label_t)(struct label *label, +typedef int (*mpo_socket_externalize_label_t)(struct label *label, char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_externalize_socket_peer_label_t)(struct label *label, +typedef int (*mpo_socket_externalize_peer_label_t)(struct label *label, char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_internalize_socket_label_t)(struct label *label, +typedef int (*mpo_socket_internalize_label_t)(struct label *label, char *element_name, char *element_data, int *claimed); -typedef void (*mpo_create_socket_t)(struct ucred *cred, struct socket *so, +typedef void (*mpo_socket_create_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); -typedef void (*mpo_create_socket_from_socket_t)(struct socket *oldsocket, +typedef void (*mpo_socket_create_from_socket_t)(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel); -typedef void (*mpo_relabel_socket_t)(struct ucred *cred, struct socket *so, +typedef void (*mpo_socket_relabel_t)(struct ucred *cred, struct socket *so, struct label *oldlabel, struct label *newlabel); -typedef void (*mpo_set_socket_peer_from_socket_t)(struct socket *oldsocket, +typedef void (*mpo_socket_set_peer_from_socket_t)(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketpeerlabel); -typedef int (*mpo_check_socket_accept_t)(struct ucred *cred, +typedef void (*mpo_socket_create_mbuf_t)(struct socket *so, + struct label *socketlabel, struct mbuf *m, + struct label *mbuflabel); +typedef void (*mpo_socket_set_peer_from_mbuf_t)(struct mbuf *mbuf, + struct label *mbuflabel, struct socket *so, + struct label *socketpeerlabel); +typedef int (*mpo_socket_check_accept_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); -typedef int (*mpo_check_socket_bind_t)(struct ucred *cred, +typedef int (*mpo_socket_check_bind_t)(struct ucred *cred, struct socket *so, struct label *socketlabel, struct sockaddr *sockaddr); -typedef int (*mpo_check_socket_connect_t)(struct ucred *cred, +typedef int (*mpo_socket_check_connect_t)(struct ucred *cred, struct socket *so, struct label *socketlabel, struct sockaddr *sockaddr); -typedef int (*mpo_check_socket_create_t)(struct ucred *cred, int domain, +typedef int (*mpo_socket_check_create_t)(struct ucred *cred, int domain, int type, int protocol); -typedef int (*mpo_check_socket_deliver_t)(struct socket *so, +typedef int (*mpo_socket_check_deliver_t)(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel); -typedef int (*mpo_check_socket_listen_t)(struct ucred *cred, +typedef int (*mpo_socket_check_listen_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); -typedef int (*mpo_check_socket_poll_t)(struct ucred *cred, +typedef int (*mpo_socket_check_poll_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); -typedef int (*mpo_check_socket_receive_t)(struct ucred *cred, +typedef int (*mpo_socket_check_receive_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); -typedef int (*mpo_check_socket_relabel_t)(struct ucred *cred, +typedef int (*mpo_socket_check_relabel_t)(struct ucred *cred, struct socket *so, struct label *socketlabel, struct label *newlabel); -typedef int (*mpo_check_socket_send_t)(struct ucred *cred, +typedef int (*mpo_socket_check_send_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); -typedef int (*mpo_check_socket_stat_t)(struct ucred *cred, +typedef int (*mpo_socket_check_stat_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); -typedef int (*mpo_check_socket_visible_t)(struct ucred *cred, +typedef int (*mpo_socket_check_visible_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); /* * Object: system (Global system state) */ -typedef int (*mpo_check_sysarch_ioperm_t)(struct ucred *cred); -typedef int (*mpo_check_system_acct_t)(struct ucred *cred, +typedef int (*mpo_system_check_ioperm_t)(struct ucred *cred); +typedef int (*mpo_system_check_acct_t)(struct ucred *cred, struct vnode *vp, struct label *vlabel); -typedef int (*mpo_check_system_nfsd_t)(struct ucred *cred); -typedef int (*mpo_check_system_reboot_t)(struct ucred *cred, int howto); -typedef int (*mpo_check_system_settime_t)(struct ucred *cred); -typedef int (*mpo_check_system_swapon_t)(struct ucred *cred, +typedef int (*mpo_system_check_nfsd_t)(struct ucred *cred); +typedef int (*mpo_system_check_reboot_t)(struct ucred *cred, int howto); +typedef int (*mpo_system_check_settime_t)(struct ucred *cred); +typedef int (*mpo_system_check_swapon_t)(struct ucred *cred, struct vnode *vp, struct label *label); -typedef int (*mpo_check_system_swapoff_t)(struct ucred *cred, +typedef int (*mpo_system_check_swapoff_t)(struct ucred *cred, struct vnode *vp, struct label *label); -typedef int (*mpo_check_system_sysctl_t)(struct ucred *cred, +typedef int (*mpo_system_check_sysctl_t)(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); /* * Object: struct vnode (VFS node) */ -typedef void (*mpo_init_vnode_label_t)(struct label *label); -typedef void (*mpo_destroy_vnode_label_t)(struct label *label); -typedef int (*mpo_associate_vnode_extattr_t)(struct mount *mp, +typedef void (*mpo_vnode_init_label_t)(struct label *label); +typedef void (*mpo_vnode_destroy_vnode_label_t)(struct label *label); +typedef int (*mpo_vnode_associate_vnode_extattr_t)(struct mount *mp, struct label *fslabel, struct vnode *vp, struct label *vlabel); -typedef void (*mpo_associate_vnode_singlelabel_t)(struct mount *mp, +typedef void (*mpo_vnode_associate_vnode_singlelabel_t)(struct mount *mp, struct label *fslabel, struct vnode *vp, struct label *vlabel); -typedef int (*mpo_create_vnode_extattr_t)(struct ucred *cred, +typedef int (*mpo_vnode_create_vnode_extattr_t)(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp); -typedef void (*mpo_create_mount_t)(struct ucred *cred, struct mount *mp, +typedef void (*mpo_vnode_create_mount_t)(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel); -typedef void (*mpo_relabel_vnode_t)(struct ucred *cred, struct vnode *vp, +typedef void (*mpo_vnode_relabel_vnode_t)(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label); -typedef int (*mpo_setlabel_vnode_extattr_t)(struct ucred *cred, +typedef int (*mpo_vnode_setlabel_vnode_extattr_t)(struct ucred *cred, struct vnode *vp, struct label *vlabel, struct label *intlabel); -typedef void (*mpo_copy_vnode_label_t)(struct label *src, +typedef void (*mpo_vnode_copy_vnode_label_t)(struct label *src, struct label *dest); -typedef int (*mpo_externalize_vnode_label_t)(struct label *label, +typedef int (*mpo_vnode_externalize_vnode_label_t)(struct label *label, char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_internalize_vnode_label_t)(struct label *label, +typedef int (*mpo_vnode_internalize_vnode_label_t)(struct label *label, char *element_name, char *element_data, int *claimed); -typedef void (*mpo_execve_transition_t)(struct ucred *old, +typedef void (*mpo_vnode_execve_transition_t)(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, struct image_params *imgp, struct label *execlabel); -typedef int (*mpo_execve_will_transition_t)(struct ucred *old, +typedef int (*mpo_vnode_execve_will_transition_t)(struct ucred *old, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, struct image_params *imgp, struct label *execlabel); -typedef int (*mpo_check_vnode_access_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_access_t)(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode); typedef int (*mpo_check_vnode_chdir_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel); typedef int (*mpo_check_vnode_chroot_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel); -typedef int (*mpo_check_vnode_create_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_create_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp, struct vattr *vap); -typedef int (*mpo_check_vnode_delete_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_delete_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp); -typedef int (*mpo_check_vnode_deleteacl_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_deleteacl_t)(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type); -typedef int (*mpo_check_vnode_deleteextattr_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_deleteextattr_t)(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name); -typedef int (*mpo_check_vnode_exec_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_exec_t)(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel); -typedef int (*mpo_check_vnode_getacl_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_getacl_t)(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type); -typedef int (*mpo_check_vnode_getextattr_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_getextattr_t)(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio); -typedef int (*mpo_check_vnode_link_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_link_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp); -typedef int (*mpo_check_vnode_listextattr_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_listextattr_t)(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace); -typedef int (*mpo_check_vnode_lookup_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_lookup_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp); -typedef int (*mpo_check_vnode_mmap_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_mmap_t)(struct ucred *cred, struct vnode *vp, struct label *label, int prot, int flags); -typedef void (*mpo_check_vnode_mmap_downgrade_t)(struct ucred *cred, +typedef void (*mpo_vnode_check_mmap_downgrade_t)(struct ucred *cred, struct vnode *vp, struct label *label, int *prot); -typedef int (*mpo_check_vnode_mprotect_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_mprotect_t)(struct ucred *cred, struct vnode *vp, struct label *label, int prot); -typedef int (*mpo_check_vnode_open_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_open_t)(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode); -typedef int (*mpo_check_vnode_poll_t)(struct ucred *active_cred, +typedef int (*mpo_vnode_check_poll_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); -typedef int (*mpo_check_vnode_read_t)(struct ucred *active_cred, +typedef int (*mpo_vnode_check_read_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); -typedef int (*mpo_check_vnode_readdir_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_readdir_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel); -typedef int (*mpo_check_vnode_readlink_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_readlink_t)(struct ucred *cred, struct vnode *vp, struct label *label); -typedef int (*mpo_check_vnode_relabel_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_relabel_t)(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *newlabel); -typedef int (*mpo_check_vnode_rename_from_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_rename_from_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp); -typedef int (*mpo_check_vnode_rename_to_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_rename_to_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, int samedir, struct componentname *cnp); -typedef int (*mpo_check_vnode_revoke_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_revoke_t)(struct ucred *cred, struct vnode *vp, struct label *label); -typedef int (*mpo_check_vnode_setacl_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_setacl_t)(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl); -typedef int (*mpo_check_vnode_setextattr_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_setextattr_t)(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio); -typedef int (*mpo_check_vnode_setflags_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_setflags_t)(struct ucred *cred, struct vnode *vp, struct label *label, u_long flags); -typedef int (*mpo_check_vnode_setmode_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_setmode_t)(struct ucred *cred, struct vnode *vp, struct label *label, mode_t mode); -typedef int (*mpo_check_vnode_setowner_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_setowner_t)(struct ucred *cred, struct vnode *vp, struct label *label, uid_t uid, gid_t gid); -typedef int (*mpo_check_vnode_setutimes_t)(struct ucred *cred, +typedef int (*mpo_vnode_check_setutimes_t)(struct ucred *cred, struct vnode *vp, struct label *label, struct timespec atime, struct timespec mtime); -typedef int (*mpo_check_vnode_stat_t)(struct ucred *active_cred, +typedef int (*mpo_vnode_check_stat_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); -typedef int (*mpo_check_vnode_write_t)(struct ucred *active_cred, +typedef int (*mpo_vnode_check_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 22:02:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 94F2516A4DD for ; Wed, 5 Jul 2006 22:02:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2F7F43D45 for ; Wed, 5 Jul 2006 22:02:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0163D46CF0 for ; Wed, 5 Jul 2006 18:02:33 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BC4BF5609B; Wed, 5 Jul 2006 22:02:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B9E6316A4E0; Wed, 5 Jul 2006 22:02:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D56A16A4DA for ; Wed, 5 Jul 2006 22:02:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE63A43D46 for ; Wed, 5 Jul 2006 22:02: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.6/8.13.6) with ESMTP id k65M2TGb071904 for ; Wed, 5 Jul 2006 22:02:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65M2T6T071901 for perforce@freebsd.org; Wed, 5 Jul 2006 22:02:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 22:02:29 GMT Message-Id: <200607052202.k65M2T6T071901@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 100661 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 22:02:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=100661 Change 100661 by rwatson@rwatson_zoo on 2006/07/05 22:01:58 More renaming. Not happy with sysvipc names yet. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#5 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#5 (text+ko) ==== @@ -324,34 +324,34 @@ typedef void (*mpo_sysv_msgqueue_init_label_t)(struct label *label); typedef void (*mpo_sysv_msgqueue_destroy_t)(struct label *label); typedef void (*mpo_sysv_msgqueue_cleanup_t)(struct label *msqlabel); -typedef void (*mpo_sysv_msgmsg_create_t)(struct ucred *cred, +typedef void (*mpo_sysv_msgqueue_create_msg_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel); typedef void (*mpo_sysv_msgqueue_create_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel); -typedef int (*mpo_check_sysv_msgmsq_t)(struct ucred *cred, +typedef int (*mpo_sysv_msgqueue_check_msgmsq_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_check_sysv_msgrcv_t)(struct ucred *cred, +typedef int (*mpo_sysv_msgqueue_check_msgrcv_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel); -typedef int (*mpo_check_sysv_msgrmid_t)(struct ucred *cred, +typedef int (*mpo_sysv_msgqueue_check_msgrmid_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel); -typedef int (*mpo_check_sysv_msqget_t)(struct ucred *cred, +typedef int (*mpo_sysv_msgqueue_check_msqget_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_check_sysv_msqsnd_t)(struct ucred *cred, +typedef int (*mpo_sysv_msgqueue_check_msqsnd_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_check_sysv_msqrcv_t)(struct ucred *cred, +typedef int (*mpo_sysv_msgqueue_check_msqrcv_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_check_sysv_msqctl_t)(struct ucred *cred, +typedef int (*mpo_sysv_msgqueue_check_msqctl_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd); /* * Object: struct msg (System V message) */ -typedef void (*mpo_sysv_msgmsg_init_label_t)(struct label *label); -typedef void (*mpo_sysv_msgmsg_destroy_label_t)(struct label *label); -typedef void (*mpo_sysv_msgmsg_cleanup_t)(struct label *msglabel); +typedef void (*mpo_sysv_msg_init_label_t)(struct label *label); +typedef void (*mpo_sysv_msg_destroy_label_t)(struct label *label); +typedef void (*mpo_sysv_msg_cleanup_t)(struct label *msglabel); /* * Object: struct pipepair (Pipe) @@ -439,16 +439,16 @@ typedef void (*mpo_sysv_shm_cleanup_t)(struct label *shmlabel); typedef void (*mpo_sysv_shm_create_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmlabel); -typedef int (*mpo_check_sysv_shmat_t)(struct ucred *cred, +typedef int (*mpo_sysv_shm_check_shmat_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg); -typedef int (*mpo_check_sysv_shmctl_t)(struct ucred *cred, +typedef int (*mpo_sysv_shm_check_shmctl_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int cmd); -typedef int (*mpo_check_sysv_shmdt_t)(struct ucred *cred, +typedef int (*mpo_sysv_shm_check_shmdt_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel); -typedef int (*mpo_check_sysv_shmget_t)(struct ucred *cred, +typedef int (*mpo_sysv_shm_check_shmget_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg); @@ -662,8 +662,8 @@ /* * Policy module operations. */ - mpo_destroy_t mpo_destroy; - mpo_init_t mpo_init; + mpo_policy_destroy_t mpo_policy_destroy; + mpo_policy_init_t mpo_policy_init; /* * General policy-directed security system call so that policies may From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 22:25:04 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC28416A4E7 for ; Wed, 5 Jul 2006 22:25:04 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A1F043D46 for ; Wed, 5 Jul 2006 22:25:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 84D8B46C39 for ; Wed, 5 Jul 2006 18:25:01 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 92667554DD; Wed, 5 Jul 2006 22:24:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9170E16A4E0; Wed, 5 Jul 2006 22:24:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52CA716A4DE for ; Wed, 5 Jul 2006 22:24:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 135DA43D46 for ; Wed, 5 Jul 2006 22:24:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65MOwUN074886 for ; Wed, 5 Jul 2006 22:24:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65MOwBv074883 for perforce@freebsd.org; Wed, 5 Jul 2006 22:24:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 22:24:58 GMT Message-Id: <200607052224.k65MOwBv074883@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 100662 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 22:25:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=100662 Change 100662 by rwatson@rwatson_zoo on 2006/07/05 22:24:42 Checkpoint resort/respell on policy ops structure. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#6 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#6 (text+ko) ==== @@ -170,7 +170,7 @@ * Object: struct ucred (User credential) */ typedef void (*mpo_cred_init_label_t)(struct label *label); -typedef void (*mpo_cred_destroy_cred_label_t)(struct label *label); +typedef void (*mpo_cred_destroy_label_t)(struct label *label); typedef void (*mpo_cred_copy_label_t)(struct label *src, struct label *dest); typedef int (*mpo_cred_externalize_label_t)(struct label *label, @@ -659,18 +659,131 @@ typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); struct mac_policy_ops { + mpo_policy_destroy_t mpo_policy_destroy; + mpo_policy_init_t mpo_policy_init; + + mpo_syscall_t mpo_syscall; + + mpo_bpfdesc_init_label_t mpo_bpfdesc_init_label; + mpo_bpfdesc_destroy_label_t mpo_bpfdesc_destroy_label; + mpo_bpfdesc_create_t mpo_bpfdesc_create; + mpo_bpfdesc_create_mbuf_t mpo_bpfdesc_create_mbuf; + mpo_bpfdesc_check_receive_t mpo_bpfdesc_check_receive; + /* - * Policy module operations. + * XXXRW: Naming consistency here -- perhaps should just be + * mpo_devfs_*. + */ + mpo_devfsdirent_init_label_t mpo_devfsdirent_init_label; + mpo_devfsdirent_destroy_label_t mpo_devfsdirent_destroy_label; + mpo_devfs_vnode_associate_t mpo_devfs_vnode_associate; + mpo_devfs_create_device_t mpo_devfs_create_device; + mpo_devfs_create_directory_t mpo_devfs_create_directory; + mpo_devfs_create_symlink_t mpo_devfs_create_symlink; + mpo_devfsdirent_update_t mpo_devfsdirent_update_t; + + /* + * XXXRW: Perhaps should be mpo_ucred_*. + */ + mpo_cred_init_label_t mpo_cred_init_label; + mpo_cred_destroy_label_t mpo_cred_destroy_label; + mpo_cred_copy_label_t mpo_cred_copy_label; + mpo_cred_externalize_label_t mpo_cred_externalize_label; + mpo_cred_internalize_label_t mpo_cred_internalize_label; + mpo_cred_relabel_t mpo_cred_relabel; + mpo_cred_check_relabel_t mpo_cred_check_relabel; + mpo_cred_check_visible_t mpo_cred_check_visible; + + /* + * XXXRW: Names here still inconsistent. + */ + mpo_ifnet_init_label_t mpo_ifnet_init_label; + mpo_ifnet_destroy_label_t mpo_ifnet_destroy_label; + mpo_ifnet_copy_label_t mpo_ifnet_copy_label; + mpo_ifnet_externalize_label_t mpo_ifnet_externalize_label; + mpo_ifnet_internalize_label_t mpo_ifnet_internalize_label; + mpo_ifnet_create_t mpo_ifnet_create; + mpo_create_mbuf_linklayer_t mpo_create_mbuf_linklayer; + mpo_ifnet_create_mbuf_t mpo_ifnet_create_mbuf; + mpo_create_mbuf_multicast_encap_t mpo_create_mbuf_mulicast_encap; + mpo_ifnet_relabel_t mpo_ifnet_relabel; + mpo_ifnet_check_relabel_t mpo_ifnet_check_relabel; + mpo_ifnet_check_transmit_t mpo_ifnet_check_transmit; + + /* + * XXXRW: Could s/create_from_socket/create/. + */ + mpo_inpcb_init_label_t mpo_inpcb_init_label; + mpo_inpcb_destroy_label_t mpo_inpcb_destroy_label; + mpo_inpcb_create_from_socket_t mpo_inpcb_create_from_socket; + mpo_inpcb_create_mbuf_t mpo_inpcb_create_mbuf; + mpo_inpcb_sosetlabel_t mpo_inpcb_sosetlabel; + mpo_inpcb_check_deliver_t mpo_inpcb_check_deliver; + + /* + * XXXRW: Maybe s/create_datagram/reassemble/, + * s/fragment_match/match/. + */ + mpo_ipq_init_label_t mpo_ipq_init_label; + mpo_ipq_destroy_label_t mpo_ipq_destroy_label; + mpo_ipq_create_t mpo_ipq_create; + mpo_ipq_create_datagram_t mpo_ipq_create_datagram; + mpo_ipq_fragment_match_t mpo_ipq_fragment_match; + mpo_ipq_update_t mpo_ipq_update; + + mpo_kenv_check_dump_t mpo_kenv_check_dump; + mpo_kenv_check_get_t mpo_kenv_check_get; + mpo_kenv_check_set_t mpo_kenv_check_set; + mpo_kenv_check_unset_t mpo_kenv_check_unset; + + mpo_kld_check_load_t mpo_kld_check_load; + mpo_kld_check_stat_t mpo_kld_check_stat; + mpo_kld_check_unload_t mpo_kld_check_unload; + + /* + * XXXRW: Since the structure is ksem, maybe these should be + * renamed; alternatively, maybe ksem should be renamed? Should + * be unlink instead of destroy? + */ + mpo_posix_sem_init_label_t mpo_posix_sem_init_label; + mpo_posix_sem_destroy_label_t mpo_posix_sem_destroy_label; + mpo_posix_sem_create_t mpo_posix_sem_create; + mpo_posix_sem_check_destroy_t mpo_posix_sem_check_destroy; + mpo_posix_sem_check_getvalue_t mpo_posix_sem_check_getvalue; + mpo_posix_sem_check_open_t mpo_posix_sem_check_open; + mpo_posix_sem_check_post_t mpo_posix_sem_check_post; + mpo_posix_sem_check_unlink_t mpo_posix_sem_check_unlink; + mpo_posix_sem_check_wait_t mpo_posix_sem_check_wait; + + /* + * XXXRW: Perhaps fragment, netlayer, icmp, tcp, etc, should be + * netinet calls rather than mbuf calls? */ - mpo_policy_destroy_t mpo_policy_destroy; - mpo_policy_init_t mpo_policy_init; + mpo_mbuf_init_label_t mpo_mbuf_init_label; + mpo_mbuf_destroy_label_t mpo_mbuf_destroy_label; + mpo_mbuf_copy_label_t mpo_mbuf_copy_label; + mpo_mbuf_create_fragment_t mpo_mbuf_create_fragment; + mpo_mbuf_create_netlayer_t mpo_mbuf_create_netlayer; + mpo_mbuf_reflect_icmp_t mpo_mbuf_reflect_icmp; + mpo_mbuf_reflect_tcp_t mpo_mbuf_reflect_tcp; /* - * General policy-directed security system call so that policies may - * implement new services without reserving explicit system call - * numbers. + * XXXRW: Time to toast mount_fs label since it basically is unused? */ - mpo_syscall_t mpo_syscall; + mpo_mount_init_label_t mpo_mount_init_label; + mpo_mount_fs_init_label_t mpo_mount_fs_init_label; + mpo_mount_destroy_label_t mpo_mount_destroy_label; + mpo_mount_fs_destroy_label_t mpo_mount_fs_destroy_label; + mpo_mount_check_stat_t mpo_mount_check_stat; + + + + + + + + + /* * Label operations. Initialize label storage, destroy label From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 22:35:20 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA8E916A4DD for ; Wed, 5 Jul 2006 22:35:20 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD27C43D62 for ; Wed, 5 Jul 2006 22:35:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 61B0C46C52 for ; Wed, 5 Jul 2006 18:35:13 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A8DEA6444A; Wed, 5 Jul 2006 22:35:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A6FDB16A4E1; Wed, 5 Jul 2006 22:35:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8024716A4DA for ; Wed, 5 Jul 2006 22:35:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D0FC43D62 for ; Wed, 5 Jul 2006 22:35:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65MZBvL077979 for ; Wed, 5 Jul 2006 22:35:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65MZBU3077976 for perforce@freebsd.org; Wed, 5 Jul 2006 22:35:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 22:35:11 GMT Message-Id: <200607052235.k65MZBU3077976@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 100663 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 22:35:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=100663 Change 100663 by rwatson@rwatson_zoo on 2006/07/05 22:34:39 Checkpoint renames. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#7 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#7 (text+ko) ==== @@ -776,11 +776,43 @@ mpo_mount_fs_destroy_label_t mpo_mount_fs_destroy_label; mpo_mount_check_stat_t mpo_mount_check_stat; + /* + * XXXRW: These names are a bit awkard. Perhaps sysv_msq to match + * conventional usage? + */ + mpo_sysv_msgqueue_init_label_t mpo_sysv_msgqueue_init_label; + mpo_sysv_msgqueue_destroy_t mpo_sysv_msgqueue_destroy; + mpo_sysv_msgqueue_cleanup_t mpo_sysv_msgqueue_cleanup; + mpo_sysv_msgqueue_create_msg_t mpo_sysv_msgqueue_create_msg; + mpo_sysv_msgqueue_create_t mpo_sysv_msgqueue_create; + mpo_sysv_msgqueue_check_msgmsq_t mpo_sysv_msgqueue_check_msgmsq; + mpo_sysv_msgqueue_check_msgrcv_t mpo_sysv_msgqueue_check_msgrcv; + mpo_sysv_msgqueue_check_msgrmid_t mpo_sysv_msgqueue_check_msgrmid; + mpo_sysv_msgqueue_check_msqget_t mpo_sysv_msgqueue_check_msqget; + mpo_sysv_msgqueue_check_msqsnd_t mpo_sysv_msgqueue_check_msqsnd; + mpo_sysv_msgqueue_check_msqrcv_t mpo_sysv_msgqueue_check_msqrcv; + mpo_sysv_msgqueue_check_msqctl_t mpo_sysv_msgqueue_check_msqctl; + mpo_sysv_msg_init_label_t mpo_sysv_msg_init_label; + mpo_sysv_msg_destroy_label_t mpo_sysv_msg_destroy_label; + mpo_sysv_msg_cleanup_t mpo_sysv_msg_cleanup; - - - + /* + * XXXRW: Technically, structure name here is pipepair, not pipe. + */ + mpo_pipe_init_label_t mpo_pipe_init_label; + mpo_pipe_destroy_label_t mpo_pipe_destroy_label; + mpo_pipe_copy_label_t mpo_pipe_copy_label; + mpo_pipe_externalize_label_t mpo_pipe_externalize_label; + mpo_pipe_internalize_label_t mpo_pipe_internalize_label; + mpo_pipe_relabel_t mpo_pipe_relabel; + mpo_pipe_create_t mpo_pipe_create; + mpo_pipe_check_ioctl_t mpo_pipe_check_ioctl; + mpo_pipe_check_poll_t mpo_pipe_check_poll; + mpo_pipe_check_read_t mpo_pipe_check_read; + mpo_pipe_check_relabel_t mpo_pipe_check_relabel; + mpo_pipe_check_stat_t mpo_pipe_check_stat; + mpo_pipe_check_write_t mpo_pipe_check_write; From owner-trustedbsd-cvs@FreeBSD.ORG Wed Jul 5 23:56:09 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD33916A4EA for ; Wed, 5 Jul 2006 23:56:09 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E3D643D45 for ; Wed, 5 Jul 2006 23:56:09 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 26BEA46BEC for ; Wed, 5 Jul 2006 19:56:07 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1B40555A8C; Wed, 5 Jul 2006 23:56:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D62516A4E1; Wed, 5 Jul 2006 23:56:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC5D516A4DF for ; Wed, 5 Jul 2006 23:56:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A968E43D45 for ; Wed, 5 Jul 2006 23:56:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65Nu5Hw084317 for ; Wed, 5 Jul 2006 23:56:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65Nu5sA084312 for perforce@freebsd.org; Wed, 5 Jul 2006 23:56:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 5 Jul 2006 23:56:05 GMT Message-Id: <200607052356.k65Nu5sA084312@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 100675 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2006 23:56:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=100675 Change 100675 by rwatson@rwatson_zoo on 2006/07/05 23:55:26 Further rename/checkpoint. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#8 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#8 (text+ko) ==== @@ -413,6 +413,7 @@ struct proc *proc, int signum); typedef int (*mpo_proc_check_wait_t)(struct ucred *cred, struct proc *proc); +typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); /* * Object: struct semid_kernel (System V IPC semaphore) @@ -656,7 +657,6 @@ typedef int (*mpo_vnode_check_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); -typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); struct mac_policy_ops { mpo_policy_destroy_t mpo_policy_destroy; @@ -814,283 +814,32 @@ mpo_pipe_check_stat_t mpo_pipe_check_stat; mpo_pipe_check_write_t mpo_pipe_check_write; + mpo_proc_init_label_t mpo_proc_init_label; + mpo_proc_destroy_label_t mpo_proc_destroy_label; + mpo_proc_create_init_t mpo_proc_create_init; + mpo_proc_create_swapper_t mpo_proc_create_swapper; + mpo_proc_thread_userret_t mpo_proc_thread_userret; + mpo_proc_check_debug_t mpo_proc_check_debug; + mpo_proc_check_sched_t mpo_proc_check_sched; + mpo_proc_check_setuid_t mpo_proc_check_setuid; + mpo_proc_check_seteuid_t mpo_proc_check_seteuid; + mpo_proc_check_setgid_t mpo_proc_check_setgid; + mpo_proc_check_setegid_t mpo_proc_check_setegid; + mpo_proc_check_setgroups_t mpo_proc_check_setgroups; + mpo_proc_check_setreuid_t mpo_proc_check_setreuid; + mpo_proc_check_setregid_t mpo_proc_check_setregid; + mpo_proc_check_setresuid_t mpo_proc_check_setresuid; + mpo_proc_check_setresgid_t mpo_proc_check_setresgid; + mpo_proc_check_signal_t mpo_proc_check_signal; + mpo_proc_check_wait_t mpo_proc_check_wait; - - - /* - * Label operations. Initialize label storage, destroy label - * storage, recycle for re-use without init/destroy, copy a label to - * initialized storage, and externalize/internalize from/to - * initialized storage. - */ - mpo_init_bpfdesc_label_t mpo_init_bpfdesc_label; - mpo_init_cred_label_t mpo_init_cred_label; - mpo_init_devfsdirent_label_t mpo_init_devfsdirent_label; - mpo_placeholder_t _mpo_placeholder0; - mpo_init_ifnet_label_t mpo_init_ifnet_label; - mpo_init_inpcb_label_t mpo_init_inpcb_label; - mpo_init_sysv_msgmsg_label_t mpo_init_sysv_msgmsg_label; - mpo_init_sysv_msgqueue_label_t mpo_init_sysv_msgqueue_label; - mpo_init_sysv_sem_label_t mpo_init_sysv_sem_label; - mpo_init_sysv_shm_label_t mpo_init_sysv_shm_label; - mpo_init_ipq_label_t mpo_init_ipq_label; - mpo_init_mbuf_label_t mpo_init_mbuf_label; - mpo_init_mount_label_t mpo_init_mount_label; - mpo_init_mount_fs_label_t mpo_init_mount_fs_label; - mpo_init_socket_label_t mpo_init_socket_label; - mpo_init_socket_peer_label_t mpo_init_socket_peer_label; - mpo_init_pipe_label_t mpo_init_pipe_label; - mpo_init_posix_sem_label_t mpo_init_posix_sem_label; - mpo_init_proc_label_t mpo_init_proc_label; - mpo_init_vnode_label_t mpo_init_vnode_label; - mpo_destroy_bpfdesc_label_t mpo_destroy_bpfdesc_label; - mpo_destroy_cred_label_t mpo_destroy_cred_label; - mpo_destroy_devfsdirent_label_t mpo_destroy_devfsdirent_label; - mpo_placeholder_t _mpo_placeholder1; - mpo_destroy_ifnet_label_t mpo_destroy_ifnet_label; - mpo_destroy_inpcb_label_t mpo_destroy_inpcb_label; - mpo_destroy_sysv_msgmsg_label_t mpo_destroy_sysv_msgmsg_label; - mpo_destroy_sysv_msgqueue_label_t mpo_destroy_sysv_msgqueue_label; - mpo_destroy_sysv_sem_label_t mpo_destroy_sysv_sem_label; - mpo_destroy_sysv_shm_label_t mpo_destroy_sysv_shm_label; - mpo_destroy_ipq_label_t mpo_destroy_ipq_label; - mpo_destroy_mbuf_label_t mpo_destroy_mbuf_label; - mpo_destroy_mount_label_t mpo_destroy_mount_label; - mpo_destroy_mount_fs_label_t mpo_destroy_mount_fs_label; - mpo_destroy_socket_label_t mpo_destroy_socket_label; - mpo_destroy_socket_peer_label_t mpo_destroy_socket_peer_label; - mpo_destroy_pipe_label_t mpo_destroy_pipe_label; - mpo_destroy_posix_sem_label_t mpo_destroy_posix_sem_label; - mpo_destroy_proc_label_t mpo_destroy_proc_label; - mpo_destroy_vnode_label_t mpo_destroy_vnode_label; - mpo_cleanup_sysv_msgmsg_t mpo_cleanup_sysv_msgmsg; - mpo_cleanup_sysv_msgqueue_t mpo_cleanup_sysv_msgqueue; - mpo_cleanup_sysv_sem_t mpo_cleanup_sysv_sem; - mpo_cleanup_sysv_shm_t mpo_cleanup_sysv_shm; - mpo_copy_cred_label_t mpo_copy_cred_label; - mpo_copy_ifnet_label_t mpo_copy_ifnet_label; - mpo_copy_mbuf_label_t mpo_copy_mbuf_label; - mpo_placeholder_t _mpo_placeholder2; - mpo_copy_pipe_label_t mpo_copy_pipe_label; - mpo_copy_socket_label_t mpo_copy_socket_label; - mpo_copy_vnode_label_t mpo_copy_vnode_label; - mpo_externalize_cred_label_t mpo_externalize_cred_label; - mpo_externalize_ifnet_label_t mpo_externalize_ifnet_label; - mpo_placeholder_t _mpo_placeholder3; - mpo_externalize_pipe_label_t mpo_externalize_pipe_label; - mpo_externalize_socket_label_t mpo_externalize_socket_label; - mpo_externalize_socket_peer_label_t mpo_externalize_socket_peer_label; - mpo_externalize_vnode_label_t mpo_externalize_vnode_label; - mpo_internalize_cred_label_t mpo_internalize_cred_label; - mpo_internalize_ifnet_label_t mpo_internalize_ifnet_label; - mpo_placeholder_t _mpo_placeholder4; - mpo_internalize_pipe_label_t mpo_internalize_pipe_label; - mpo_internalize_socket_label_t mpo_internalize_socket_label; - mpo_internalize_vnode_label_t mpo_internalize_vnode_label; - - /* - * Labeling event operations: file system objects, and things that - * look a lot like file system objects. - */ - mpo_associate_vnode_devfs_t mpo_associate_vnode_devfs; - mpo_associate_vnode_extattr_t mpo_associate_vnode_extattr; - mpo_associate_vnode_singlelabel_t mpo_associate_vnode_singlelabel; - mpo_create_devfs_device_t mpo_create_devfs_device; - mpo_create_devfs_directory_t mpo_create_devfs_directory; - mpo_create_devfs_symlink_t mpo_create_devfs_symlink; - mpo_placeholder_t _mpo_placeholder5; - mpo_create_vnode_extattr_t mpo_create_vnode_extattr; - mpo_create_mount_t mpo_create_mount; - mpo_relabel_vnode_t mpo_relabel_vnode; - mpo_setlabel_vnode_extattr_t mpo_setlabel_vnode_extattr; - mpo_update_devfsdirent_t mpo_update_devfsdirent; - - /* - * Labeling event operations: IPC objects. - */ - mpo_create_mbuf_from_socket_t mpo_create_mbuf_from_socket; - mpo_create_socket_t mpo_create_socket; - mpo_create_socket_from_socket_t mpo_create_socket_from_socket; - mpo_relabel_socket_t mpo_relabel_socket; - mpo_relabel_pipe_t mpo_relabel_pipe; - mpo_set_socket_peer_from_mbuf_t mpo_set_socket_peer_from_mbuf; - mpo_set_socket_peer_from_socket_t mpo_set_socket_peer_from_socket; - mpo_create_pipe_t mpo_create_pipe; - - /* - * Labeling event operations: System V IPC primitives. - */ - mpo_create_sysv_msgmsg_t mpo_create_sysv_msgmsg; - mpo_create_sysv_msgqueue_t mpo_create_sysv_msgqueue; - mpo_create_sysv_sem_t mpo_create_sysv_sem; - mpo_create_sysv_shm_t mpo_create_sysv_shm; - - /* - * Labeling event operations: POSIX (global/inter-process) semaphores. - */ - mpo_create_posix_sem_t mpo_create_posix_sem; - - /* - * Labeling event operations: network objects. - */ - mpo_create_bpfdesc_t mpo_create_bpfdesc; - mpo_create_ifnet_t mpo_create_ifnet; - mpo_create_inpcb_from_socket_t mpo_create_inpcb_from_socket; - mpo_create_ipq_t mpo_create_ipq; - mpo_create_datagram_from_ipq mpo_create_datagram_from_ipq; - mpo_create_fragment_t mpo_create_fragment; - mpo_create_mbuf_from_inpcb_t mpo_create_mbuf_from_inpcb; - mpo_create_mbuf_linklayer_t mpo_create_mbuf_linklayer; - mpo_create_mbuf_from_bpfdesc_t mpo_create_mbuf_from_bpfdesc; - mpo_create_mbuf_from_ifnet_t mpo_create_mbuf_from_ifnet; - mpo_create_mbuf_multicast_encap_t mpo_create_mbuf_multicast_encap; - mpo_create_mbuf_netlayer_t mpo_create_mbuf_netlayer; - mpo_fragment_match_t mpo_fragment_match; - mpo_reflect_mbuf_icmp_t mpo_reflect_mbuf_icmp; - mpo_reflect_mbuf_tcp_t mpo_reflect_mbuf_tcp; - mpo_relabel_ifnet_t mpo_relabel_ifnet; - mpo_update_ipq_t mpo_update_ipq; - mpo_inpcb_sosetlabel_t mpo_inpcb_sosetlabel; - - /* - * Labeling event operations: processes. - */ - mpo_execve_transition_t mpo_execve_transition; - mpo_execve_will_transition_t mpo_execve_will_transition; - mpo_create_proc0_t mpo_create_proc0; - mpo_create_proc1_t mpo_create_proc1; - mpo_relabel_cred_t mpo_relabel_cred; - mpo_placeholder_t _mpo_placeholder6; - mpo_thread_userret_t mpo_thread_userret; - - /* - * Access control checks. - */ - mpo_check_bpfdesc_receive_t mpo_check_bpfdesc_receive; - mpo_placeholder_t _mpo_placeholder7; - mpo_check_cred_relabel_t mpo_check_cred_relabel; - mpo_check_cred_visible_t mpo_check_cred_visible; - mpo_placeholder_t _mpo_placeholder8; - mpo_placeholder_t _mpo_placeholder9; - mpo_placeholder_t _mpo_placeholder10; - mpo_placeholder_t _mpo_placeholder11; - mpo_placeholder_t _mpo_placeholder12; - mpo_placeholder_t _mpo_placeholder13; - mpo_placeholder_t _mpo_placeholder14; - mpo_placeholder_t _mpo_placeholder15; - mpo_placeholder_t _mpo_placeholder16; - mpo_placeholder_t _mpo_placeholder17; - mpo_placeholder_t _mpo_placeholder18; - mpo_check_ifnet_relabel_t mpo_check_ifnet_relabel; - mpo_check_ifnet_transmit_t mpo_check_ifnet_transmit; - mpo_check_inpcb_deliver_t mpo_check_inpcb_deliver; - mpo_check_sysv_msgmsq_t mpo_check_sysv_msgmsq; - mpo_check_sysv_msgrcv_t mpo_check_sysv_msgrcv; - mpo_check_sysv_msgrmid_t mpo_check_sysv_msgrmid; - mpo_check_sysv_msqget_t mpo_check_sysv_msqget; - mpo_check_sysv_msqsnd_t mpo_check_sysv_msqsnd; - mpo_check_sysv_msqrcv_t mpo_check_sysv_msqrcv; - mpo_check_sysv_msqctl_t mpo_check_sysv_msqctl; - mpo_check_sysv_semctl_t mpo_check_sysv_semctl; - mpo_check_sysv_semget_t mpo_check_sysv_semget; - mpo_check_sysv_semop_t mpo_check_sysv_semop; - mpo_check_sysv_shmat_t mpo_check_sysv_shmat; - mpo_check_sysv_shmctl_t mpo_check_sysv_shmctl; - mpo_check_sysv_shmdt_t mpo_check_sysv_shmdt; - mpo_check_sysv_shmget_t mpo_check_sysv_shmget; - mpo_check_kenv_dump_t mpo_check_kenv_dump; - mpo_check_kenv_get_t mpo_check_kenv_get; - mpo_check_kenv_set_t mpo_check_kenv_set; - mpo_check_kenv_unset_t mpo_check_kenv_unset; - mpo_check_kld_load_t mpo_check_kld_load; - mpo_check_kld_stat_t mpo_check_kld_stat; - mpo_check_kld_unload_t mpo_check_kld_unload; - mpo_placeholder_t _mpo_placeholder19; - mpo_placeholder_t _mpo_placeholder20; - mpo_check_mount_stat_t mpo_check_mount_stat; - mpo_placeholder_t _mpo_placeholder_21; - mpo_check_pipe_ioctl_t mpo_check_pipe_ioctl; - mpo_check_pipe_poll_t mpo_check_pipe_poll; - mpo_check_pipe_read_t mpo_check_pipe_read; - mpo_check_pipe_relabel_t mpo_check_pipe_relabel; - mpo_check_pipe_stat_t mpo_check_pipe_stat; - mpo_check_pipe_write_t mpo_check_pipe_write; - mpo_check_posix_sem_destroy_t mpo_check_posix_sem_destroy; - mpo_check_posix_sem_getvalue_t mpo_check_posix_sem_getvalue; - mpo_check_posix_sem_open_t mpo_check_posix_sem_open; - mpo_check_posix_sem_post_t mpo_check_posix_sem_post; - mpo_check_posix_sem_unlink_t mpo_check_posix_sem_unlink; - mpo_check_posix_sem_wait_t mpo_check_posix_sem_wait; - mpo_check_proc_debug_t mpo_check_proc_debug; - mpo_check_proc_sched_t mpo_check_proc_sched; - mpo_check_proc_setuid_t mpo_check_proc_setuid; - mpo_check_proc_seteuid_t mpo_check_proc_seteuid; - mpo_check_proc_setgid_t mpo_check_proc_setgid; - mpo_check_proc_setegid_t mpo_check_proc_setegid; - mpo_check_proc_setgroups_t mpo_check_proc_setgroups; - mpo_check_proc_setreuid_t mpo_check_proc_setreuid; - mpo_check_proc_setregid_t mpo_check_proc_setregid; - mpo_check_proc_setresuid_t mpo_check_proc_setresuid; - mpo_check_proc_setresgid_t mpo_check_proc_setresgid; - mpo_check_proc_signal_t mpo_check_proc_signal; - mpo_check_proc_wait_t mpo_check_proc_wait; - mpo_check_socket_accept_t mpo_check_socket_accept; - mpo_check_socket_bind_t mpo_check_socket_bind; - mpo_check_socket_connect_t mpo_check_socket_connect; - mpo_check_socket_create_t mpo_check_socket_create; - mpo_check_socket_deliver_t mpo_check_socket_deliver; - mpo_placeholder_t _mpo_placeholder22; - mpo_check_socket_listen_t mpo_check_socket_listen; - mpo_check_socket_poll_t mpo_check_socket_poll; - mpo_check_socket_receive_t mpo_check_socket_receive; - mpo_check_socket_relabel_t mpo_check_socket_relabel; - mpo_check_socket_send_t mpo_check_socket_send; - mpo_check_socket_stat_t mpo_check_socket_stat; - mpo_check_socket_visible_t mpo_check_socket_visible; - mpo_check_sysarch_ioperm_t mpo_check_sysarch_ioperm; - mpo_check_system_acct_t mpo_check_system_acct; - mpo_check_system_nfsd_t mpo_check_system_nfsd; - mpo_check_system_reboot_t mpo_check_system_reboot; - mpo_check_system_settime_t mpo_check_system_settime; - mpo_check_system_swapon_t mpo_check_system_swapon; - mpo_check_system_swapoff_t mpo_check_system_swapoff; - mpo_check_system_sysctl_t mpo_check_system_sysctl; - mpo_placeholder_t _mpo_placeholder23; - mpo_check_vnode_access_t mpo_check_vnode_access; - mpo_check_vnode_chdir_t mpo_check_vnode_chdir; - mpo_check_vnode_chroot_t mpo_check_vnode_chroot; - mpo_check_vnode_create_t mpo_check_vnode_create; - mpo_check_vnode_delete_t mpo_check_vnode_delete; - mpo_check_vnode_deleteacl_t mpo_check_vnode_deleteacl; - mpo_check_vnode_deleteextattr_t mpo_check_vnode_deleteextattr; - mpo_check_vnode_exec_t mpo_check_vnode_exec; - mpo_check_vnode_getacl_t mpo_check_vnode_getacl; - mpo_check_vnode_getextattr_t mpo_check_vnode_getextattr; - mpo_placeholder_t _mpo_placeholder24; - mpo_check_vnode_link_t mpo_check_vnode_link; - mpo_check_vnode_listextattr_t mpo_check_vnode_listextattr; - mpo_check_vnode_lookup_t mpo_check_vnode_lookup; - mpo_check_vnode_mmap_t mpo_check_vnode_mmap; - mpo_check_vnode_mmap_downgrade_t mpo_check_vnode_mmap_downgrade; - mpo_check_vnode_mprotect_t mpo_check_vnode_mprotect; - mpo_check_vnode_open_t mpo_check_vnode_open; - mpo_check_vnode_poll_t mpo_check_vnode_poll; - mpo_check_vnode_read_t mpo_check_vnode_read; - mpo_check_vnode_readdir_t mpo_check_vnode_readdir; - mpo_check_vnode_readlink_t mpo_check_vnode_readlink; - mpo_check_vnode_relabel_t mpo_check_vnode_relabel; - mpo_check_vnode_rename_from_t mpo_check_vnode_rename_from; - mpo_check_vnode_rename_to_t mpo_check_vnode_rename_to; - mpo_check_vnode_revoke_t mpo_check_vnode_revoke; - mpo_check_vnode_setacl_t mpo_check_vnode_setacl; - mpo_check_vnode_setextattr_t mpo_check_vnode_setextattr; - mpo_check_vnode_setflags_t mpo_check_vnode_setflags; - mpo_check_vnode_setmode_t mpo_check_vnode_setmode; - mpo_check_vnode_setowner_t mpo_check_vnode_setowner; - mpo_check_vnode_setutimes_t mpo_check_vnode_setutimes; - mpo_check_vnode_stat_t mpo_check_vnode_stat; - mpo_check_vnode_write_t mpo_check_vnode_write; - mpo_associate_nfsd_label_t mpo_associate_nfsd_label; + mpo_sysv_sem_init_label_t mpo_sysv_sem_init_label; + mpo_sysv_sem_destroy_label_t mpo_sysv_sem_destroy_label; + mpo_sysv_sem_cleanup_t mpo_sysv_sem_cleanup; + mpo_sysv_sem_create_t mpo_sysv_sem_create; + mpo_sysv_sem_check_semctl_t mpo_sysv_sem_check_semctl; + mpo_sysv_sem_check_semget_t mpo_sysv_sem_check_semget; + mpo_sysv_sem_check_semop_t mpo_sysv_sem_check_semop; }; /* From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 09:00:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F3FB16A554 for ; Thu, 6 Jul 2006 09:00:38 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E786E43D66 for ; Thu, 6 Jul 2006 09:00:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D82DE46D16 for ; Thu, 6 Jul 2006 05:00:07 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4891B63159; Thu, 6 Jul 2006 09:00:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BA6E16A4E5; Thu, 6 Jul 2006 09:00:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1556C16A4DE for ; Thu, 6 Jul 2006 09:00:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 570DC43D5C for ; Thu, 6 Jul 2006 09:00: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.6/8.13.6) with ESMTP id k66906fB053566 for ; Thu, 6 Jul 2006 09:00:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66905IX053563 for perforce@freebsd.org; Thu, 6 Jul 2006 09:00:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 09:00:05 GMT Message-Id: <200607060900.k66905IX053563@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 100703 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 09:00:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=100703 Change 100703 by rwatson@rwatson_zoo on 2006/07/06 08:59:25 Finish re-populating mac_policy_ops, a few more renames and comments. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#9 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#9 (text+ko) ==== @@ -535,30 +535,31 @@ * Object: struct vnode (VFS node) */ typedef void (*mpo_vnode_init_label_t)(struct label *label); -typedef void (*mpo_vnode_destroy_vnode_label_t)(struct label *label); -typedef int (*mpo_vnode_associate_vnode_extattr_t)(struct mount *mp, +typedef void (*mpo_vnode_destroy_label_t)(struct label *label); +typedef int (*mpo_vnode_associate_extattr_t)(struct mount *mp, struct label *fslabel, struct vnode *vp, struct label *vlabel); -typedef void (*mpo_vnode_associate_vnode_singlelabel_t)(struct mount *mp, +typedef void (*mpo_vnode_associate_singlelabel_t)(struct mount *mp, struct label *fslabel, struct vnode *vp, struct label *vlabel); -typedef int (*mpo_vnode_create_vnode_extattr_t)(struct ucred *cred, +typedef int (*mpo_vnode_create_extattr_t)(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp); -typedef void (*mpo_vnode_create_mount_t)(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel); -typedef void (*mpo_vnode_relabel_vnode_t)(struct ucred *cred, struct vnode *vp, +typedef void (*mpo_vnode_create_mount_t)(struct ucred *cred, + struct mount *mp, struct label *mntlabel, + struct label *fslabel); +typedef void (*mpo_vnode_relabel_t)(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label); -typedef int (*mpo_vnode_setlabel_vnode_extattr_t)(struct ucred *cred, +typedef int (*mpo_vnode_setlabel_extattr_t)(struct ucred *cred, struct vnode *vp, struct label *vlabel, struct label *intlabel); -typedef void (*mpo_vnode_copy_vnode_label_t)(struct label *src, +typedef void (*mpo_vnode_copy_label_t)(struct label *src, struct label *dest); -typedef int (*mpo_vnode_externalize_vnode_label_t)(struct label *label, +typedef int (*mpo_vnode_externalize_label_t)(struct label *label, char *element_name, struct sbuf *sb, int *claimed); -typedef int (*mpo_vnode_internalize_vnode_label_t)(struct label *label, +typedef int (*mpo_vnode_internalize_label_t)(struct label *label, char *element_name, char *element_data, int *claimed); typedef void (*mpo_vnode_execve_transition_t)(struct ucred *old, struct ucred *new, struct vnode *vp, @@ -840,6 +841,106 @@ mpo_sysv_sem_check_semctl_t mpo_sysv_sem_check_semctl; mpo_sysv_sem_check_semget_t mpo_sysv_sem_check_semget; mpo_sysv_sem_check_semop_t mpo_sysv_sem_check_semop; + + mpo_sysv_shm_init_label_t mpo_sysv_shm_init_label; + mpo_sysv_shm_destroy_label_t mpo_sysv_shm_destroy_label; + mpo_sysv_shm_cleanup_t mpo_sysv_shm_cleanup; + mpo_sysv_shm_create_t mpo_sysv_shm_create; + mpo_sysv_shm_check_shmat_t mpo_sysv_shm_check_shmat; + mpo_sysv_shm_check_shmctl_t mpo_sysv_shm_check_shmctl; + mpo_sysv_shm_check_shmdt_t mpo_sysv_shm_check_shmdt; + mpo_sysv_shm_check_shmget_t mpo_sysv_shm_check_shmget; + + /* + * XXXRW: Further naming consistency work is desirable here. Might + * be best if the "peer" label were at the protocol layer. + */ + mpo_socket_init_label_t mpo_socket_init_label; + mpo_socket_init_peer_label_t mpo_socket_init_peer_label; + mpo_socket_destroy_label_t mpo_socket_destroy_label; + mpo_socket_destroy_peer_label_t mpo_socket_destroy_peer_label; + mpo_socket_copy_label_t mpo_socket_copy_label; + mpo_socket_externalize_label_t mpo_socket_externalize_label; + mpo_socket_externalize_peer_label_t mpo_socket_externalize_peer_label; + mpo_socket_internalize_label_t mpo_socket_internalize_label; + mpo_socket_create_t mpo_socket_create; + mpo_socket_create_from_socket_t mpo_socket_create_from_socket; + mpo_socket_relabel_t mpo_socket_relabel; + mpo_socket_set_peer_from_socket_t mpo_socket_set_peer_from_socket; + mpo_socket_create_mbuf_t mpo_socket_create_mbuf; + mpo_socket_set_peer_from_mbuf_t mpo_socket_set_peer_from_mbuf; + mpo_socket_check_accept_t mpo_socket_check_accept; + mpo_socket_check_bind_t mpo_socket_check_bind; + mpo_socket_check_connect_t mpo_socket_check_connect; + mpo_socket_check_create_t mpo_socket_check_create; + mpo_socket_check_deliver_t mpo_socket_check_deliver; + mpo_socket_check_listen_t mpo_socket_check_listen; + mpo_socket_check_poll_t mpo_socket_check_poll; + mpo_socket_check_receive_t mpo_socket_check_receive; + mpo_socket_check_relabel_t mpo_socket_check_relabel; + mpo_socket_check_send_t mpo_socket_check_send; + mpo_socket_check_stat_t mpo_socket_check_stat; + mpo_socket_check_visible_t mpo_socket_check_visible; + + mpo_system_check_ioperm_t mpo_system_check_ioperm; + mpo_system_check_acct_t mpo_system_check_acct; + mpo_system_check_nfsd_t mpo_system_check_nfsd; + mpo_system_check_reboot_t mpo_system_check_reboot; + mpo_system_check_settime_t mpo_system_check_settime; + mpo_system_check_swapon_t mpo_system_check_swapon; + mpo_system_check_swapoff_t mpo_system_check_swapoff; + mpo_system_check_sysctl_t mpo_system_check_sysctl; + + /* + * XXXRW: Some further name-munging desirable here. Perhaps delete + * should be unlink? Resort. + */ + mpo_vnode_init_label_t mpo_vnode_init_label; + mpo_vnode_destroy_label_t mpo_vnode_destroy_label; + mpo_vnode_associate_extattr_t mpo_vnode_associate_extattr; + mpo_vnode_associate_singlelabel_t mpo_vnode_associate_singlelabel; + mpo_vnode_create_extattr_t mpo_vnode_create_extattr; + mpo_vnode_create_mount_t mpo_vnode_create_mount; + mpo_vnode_relabel_t mpo_vnode_relabel; + mpo_vnode_setlabel_extattr_t mpo_vnode_setlabel_extattr; + mpo_vnode_copy_label_t mpo_vnode_copy_label; + mpo_vnode_externalize_label_t mpo_vnode_externalize_label; + mpo_vnode_internalize_label_t mpo_vnode_internalize_label; + mpo_vnode_execve_transition_t mpo_vnode_execve_transition; + mpo_vnode_execve_will_transition_t mpo_vnode_execve_will_transition; + mpo_vnode_check_access_t mpo_vnode_check_access; + mpo_check_vnode_chdir_t mpo_check_vnode_chdir; + mpo_check_vnode_chroot_t mpo_check_vnode_chroot; + mpo_vnode_check_create_t mpo_vnode_check_create; + mpo_vnode_check_delete_t mpo_vnode_check_delete; + mpo_vnode_check_deleteacl_t mpo_vnode_check_deleteacl; + mpo_vnode_check_deleteextattr_t mpo_vnode_check_deleteextattr; + mpo_vnode_check_exec_t mpo_vnode_check_exec; + mpo_vnode_check_getacl_t mpo_vnode_check_getacl; + mpo_vnode_check_getextattr_t mpo_vnode_check_getextattr; + mpo_vnode_check_link_t mpo_vnode_check_link; + mpo_vnode_check_listextattr_t mpo_vnode_check_listextattr; + mpo_vnode_check_lookup_t mpo_vnode_check_lookup; + mpo_vnode_check_mmap_t mpo_vnode_check_mmap; + mpo_vnode_check_mmap_downgrade_t mpo_vnode_check_mmap_downgrade; + mpo_vnode_check_mprotect_t mpo_vnode_check_mprotect; + mpo_vnode_check_open_t mpo_vnode_check_open; + mpo_vnode_check_poll_t mpo_vnode_check_poll; + mpo_vnode_check_read_t mpo_vnode_check_read; + mpo_vnode_check_readdir_t mpo_vnode_check_readdir; + mpo_vnode_check_readlink_t mpo_vnode_check_readlink; + mpo_vnode_check_relabel_t mpo_vnode_check_relabel; + mpo_vnode_check_rename_from_t mpo_vnode_check_rename_from; + mpo_vnode_check_rename_to_t mpo_vnode_check_rename_to; + mpo_vnode_check_revoke_t mpo_vnode_check_revoke; + mpo_vnode_check_setacl_t mpo_vnode_check_setacl; + mpo_vnode_check_setextattr_t mpo_vnode_check_setextattr; + mpo_vnode_check_setflags_t mpo_vnode_check_setflags; + mpo_vnode_check_setmode_t mpo_vnode_check_setmode; + mpo_vnode_check_setowner_t mpo_vnode_check_setowner; + mpo_vnode_check_setutimes_t mpo_vnode_check_setutimes; + mpo_vnode_check_stat_t mpo_vnode_check_stat; + mpo_vnode_check_write_t mpo_vnode_check_write; }; /* From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 09:02:11 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D5D1216A524 for ; Thu, 6 Jul 2006 09:02:11 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5248543D49 for ; Thu, 6 Jul 2006 09:02:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BC60E46D0F for ; Thu, 6 Jul 2006 05:02:10 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B6B8D558AE; Thu, 6 Jul 2006 09:01:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A73FB16A4EB; Thu, 6 Jul 2006 09:01:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8071E16A4E9 for ; Thu, 6 Jul 2006 09:01:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33D9D43D45 for ; Thu, 6 Jul 2006 09:01:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k669185u053704 for ; Thu, 6 Jul 2006 09:01:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66917CH053701 for perforce@freebsd.org; Thu, 6 Jul 2006 09:01:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 09:01:07 GMT Message-Id: <200607060901.k66917CH053701@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 100704 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 09:02:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=100704 Change 100704 by rwatson@rwatson_zoo on 2006/07/06 09:00:54 Integrate mac.h to mac_framework.h, first step in separating user include file from the kernel API. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#1 branch Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 09:07:41 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 24D7D16A4E0 for ; Thu, 6 Jul 2006 09:07:41 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC0A543D66 for ; Thu, 6 Jul 2006 09:07:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CD49946D0F for ; Thu, 6 Jul 2006 05:07:28 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0789D5B37B; Thu, 6 Jul 2006 09:05:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EC54616A4E0; Thu, 6 Jul 2006 09:05:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ADDFD16A4DA for ; Thu, 6 Jul 2006 09:05:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04BE643D46 for ; Thu, 6 Jul 2006 09:05:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6695DMZ055105 for ; Thu, 6 Jul 2006 09:05:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6695D1M055102 for perforce@freebsd.org; Thu, 6 Jul 2006 09:05:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 09:05:13 GMT Message-Id: <200607060905.k6695D1M055102@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 100705 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 09:07:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=100705 Change 100705 by rwatson@rwatson_zoo on 2006/07/06 09:04:45 Make mac.h the user space API, and mac_framework.h the kernel API. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac.h#2 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -38,7 +38,7 @@ * $FreeBSD: src/sys/sys/mac.h,v 1.70 2006/04/06 23:33:11 csjp Exp $ */ /* - * Userland/kernel interface for Mandatory Access Control. + * Userland interface for Mandatory Access Control. * * The POSIX.1e implementation page may be reached at: * http://www.trustedbsd.org/ @@ -68,8 +68,6 @@ typedef struct mac *mac_t; -#ifndef _KERNEL - /* * Location of the userland MAC framework configuration file. mac.conf * binds policy names to shared libraries that understand those policies, @@ -105,372 +103,4 @@ int mac_to_text(mac_t mac, char **_text); __END_DECLS -#else /* _KERNEL */ - -/* - * Kernel functions to manage and evaluate labels. - */ -struct bpf_d; -struct cdev; -struct componentname; -struct devfs_dirent; -struct ifnet; -struct ifreq; -struct inpcb; -struct image_params; -struct inpcb; -struct ipq; -struct ksem; -struct m_tag; -struct mbuf; -struct mount; -struct msg; -struct msqid_kernel; -struct proc; -struct semid_kernel; -struct shmid_kernel; -struct sockaddr; -struct socket; -struct sysctl_oid; -struct sysctl_req; -struct pipepair; -struct thread; -struct timespec; -struct ucred; -struct uio; -struct vattr; -struct vnode; - -#include /* XXX acl_type_t */ - -struct vop_setlabel_args; - -/* - * Label operations. - */ -void mac_init_bpfdesc(struct bpf_d *); -void mac_init_cred(struct ucred *); -void mac_init_devfsdirent(struct devfs_dirent *); -void mac_init_ifnet(struct ifnet *); -int mac_init_inpcb(struct inpcb *, int flag); -void mac_init_sysv_msgmsg(struct msg *); -void mac_init_sysv_msgqueue(struct msqid_kernel*); -void mac_init_sysv_sem(struct semid_kernel*); -void mac_init_sysv_shm(struct shmid_kernel*); -int mac_init_ipq(struct ipq *, int flag); -int mac_init_socket(struct socket *, int flag); -void mac_init_pipe(struct pipepair *); -void mac_init_posix_sem(struct ksem *); -int mac_init_mbuf(struct mbuf *mbuf, int flag); -int mac_init_mbuf_tag(struct m_tag *, int flag); -void mac_init_mount(struct mount *); -void mac_init_proc(struct proc *); -void mac_init_vnode(struct vnode *); -void mac_copy_mbuf(struct mbuf *m_from, struct mbuf *m_to); -void mac_copy_mbuf_tag(struct m_tag *, struct m_tag *); -void mac_copy_vnode_label(struct label *, struct label *label); -void mac_destroy_bpfdesc(struct bpf_d *); -void mac_destroy_cred(struct ucred *); -void mac_destroy_devfsdirent(struct devfs_dirent *); -void mac_destroy_ifnet(struct ifnet *); -void mac_destroy_inpcb(struct inpcb *); -void mac_destroy_sysv_msgmsg(struct msg *); -void mac_destroy_sysv_msgqueue(struct msqid_kernel *); -void mac_destroy_sysv_sem(struct semid_kernel *); -void mac_destroy_sysv_shm(struct shmid_kernel *); -void mac_destroy_ipq(struct ipq *); -void mac_destroy_socket(struct socket *); -void mac_destroy_pipe(struct pipepair *); -void mac_destroy_posix_sem(struct ksem *); -void mac_destroy_proc(struct proc *); -void mac_destroy_mbuf_tag(struct m_tag *); -void mac_destroy_mount(struct mount *); -void mac_destroy_vnode(struct vnode *); - -struct label *mac_cred_label_alloc(void); -void mac_cred_label_free(struct label *label); -struct label *mac_vnode_label_alloc(void); -void mac_vnode_label_free(struct label *label); - -/* - * Labeling event operations: file system objects, and things that - * look a lot like file system objects. - */ -void mac_associate_vnode_devfs(struct mount *mp, struct devfs_dirent *de, - struct vnode *vp); -int mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp); -void mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp); -void mac_create_devfs_device(struct ucred *cred, struct mount *mp, - struct cdev *dev, struct devfs_dirent *de); -void mac_create_devfs_directory(struct mount *mp, char *dirname, - int dirnamelen, struct devfs_dirent *de); -void mac_create_devfs_symlink(struct ucred *cred, struct mount *mp, - struct devfs_dirent *dd, struct devfs_dirent *de); -int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, - struct vnode *dvp, struct vnode *vp, struct componentname *cnp); -void mac_create_mount(struct ucred *cred, struct mount *mp); -void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, - struct label *newlabel); -void mac_update_devfsdirent(struct mount *mp, struct devfs_dirent *de, - struct vnode *vp); - -/* - * Labeling event operations: IPC objects. - */ -void mac_create_mbuf_from_socket(struct socket *so, struct mbuf *m); -void mac_create_socket(struct ucred *cred, struct socket *socket); -void mac_create_socket_from_socket(struct socket *oldsocket, - struct socket *newsocket); -void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, - struct socket *socket); -void mac_set_socket_peer_from_socket(struct socket *oldsocket, - struct socket *newsocket); -void mac_create_pipe(struct ucred *cred, struct pipepair *pp); - -/* - * Labeling event operations: System V IPC primitives - */ -void mac_create_sysv_msgmsg(struct ucred *cred, - struct msqid_kernel *msqkptr, struct msg *msgptr); -void mac_create_sysv_msgqueue(struct ucred *cred, - struct msqid_kernel *msqkptr); -void mac_create_sysv_sem(struct ucred *cred, - struct semid_kernel *semakptr); -void mac_create_sysv_shm(struct ucred *cred, - struct shmid_kernel *shmsegptr); - -/* - * Labeling event operations: POSIX (global/inter-process) semaphores. - */ -void mac_create_posix_sem(struct ucred *cred, struct ksem *ksemptr); - - -/* - * Labeling event operations: network objects. - */ -void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d); -void mac_create_ifnet(struct ifnet *ifp); -void mac_create_inpcb_from_socket(struct socket *so, struct inpcb *inp); -void mac_create_ipq(struct mbuf *fragment, struct ipq *ipq); -void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram); -void mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment); -void mac_create_mbuf_from_inpcb(struct inpcb *inp, struct mbuf *m); -void mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *m); -void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); -void mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m); -void mac_create_mbuf_multicast_encap(struct mbuf *oldmbuf, - struct ifnet *ifnet, struct mbuf *newmbuf); -void mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf); -int mac_fragment_match(struct mbuf *fragment, struct ipq *ipq); -void mac_reflect_mbuf_icmp(struct mbuf *m); -void mac_reflect_mbuf_tcp(struct mbuf *m); -void mac_update_ipq(struct mbuf *fragment, struct ipq *ipq); -void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp); - -/* - * Labeling event operations: processes. - */ -void mac_copy_cred(struct ucred *cr1, struct ucred *cr2); -int mac_execve_enter(struct image_params *imgp, struct mac *mac_p); -void mac_execve_exit(struct image_params *imgp); -void mac_execve_transition(struct ucred *old, struct ucred *new, - struct vnode *vp, struct label *interpvnodelabel, - struct image_params *imgp); -int mac_execve_will_transition(struct ucred *old, struct vnode *vp, - struct label *interpvnodelabel, struct image_params *imgp); -void mac_create_proc0(struct ucred *cred); -void mac_create_proc1(struct ucred *cred); -void mac_thread_userret(struct thread *td); - -/* - * Label cleanup operation: This is the inverse complement for the - * mac_create and associate type of hooks. This hook lets the policy - * module(s) perform a cleanup/flushing operation on the label - * associated with the objects, without freeing up the space allocated. - * This hook is useful in cases where it is desirable to remove any - * labeling reference when recycling any object to a pool. This hook - * does not replace the mac_destroy hooks. - */ -void mac_cleanup_sysv_msgmsg(struct msg *msgptr); -void mac_cleanup_sysv_msgqueue(struct msqid_kernel *msqkptr); -void mac_cleanup_sysv_sem(struct semid_kernel *semakptr); -void mac_cleanup_sysv_shm(struct shmid_kernel *shmsegptr); - -/* Access control checks. */ -int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); -int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); -int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); -int mac_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m); -int mac_check_sysv_msgmsq(struct ucred *cred, struct msg *msgptr, - struct msqid_kernel *msqkptr); -int mac_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr); -int mac_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr); -int mac_check_sysv_msqget(struct ucred *cred, - struct msqid_kernel *msqkptr); -int mac_check_sysv_msqsnd(struct ucred *cred, - struct msqid_kernel *msqkptr); -int mac_check_sysv_msqrcv(struct ucred *cred, - struct msqid_kernel *msqkptr); -int mac_check_sysv_msqctl(struct ucred *cred, - struct msqid_kernel *msqkptr, int cmd); -int mac_check_sysv_semctl(struct ucred *cred, - struct semid_kernel *semakptr, int cmd); -int mac_check_sysv_semget(struct ucred *cred, - struct semid_kernel *semakptr); -int mac_check_sysv_semop(struct ucred *cred,struct semid_kernel *semakptr, - size_t accesstype); -int mac_check_sysv_shmat(struct ucred *cred, - struct shmid_kernel *shmsegptr, int shmflg); -int mac_check_sysv_shmctl(struct ucred *cred, - struct shmid_kernel *shmsegptr, int cmd); -int mac_check_sysv_shmdt(struct ucred *cred, - struct shmid_kernel *shmsegptr); -int mac_check_sysv_shmget(struct ucred *cred, - struct shmid_kernel *shmsegptr, int shmflg); -int mac_check_kenv_dump(struct ucred *cred); -int mac_check_kenv_get(struct ucred *cred, char *name); -int mac_check_kenv_set(struct ucred *cred, char *name, char *value); -int mac_check_kenv_unset(struct ucred *cred, char *name); -int mac_check_kld_load(struct ucred *cred, struct vnode *vp); -int mac_check_kld_stat(struct ucred *cred); -int mac_check_kld_unload(struct ucred *cred); -int mac_check_mount_stat(struct ucred *cred, struct mount *mp); -int mac_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp, - unsigned long cmd, void *data); -int mac_check_pipe_poll(struct ucred *cred, struct pipepair *pp); -int mac_check_pipe_read(struct ucred *cred, struct pipepair *pp); -int mac_check_pipe_stat(struct ucred *cred, struct pipepair *pp); -int mac_check_pipe_write(struct ucred *cred, struct pipepair *pp); -int mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_getvalue(struct ucred *cred,struct ksem *ksemptr); -int mac_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_unlink(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr); -int mac_check_proc_debug(struct ucred *cred, struct proc *proc); -int mac_check_proc_sched(struct ucred *cred, struct proc *proc); -int mac_check_proc_setuid(struct proc *proc, struct ucred *cred, - uid_t uid); -int mac_check_proc_seteuid(struct proc *proc, struct ucred *cred, - uid_t euid); -int mac_check_proc_setgid(struct proc *proc, struct ucred *cred, - gid_t gid); -int mac_check_proc_setegid(struct proc *proc, struct ucred *cred, - gid_t egid); -int mac_check_proc_setgroups(struct proc *proc, struct ucred *cred, - int ngroups, gid_t *gidset); -int mac_check_proc_setreuid(struct proc *proc, struct ucred *cred, - uid_t ruid, uid_t euid); -int mac_check_proc_setregid(struct proc *proc, struct ucred *cred, - gid_t rgid, gid_t egid); -int mac_check_proc_setresuid(struct proc *proc, struct ucred *cred, - uid_t ruid, uid_t euid, uid_t suid); -int mac_check_proc_setresgid(struct proc *proc, struct ucred *cred, - gid_t rgid, gid_t egid, gid_t sgid); -int mac_check_proc_signal(struct ucred *cred, struct proc *proc, - int signum); -int mac_check_proc_wait(struct ucred *cred, struct proc *proc); -int mac_check_socket_accept(struct ucred *cred, struct socket *so); -int mac_check_socket_bind(struct ucred *cred, struct socket *so, - struct sockaddr *sockaddr); -int mac_check_socket_connect(struct ucred *cred, struct socket *so, - struct sockaddr *sockaddr); -int mac_check_socket_create(struct ucred *cred, int domain, int type, - int protocol); -int mac_check_socket_deliver(struct socket *so, struct mbuf *m); -int mac_check_socket_listen(struct ucred *cred, struct socket *so); -int mac_check_socket_poll(struct ucred *cred, struct socket *so); -int mac_check_socket_receive(struct ucred *cred, struct socket *so); -int mac_check_socket_send(struct ucred *cred, struct socket *so); -int mac_check_socket_stat(struct ucred *cred, struct socket *so); -int mac_check_socket_visible(struct ucred *cred, struct socket *so); -int mac_check_sysarch_ioperm(struct ucred *cred); -int mac_check_system_acct(struct ucred *cred, struct vnode *vp); -int mac_check_system_nfsd(struct ucred *cred); -int mac_check_system_reboot(struct ucred *cred, int howto); -int mac_check_system_settime(struct ucred *cred); -int mac_check_system_swapon(struct ucred *cred, struct vnode *vp); -int mac_check_system_swapoff(struct ucred *cred, struct vnode *vp); -int mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, - void *arg1, int arg2, struct sysctl_req *req); -int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, - int acc_mode); -int mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp); -int mac_check_vnode_chroot(struct ucred *cred, struct vnode *dvp); -int mac_check_vnode_create(struct ucred *cred, struct vnode *dvp, - struct componentname *cnp, struct vattr *vap); -int mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, struct componentname *cnp); -int mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, - acl_type_t type); -int mac_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, - int attrnamespace, const char *name); -int mac_check_vnode_exec(struct ucred *cred, struct vnode *vp, - struct image_params *imgp); -int mac_check_vnode_getacl(struct ucred *cred, struct vnode *vp, - acl_type_t type); -int mac_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, - int attrnamespace, const char *name, struct uio *uio); -int mac_check_vnode_link(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, struct componentname *cnp); -int mac_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, - int attrnamespace); -int mac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, - struct componentname *cnp); -int mac_check_vnode_mmap(struct ucred *cred, struct vnode *vp, - int prot, int flags); -int mac_check_vnode_mprotect(struct ucred *cred, struct vnode *vp, - int prot); -int mac_check_vnode_open(struct ucred *cred, struct vnode *vp, - int acc_mode); -int mac_check_vnode_poll(struct ucred *active_cred, - struct ucred *file_cred, struct vnode *vp); -int mac_check_vnode_read(struct ucred *active_cred, - struct ucred *file_cred, struct vnode *vp); -int mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp); -int mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp); -int mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, struct componentname *cnp); -int mac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, int samedir, struct componentname *cnp); -int mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp); -int mac_check_vnode_setacl(struct ucred *cred, struct vnode *vp, - acl_type_t type, struct acl *acl); -int mac_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, - int attrnamespace, const char *name, struct uio *uio); -int mac_check_vnode_setflags(struct ucred *cred, struct vnode *vp, - u_long flags); -int mac_check_vnode_setmode(struct ucred *cred, struct vnode *vp, - mode_t mode); -int mac_check_vnode_setowner(struct ucred *cred, struct vnode *vp, - uid_t uid, gid_t gid); -int mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, - struct timespec atime, struct timespec mtime); -int mac_check_vnode_stat(struct ucred *active_cred, - struct ucred *file_cred, struct vnode *vp); -int mac_check_vnode_write(struct ucred *active_cred, - struct ucred *file_cred, struct vnode *vp); -int mac_getsockopt_label(struct ucred *cred, struct socket *so, - struct mac *extmac); -int mac_getsockopt_peerlabel(struct ucred *cred, struct socket *so, - struct mac *extmac); -int mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr, - struct ifnet *ifnet); -int mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, - struct ifnet *ifnet); -int mac_setsockopt_label(struct ucred *cred, struct socket *so, - struct mac *extmac); -int mac_pipe_label_set(struct ucred *cred, struct pipepair *pp, - struct label *label); -void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); -void mac_associate_nfsd_label(struct ucred *cred); - -/* - * Calls to help various file systems implement labeling functionality - * using their existing EA implementation. - */ -int vop_stdsetlabel_ea(struct vop_setlabel_args *ap); - -#endif /* !_KERNEL */ - #endif /* !_SYS_MAC_H_ */ ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -38,78 +38,19 @@ * $FreeBSD: src/sys/sys/mac.h,v 1.70 2006/04/06 23:33:11 csjp Exp $ */ /* - * Userland/kernel interface for Mandatory Access Control. - * - * The POSIX.1e implementation page may be reached at: - * http://www.trustedbsd.org/ + * Kernel interface for Mandatory Access Control -- how kernel services + * interact with the TrustedBSD MAC Framework. */ -#ifndef _SYS_MAC_H_ -#define _SYS_MAC_H_ +#ifndef _SYS_MAC_FRAMEWORK_H_ +#define _SYS_MAC_FRAMEWORK_H_ -#include - -#ifndef _POSIX_MAC -#define _POSIX_MAC +#ifndef _KERNEL +#error "no user-serviceable parts inside" #endif -/* - * MAC framework-related constants and limits. - */ -#define MAC_MAX_POLICY_NAME 32 -#define MAC_MAX_LABEL_ELEMENT_NAME 32 -#define MAC_MAX_LABEL_ELEMENT_DATA 4096 -#define MAC_MAX_LABEL_BUF_LEN 8192 - -struct mac { - size_t m_buflen; - char *m_string; -}; - -typedef struct mac *mac_t; +#include -#ifndef _KERNEL - -/* - * Location of the userland MAC framework configuration file. mac.conf - * binds policy names to shared libraries that understand those policies, - * as well as setting defaults for MAC-aware applications. - */ -#define MAC_CONFFILE "/etc/mac.conf" - -/* - * Extended non-POSIX.1e interfaces that offer additional services - * available from the userland and kernel MAC frameworks. - */ -__BEGIN_DECLS -int mac_execve(char *fname, char **argv, char **envv, mac_t _label); -int mac_free(mac_t _label); -int mac_from_text(mac_t *_label, const char *_text); -int mac_get_fd(int _fd, mac_t _label); -int mac_get_file(const char *_path, mac_t _label); -int mac_get_link(const char *_path, mac_t _label); -int mac_get_peer(int _fd, mac_t _label); -int mac_get_pid(pid_t _pid, mac_t _label); -int mac_get_proc(mac_t _label); -int mac_is_present(const char *_policyname); -int mac_prepare(mac_t *_label, const char *_elements); -int mac_prepare_file_label(mac_t *_label); -int mac_prepare_ifnet_label(mac_t *_label); -int mac_prepare_process_label(mac_t *_label); -int mac_prepare_type(mac_t *_label, const char *_type); -int mac_set_fd(int _fildes, const mac_t _label); -int mac_set_file(const char *_path, mac_t _label); -int mac_set_link(const char *_path, mac_t _label); -int mac_set_proc(const mac_t _label); -int mac_syscall(const char *_policyname, int _call, void *_arg); -int mac_to_text(mac_t mac, char **_text); -__END_DECLS - -#else /* _KERNEL */ - -/* - * Kernel functions to manage and evaluate labels. - */ struct bpf_d; struct cdev; struct componentname; @@ -122,6 +63,7 @@ struct ipq; struct ksem; struct m_tag; +struct mac; struct mbuf; struct mount; struct msg; @@ -140,10 +82,13 @@ struct uio; struct vattr; struct vnode; +struct vop_setlabel_args; #include /* XXX acl_type_t */ -struct vop_setlabel_args; +/* + * Kernel functions to manage and evaluate labels. + */ /* * Label operations. @@ -471,6 +416,4 @@ */ int vop_stdsetlabel_ea(struct vop_setlabel_args *ap); -#endif /* !_KERNEL */ - -#endif /* !_SYS_MAC_H_ */ +#endif /* !_SYS_MAC_FRAMEWORK_H_ */ From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 09:16:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD2DC16A4DE for ; Thu, 6 Jul 2006 09:16:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F063043D62 for ; Thu, 6 Jul 2006 09:16:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2CF4746D1F for ; Thu, 6 Jul 2006 05:16:32 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C84275C455; Thu, 6 Jul 2006 09:15:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B914416A4E9; Thu, 6 Jul 2006 09:15:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 789BB16A4E8 for ; Thu, 6 Jul 2006 09:15:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F3DC43D45 for ; Thu, 6 Jul 2006 09:15:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k669FR0S055797 for ; Thu, 6 Jul 2006 09:15:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k669FQTN055794 for perforce@freebsd.org; Thu, 6 Jul 2006 09:15:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 09:15:26 GMT Message-Id: <200607060915.k669FQTN055794@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 100706 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 09:16:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=100706 Change 100706 by rwatson@rwatson_zoo on 2006/07/06 09:15:04 Fix spelling of mpo_mount_create(). Resort by prefix rather than structure name for Sys V IPC. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#10 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#10 (text+ko) ==== @@ -317,41 +317,9 @@ typedef void (*mpo_mount_fs_destroy_label_t)(struct label *label); typedef int (*mpo_mount_check_stat_t)(struct ucred *cred, struct mount *mp, struct label *mntlabel); - -/* - * Object: struct msqid_kernel (System V message queue) - */ -typedef void (*mpo_sysv_msgqueue_init_label_t)(struct label *label); -typedef void (*mpo_sysv_msgqueue_destroy_t)(struct label *label); -typedef void (*mpo_sysv_msgqueue_cleanup_t)(struct label *msqlabel); -typedef void (*mpo_sysv_msgqueue_create_msg_t)(struct ucred *cred, - struct msqid_kernel *msqkptr, struct label *msqlabel, - struct msg *msgptr, struct label *msglabel); -typedef void (*mpo_sysv_msgqueue_create_t)(struct ucred *cred, - struct msqid_kernel *msqkptr, struct label *msqlabel); - -typedef int (*mpo_sysv_msgqueue_check_msgmsq_t)(struct ucred *cred, - struct msg *msgptr, struct label *msglabel, - struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msgrcv_t)(struct ucred *cred, - struct msg *msgptr, struct label *msglabel); -typedef int (*mpo_sysv_msgqueue_check_msgrmid_t)(struct ucred *cred, - struct msg *msgptr, struct label *msglabel); -typedef int (*mpo_sysv_msgqueue_check_msqget_t)(struct ucred *cred, - struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msqsnd_t)(struct ucred *cred, - struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msqrcv_t)(struct ucred *cred, - struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msqctl_t)(struct ucred *cred, - struct msqid_kernel *msqkptr, struct label *msqklabel, - int cmd); -/* - * Object: struct msg (System V message) - */ -typedef void (*mpo_sysv_msg_init_label_t)(struct label *label); -typedef void (*mpo_sysv_msg_destroy_label_t)(struct label *label); -typedef void (*mpo_sysv_msg_cleanup_t)(struct label *msglabel); +typedef void (*mpo_mount_create_t)(struct ucred *cred, + struct mount *mp, struct label *mntlabel, + struct label *fslabel); /* * Object: struct pipepair (Pipe) @@ -416,6 +384,41 @@ typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); /* + * Object: struct msqid_kernel (System V message queue) + */ +typedef void (*mpo_sysv_msgqueue_init_label_t)(struct label *label); +typedef void (*mpo_sysv_msgqueue_destroy_t)(struct label *label); +typedef void (*mpo_sysv_msgqueue_cleanup_t)(struct label *msqlabel); +typedef void (*mpo_sysv_msgqueue_create_msg_t)(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqlabel, + struct msg *msgptr, struct label *msglabel); +typedef void (*mpo_sysv_msgqueue_create_t)(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqlabel); + +typedef int (*mpo_sysv_msgqueue_check_msgmsq_t)(struct ucred *cred, + struct msg *msgptr, struct label *msglabel, + struct msqid_kernel *msqkptr, struct label *msqklabel); +typedef int (*mpo_sysv_msgqueue_check_msgrcv_t)(struct ucred *cred, + struct msg *msgptr, struct label *msglabel); +typedef int (*mpo_sysv_msgqueue_check_msgrmid_t)(struct ucred *cred, + struct msg *msgptr, struct label *msglabel); +typedef int (*mpo_sysv_msgqueue_check_msqget_t)(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqklabel); +typedef int (*mpo_sysv_msgqueue_check_msqsnd_t)(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqklabel); +typedef int (*mpo_sysv_msgqueue_check_msqrcv_t)(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqklabel); +typedef int (*mpo_sysv_msgqueue_check_msqctl_t)(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqklabel, + int cmd); +/* + * Object: struct msg (System V message) + */ +typedef void (*mpo_sysv_msg_init_label_t)(struct label *label); +typedef void (*mpo_sysv_msg_destroy_label_t)(struct label *label); +typedef void (*mpo_sysv_msg_cleanup_t)(struct label *msglabel); + +/* * Object: struct semid_kernel (System V IPC semaphore) */ typedef void (*mpo_sysv_sem_init_label_t)(struct label *label); @@ -547,9 +550,6 @@ struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp); -typedef void (*mpo_vnode_create_mount_t)(struct ucred *cred, - struct mount *mp, struct label *mntlabel, - struct label *fslabel); typedef void (*mpo_vnode_relabel_t)(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label); typedef int (*mpo_vnode_setlabel_extattr_t)(struct ucred *cred, @@ -776,27 +776,7 @@ mpo_mount_destroy_label_t mpo_mount_destroy_label; mpo_mount_fs_destroy_label_t mpo_mount_fs_destroy_label; mpo_mount_check_stat_t mpo_mount_check_stat; - - /* - * XXXRW: These names are a bit awkard. Perhaps sysv_msq to match - * conventional usage? - */ - mpo_sysv_msgqueue_init_label_t mpo_sysv_msgqueue_init_label; - mpo_sysv_msgqueue_destroy_t mpo_sysv_msgqueue_destroy; - mpo_sysv_msgqueue_cleanup_t mpo_sysv_msgqueue_cleanup; - mpo_sysv_msgqueue_create_msg_t mpo_sysv_msgqueue_create_msg; - mpo_sysv_msgqueue_create_t mpo_sysv_msgqueue_create; - mpo_sysv_msgqueue_check_msgmsq_t mpo_sysv_msgqueue_check_msgmsq; - mpo_sysv_msgqueue_check_msgrcv_t mpo_sysv_msgqueue_check_msgrcv; - mpo_sysv_msgqueue_check_msgrmid_t mpo_sysv_msgqueue_check_msgrmid; - mpo_sysv_msgqueue_check_msqget_t mpo_sysv_msgqueue_check_msqget; - mpo_sysv_msgqueue_check_msqsnd_t mpo_sysv_msgqueue_check_msqsnd; - mpo_sysv_msgqueue_check_msqrcv_t mpo_sysv_msgqueue_check_msqrcv; - mpo_sysv_msgqueue_check_msqctl_t mpo_sysv_msgqueue_check_msqctl; - - mpo_sysv_msg_init_label_t mpo_sysv_msg_init_label; - mpo_sysv_msg_destroy_label_t mpo_sysv_msg_destroy_label; - mpo_sysv_msg_cleanup_t mpo_sysv_msg_cleanup; + mpo_mount_create_t mpo_mount_create; /* * XXXRW: Technically, structure name here is pipepair, not pipe. @@ -834,6 +814,27 @@ mpo_proc_check_signal_t mpo_proc_check_signal; mpo_proc_check_wait_t mpo_proc_check_wait; + /* + * XXXRW: These names are a bit awkard. Perhaps sysv_msq to match + * conventional usage? + */ + mpo_sysv_msgqueue_init_label_t mpo_sysv_msgqueue_init_label; + mpo_sysv_msgqueue_destroy_t mpo_sysv_msgqueue_destroy; + mpo_sysv_msgqueue_cleanup_t mpo_sysv_msgqueue_cleanup; + mpo_sysv_msgqueue_create_msg_t mpo_sysv_msgqueue_create_msg; + mpo_sysv_msgqueue_create_t mpo_sysv_msgqueue_create; + mpo_sysv_msgqueue_check_msgmsq_t mpo_sysv_msgqueue_check_msgmsq; + mpo_sysv_msgqueue_check_msgrcv_t mpo_sysv_msgqueue_check_msgrcv; + mpo_sysv_msgqueue_check_msgrmid_t mpo_sysv_msgqueue_check_msgrmid; + mpo_sysv_msgqueue_check_msqget_t mpo_sysv_msgqueue_check_msqget; + mpo_sysv_msgqueue_check_msqsnd_t mpo_sysv_msgqueue_check_msqsnd; + mpo_sysv_msgqueue_check_msqrcv_t mpo_sysv_msgqueue_check_msqrcv; + mpo_sysv_msgqueue_check_msqctl_t mpo_sysv_msgqueue_check_msqctl; + + mpo_sysv_msg_init_label_t mpo_sysv_msg_init_label; + mpo_sysv_msg_destroy_label_t mpo_sysv_msg_destroy_label; + mpo_sysv_msg_cleanup_t mpo_sysv_msg_cleanup; + mpo_sysv_sem_init_label_t mpo_sysv_sem_init_label; mpo_sysv_sem_destroy_label_t mpo_sysv_sem_destroy_label; mpo_sysv_sem_cleanup_t mpo_sysv_sem_cleanup; @@ -900,7 +901,6 @@ mpo_vnode_associate_extattr_t mpo_vnode_associate_extattr; mpo_vnode_associate_singlelabel_t mpo_vnode_associate_singlelabel; mpo_vnode_create_extattr_t mpo_vnode_create_extattr; - mpo_vnode_create_mount_t mpo_vnode_create_mount; mpo_vnode_relabel_t mpo_vnode_relabel; mpo_vnode_setlabel_extattr_t mpo_vnode_setlabel_extattr; mpo_vnode_copy_label_t mpo_vnode_copy_label; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 09:54:22 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BE5016A4DE for ; Thu, 6 Jul 2006 09:54:22 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 624C243D45 for ; Thu, 6 Jul 2006 09:54:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E2E2946CF2 for ; Thu, 6 Jul 2006 05:54:18 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 604E3557AA; Thu, 6 Jul 2006 09:54:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 51EA316A4E2; Thu, 6 Jul 2006 09:54:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 13F8916A4DF for ; Thu, 6 Jul 2006 09:54:18 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1E9943D45 for ; Thu, 6 Jul 2006 09:54:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k669sHdo058691 for ; Thu, 6 Jul 2006 09:54:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k669sHXw058688 for perforce@freebsd.org; Thu, 6 Jul 2006 09:54:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 09:54:17 GMT Message-Id: <200607060954.k669sHXw058688@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 100708 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 09:54:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=100708 Change 100708 by rwatson@rwatson_zoo on 2006/07/06 09:54:10 Resort. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#3 (text+ko) ==== @@ -90,208 +90,110 @@ * Kernel functions to manage and evaluate labels. */ -/* - * Label operations. - */ void mac_init_bpfdesc(struct bpf_d *); -void mac_init_cred(struct ucred *); +void mac_destroy_bpfdesc(struct bpf_d *); +void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d); +void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); +int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); + void mac_init_devfsdirent(struct devfs_dirent *); -void mac_init_ifnet(struct ifnet *); -int mac_init_inpcb(struct inpcb *, int flag); -void mac_init_sysv_msgmsg(struct msg *); -void mac_init_sysv_msgqueue(struct msqid_kernel*); -void mac_init_sysv_sem(struct semid_kernel*); -void mac_init_sysv_shm(struct shmid_kernel*); -int mac_init_ipq(struct ipq *, int flag); -int mac_init_socket(struct socket *, int flag); -void mac_init_pipe(struct pipepair *); -void mac_init_posix_sem(struct ksem *); -int mac_init_mbuf(struct mbuf *mbuf, int flag); -int mac_init_mbuf_tag(struct m_tag *, int flag); -void mac_init_mount(struct mount *); -void mac_init_proc(struct proc *); -void mac_init_vnode(struct vnode *); -void mac_copy_mbuf(struct mbuf *m_from, struct mbuf *m_to); -void mac_copy_mbuf_tag(struct m_tag *, struct m_tag *); -void mac_copy_vnode_label(struct label *, struct label *label); -void mac_destroy_bpfdesc(struct bpf_d *); -void mac_destroy_cred(struct ucred *); void mac_destroy_devfsdirent(struct devfs_dirent *); -void mac_destroy_ifnet(struct ifnet *); -void mac_destroy_inpcb(struct inpcb *); -void mac_destroy_sysv_msgmsg(struct msg *); -void mac_destroy_sysv_msgqueue(struct msqid_kernel *); -void mac_destroy_sysv_sem(struct semid_kernel *); -void mac_destroy_sysv_shm(struct shmid_kernel *); -void mac_destroy_ipq(struct ipq *); -void mac_destroy_socket(struct socket *); -void mac_destroy_pipe(struct pipepair *); -void mac_destroy_posix_sem(struct ksem *); -void mac_destroy_proc(struct proc *); -void mac_destroy_mbuf_tag(struct m_tag *); -void mac_destroy_mount(struct mount *); -void mac_destroy_vnode(struct vnode *); - -struct label *mac_cred_label_alloc(void); -void mac_cred_label_free(struct label *label); -struct label *mac_vnode_label_alloc(void); -void mac_vnode_label_free(struct label *label); - -/* - * Labeling event operations: file system objects, and things that - * look a lot like file system objects. - */ void mac_associate_vnode_devfs(struct mount *mp, struct devfs_dirent *de, struct vnode *vp); -int mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp); -void mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp); void mac_create_devfs_device(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *de); void mac_create_devfs_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *de); void mac_create_devfs_symlink(struct ucred *cred, struct mount *mp, struct devfs_dirent *dd, struct devfs_dirent *de); -int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, - struct vnode *dvp, struct vnode *vp, struct componentname *cnp); -void mac_create_mount(struct ucred *cred, struct mount *mp); -void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, - struct label *newlabel); void mac_update_devfsdirent(struct mount *mp, struct devfs_dirent *de, struct vnode *vp); -/* - * Labeling event operations: IPC objects. - */ -void mac_create_mbuf_from_socket(struct socket *so, struct mbuf *m); -void mac_create_socket(struct ucred *cred, struct socket *socket); -void mac_create_socket_from_socket(struct socket *oldsocket, - struct socket *newsocket); -void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, - struct socket *socket); -void mac_set_socket_peer_from_socket(struct socket *oldsocket, - struct socket *newsocket); -void mac_create_pipe(struct ucred *cred, struct pipepair *pp); +void mac_init_cred(struct ucred *); +void mac_destroy_cred(struct ucred *); +void mac_copy_cred(struct ucred *cr1, struct ucred *cr2); +struct label *mac_cred_label_alloc(void); +void mac_cred_label_free(struct label *label); +int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); -/* - * Labeling event operations: System V IPC primitives - */ -void mac_create_sysv_msgmsg(struct ucred *cred, - struct msqid_kernel *msqkptr, struct msg *msgptr); -void mac_create_sysv_msgqueue(struct ucred *cred, - struct msqid_kernel *msqkptr); -void mac_create_sysv_sem(struct ucred *cred, - struct semid_kernel *semakptr); -void mac_create_sysv_shm(struct ucred *cred, - struct shmid_kernel *shmsegptr); - -/* - * Labeling event operations: POSIX (global/inter-process) semaphores. - */ -void mac_create_posix_sem(struct ucred *cred, struct ksem *ksemptr); - - -/* - * Labeling event operations: network objects. - */ -void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d); +void mac_init_ifnet(struct ifnet *); +void mac_destroy_ifnet(struct ifnet *); void mac_create_ifnet(struct ifnet *ifp); -void mac_create_inpcb_from_socket(struct socket *so, struct inpcb *inp); -void mac_create_ipq(struct mbuf *fragment, struct ipq *ipq); -void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram); -void mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment); -void mac_create_mbuf_from_inpcb(struct inpcb *inp, struct mbuf *m); void mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *m); -void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); void mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m); void mac_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct ifnet *ifnet, struct mbuf *newmbuf); -void mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf); +int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); +int mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr, + struct ifnet *ifnet); +int mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, + struct ifnet *ifnet); + +int mac_init_inpcb(struct inpcb *, int flag); +void mac_destroy_inpcb(struct inpcb *); +void mac_create_inpcb_from_socket(struct socket *so, struct inpcb *inp); +void mac_create_mbuf_from_inpcb(struct inpcb *inp, struct mbuf *m); +void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp); +int mac_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m); + +int mac_init_ipq(struct ipq *, int flag); +void mac_destroy_ipq(struct ipq *); +void mac_create_ipq(struct mbuf *fragment, struct ipq *ipq); +void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram); int mac_fragment_match(struct mbuf *fragment, struct ipq *ipq); -void mac_reflect_mbuf_icmp(struct mbuf *m); -void mac_reflect_mbuf_tcp(struct mbuf *m); void mac_update_ipq(struct mbuf *fragment, struct ipq *ipq); -void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp); - -/* - * Labeling event operations: processes. - */ -void mac_copy_cred(struct ucred *cr1, struct ucred *cr2); -int mac_execve_enter(struct image_params *imgp, struct mac *mac_p); -void mac_execve_exit(struct image_params *imgp); -void mac_execve_transition(struct ucred *old, struct ucred *new, - struct vnode *vp, struct label *interpvnodelabel, - struct image_params *imgp); -int mac_execve_will_transition(struct ucred *old, struct vnode *vp, - struct label *interpvnodelabel, struct image_params *imgp); -void mac_create_proc0(struct ucred *cred); -void mac_create_proc1(struct ucred *cred); -void mac_thread_userret(struct thread *td); - -/* - * Label cleanup operation: This is the inverse complement for the - * mac_create and associate type of hooks. This hook lets the policy - * module(s) perform a cleanup/flushing operation on the label - * associated with the objects, without freeing up the space allocated. - * This hook is useful in cases where it is desirable to remove any - * labeling reference when recycling any object to a pool. This hook - * does not replace the mac_destroy hooks. - */ -void mac_cleanup_sysv_msgmsg(struct msg *msgptr); -void mac_cleanup_sysv_msgqueue(struct msqid_kernel *msqkptr); -void mac_cleanup_sysv_sem(struct semid_kernel *semakptr); -void mac_cleanup_sysv_shm(struct shmid_kernel *shmsegptr); -/* Access control checks. */ -int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); -int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); -int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); -int mac_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m); -int mac_check_sysv_msgmsq(struct ucred *cred, struct msg *msgptr, - struct msqid_kernel *msqkptr); -int mac_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr); -int mac_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr); -int mac_check_sysv_msqget(struct ucred *cred, - struct msqid_kernel *msqkptr); -int mac_check_sysv_msqsnd(struct ucred *cred, - struct msqid_kernel *msqkptr); -int mac_check_sysv_msqrcv(struct ucred *cred, - struct msqid_kernel *msqkptr); -int mac_check_sysv_msqctl(struct ucred *cred, - struct msqid_kernel *msqkptr, int cmd); -int mac_check_sysv_semctl(struct ucred *cred, - struct semid_kernel *semakptr, int cmd); -int mac_check_sysv_semget(struct ucred *cred, - struct semid_kernel *semakptr); -int mac_check_sysv_semop(struct ucred *cred,struct semid_kernel *semakptr, - size_t accesstype); -int mac_check_sysv_shmat(struct ucred *cred, - struct shmid_kernel *shmsegptr, int shmflg); -int mac_check_sysv_shmctl(struct ucred *cred, - struct shmid_kernel *shmsegptr, int cmd); -int mac_check_sysv_shmdt(struct ucred *cred, - struct shmid_kernel *shmsegptr); -int mac_check_sysv_shmget(struct ucred *cred, - struct shmid_kernel *shmsegptr, int shmflg); int mac_check_kenv_dump(struct ucred *cred); int mac_check_kenv_get(struct ucred *cred, char *name); int mac_check_kenv_set(struct ucred *cred, char *name, char *value); int mac_check_kenv_unset(struct ucred *cred, char *name); + int mac_check_kld_load(struct ucred *cred, struct vnode *vp); int mac_check_kld_stat(struct ucred *cred); int mac_check_kld_unload(struct ucred *cred); + +void mac_init_posix_sem(struct ksem *); +void mac_destroy_posix_sem(struct ksem *); +void mac_create_posix_sem(struct ucred *cred, struct ksem *ksemptr); +int mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr); +int mac_check_posix_sem_getvalue(struct ucred *cred,struct ksem *ksemptr); +int mac_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr); +int mac_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr); +int mac_check_posix_sem_unlink(struct ucred *cred, struct ksem *ksemptr); +int mac_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr); + +int mac_init_mbuf(struct mbuf *mbuf, int flag); +int mac_init_mbuf_tag(struct m_tag *, int flag); +void mac_copy_mbuf(struct mbuf *m_from, struct mbuf *m_to); +void mac_copy_mbuf_tag(struct m_tag *, struct m_tag *); +void mac_destroy_mbuf_tag(struct m_tag *); +void mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment); +void mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf); +void mac_reflect_mbuf_icmp(struct mbuf *m); +void mac_reflect_mbuf_tcp(struct mbuf *m); + +void mac_init_mount(struct mount *); +void mac_destroy_mount(struct mount *); +void mac_create_mount(struct ucred *cred, struct mount *mp); int mac_check_mount_stat(struct ucred *cred, struct mount *mp); + +void mac_init_pipe(struct pipepair *); +void mac_destroy_pipe(struct pipepair *); +void mac_create_pipe(struct ucred *cred, struct pipepair *pp); int mac_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp, unsigned long cmd, void *data); int mac_check_pipe_poll(struct ucred *cred, struct pipepair *pp); int mac_check_pipe_read(struct ucred *cred, struct pipepair *pp); int mac_check_pipe_stat(struct ucred *cred, struct pipepair *pp); int mac_check_pipe_write(struct ucred *cred, struct pipepair *pp); -int mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_getvalue(struct ucred *cred,struct ksem *ksemptr); -int mac_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_unlink(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr); +int mac_pipe_label_set(struct ucred *cred, struct pipepair *pp, + struct label *label); + +void mac_init_proc(struct proc *); +void mac_destroy_proc(struct proc *); +void mac_create_proc0(struct ucred *cred); +void mac_create_proc1(struct ucred *cred); +void mac_thread_userret(struct thread *td); int mac_check_proc_debug(struct ucred *cred, struct proc *proc); int mac_check_proc_sched(struct ucred *cred, struct proc *proc); int mac_check_proc_setuid(struct proc *proc, struct ucred *cred, @@ -315,6 +217,19 @@ int mac_check_proc_signal(struct ucred *cred, struct proc *proc, int signum); int mac_check_proc_wait(struct ucred *cred, struct proc *proc); +void mac_associate_nfsd_label(struct ucred *cred); +void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); + +int mac_init_socket(struct socket *, int flag); +void mac_destroy_socket(struct socket *); +void mac_create_mbuf_from_socket(struct socket *so, struct mbuf *m); +void mac_create_socket(struct ucred *cred, struct socket *socket); +void mac_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket); +void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, + struct socket *socket); +void mac_set_socket_peer_from_socket(struct socket *oldsocket, + struct socket *newsocket); int mac_check_socket_accept(struct ucred *cred, struct socket *so); int mac_check_socket_bind(struct ucred *cred, struct socket *so, struct sockaddr *sockaddr); @@ -329,6 +244,7 @@ int mac_check_socket_send(struct ucred *cred, struct socket *so); int mac_check_socket_stat(struct ucred *cred, struct socket *so); int mac_check_socket_visible(struct ucred *cred, struct socket *so); + int mac_check_sysarch_ioperm(struct ucred *cred); int mac_check_system_acct(struct ucred *cred, struct vnode *vp); int mac_check_system_nfsd(struct ucred *cred); @@ -338,8 +254,77 @@ int mac_check_system_swapoff(struct ucred *cred, struct vnode *vp); int mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); + int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int acc_mode); +void mac_init_sysv_msgqueue(struct msqid_kernel*); +void mac_destroy_sysv_msgqueue(struct msqid_kernel *); +void mac_cleanup_sysv_msgmsg(struct msg *msgptr); +void mac_cleanup_sysv_msgqueue(struct msqid_kernel *msqkptr); +void mac_create_sysv_msgmsg(struct ucred *cred, + struct msqid_kernel *msqkptr, struct msg *msgptr); +void mac_create_sysv_msgqueue(struct ucred *cred, + struct msqid_kernel *msqkptr); +void mac_init_sysv_msgmsg(struct msg *); +void mac_destroy_sysv_msgmsg(struct msg *); +int mac_check_sysv_msgmsq(struct ucred *cred, struct msg *msgptr, + struct msqid_kernel *msqkptr); +int mac_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr); +int mac_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr); +int mac_check_sysv_msqget(struct ucred *cred, + struct msqid_kernel *msqkptr); +int mac_check_sysv_msqsnd(struct ucred *cred, + struct msqid_kernel *msqkptr); +int mac_check_sysv_msqrcv(struct ucred *cred, + struct msqid_kernel *msqkptr); +int mac_check_sysv_msqctl(struct ucred *cred, + struct msqid_kernel *msqkptr, int cmd); + +void mac_init_sysv_sem(struct semid_kernel*); +void mac_destroy_sysv_sem(struct semid_kernel *); +void mac_create_sysv_sem(struct ucred *cred, + struct semid_kernel *semakptr); +void mac_cleanup_sysv_sem(struct semid_kernel *semakptr); +int mac_check_sysv_semctl(struct ucred *cred, + struct semid_kernel *semakptr, int cmd); +int mac_check_sysv_semget(struct ucred *cred, + struct semid_kernel *semakptr); +int mac_check_sysv_semop(struct ucred *cred,struct semid_kernel *semakptr, + size_t accesstype); + +void mac_init_sysv_shm(struct shmid_kernel*); +void mac_destroy_sysv_shm(struct shmid_kernel *); +void mac_create_sysv_shm(struct ucred *cred, + struct shmid_kernel *shmsegptr); +void mac_cleanup_sysv_shm(struct shmid_kernel *shmsegptr); +int mac_check_sysv_shmat(struct ucred *cred, + struct shmid_kernel *shmsegptr, int shmflg); +int mac_check_sysv_shmctl(struct ucred *cred, + struct shmid_kernel *shmsegptr, int cmd); +int mac_check_sysv_shmdt(struct ucred *cred, + struct shmid_kernel *shmsegptr); +int mac_check_sysv_shmget(struct ucred *cred, + struct shmid_kernel *shmsegptr, int shmflg); + +int mac_execve_enter(struct image_params *imgp, struct mac *mac_p); +void mac_execve_exit(struct image_params *imgp); +void mac_execve_transition(struct ucred *old, struct ucred *new, + struct vnode *vp, struct label *interpvnodelabel, + struct image_params *imgp); +int mac_execve_will_transition(struct ucred *old, struct vnode *vp, + struct label *interpvnodelabel, struct image_params *imgp); + +void mac_init_vnode(struct vnode *); +void mac_copy_vnode_label(struct label *, struct label *label); +void mac_destroy_vnode(struct vnode *); +struct label *mac_vnode_label_alloc(void); +void mac_vnode_label_free(struct label *label); +int mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp); +void mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp); +int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, + struct vnode *dvp, struct vnode *vp, struct componentname *cnp); +void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, + struct label *newlabel); int mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp); int mac_check_vnode_chroot(struct ucred *cred, struct vnode *dvp); int mac_check_vnode_create(struct ucred *cred, struct vnode *dvp, @@ -399,16 +384,8 @@ struct mac *extmac); int mac_getsockopt_peerlabel(struct ucred *cred, struct socket *so, struct mac *extmac); -int mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr, - struct ifnet *ifnet); -int mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, - struct ifnet *ifnet); int mac_setsockopt_label(struct ucred *cred, struct socket *so, struct mac *extmac); -int mac_pipe_label_set(struct ucred *cred, struct pipepair *pp, - struct label *label); -void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); -void mac_associate_nfsd_label(struct ucred *cred); /* * Calls to help various file systems implement labeling functionality From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 10:06:26 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65DB116A4DF for ; Thu, 6 Jul 2006 10:06:26 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FFA643D45 for ; Thu, 6 Jul 2006 10:06:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 97BD346CF7 for ; Thu, 6 Jul 2006 06:06:23 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C7D1657E17; Thu, 6 Jul 2006 10:06:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B8BBA16A4E0; Thu, 6 Jul 2006 10:06:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BB3316A4DA for ; Thu, 6 Jul 2006 10:06:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3BA743D49 for ; Thu, 6 Jul 2006 10:05:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66A5xBV060999 for ; Thu, 6 Jul 2006 10:05:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66A5xfm060996 for perforce@freebsd.org; Thu, 6 Jul 2006 10:05:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 10:05:59 GMT Message-Id: <200607061005.k66A5xfm060996@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 100709 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 10:06:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=100709 Change 100709 by rwatson@rwatson_zoo on 2006/07/06 10:04:59 Two name shortenings/simplifications. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#11 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#11 (text+ko) ==== @@ -222,7 +222,7 @@ */ typedef int (*mpo_inpcb_init_label_t)(struct label *label, int flag); typedef void (*mpo_inpcb_destroy_label_t)(struct label *label); -typedef void (*mpo_inpcb_create_from_socket_t)(struct socket *so, +typedef void (*mpo_inpcb_create_t)(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel); typedef void (*mpo_inpcb_create_mbuf_t)(struct inpcb *inp, @@ -474,7 +474,7 @@ char *element_name, char *element_data, int *claimed); typedef void (*mpo_socket_create_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); -typedef void (*mpo_socket_create_from_socket_t)(struct socket *oldsocket, +typedef void (*mpo_socket_accept_t)(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel); typedef void (*mpo_socket_relabel_t)(struct ucred *cred, struct socket *so, @@ -711,12 +711,9 @@ mpo_ifnet_check_relabel_t mpo_ifnet_check_relabel; mpo_ifnet_check_transmit_t mpo_ifnet_check_transmit; - /* - * XXXRW: Could s/create_from_socket/create/. - */ mpo_inpcb_init_label_t mpo_inpcb_init_label; mpo_inpcb_destroy_label_t mpo_inpcb_destroy_label; - mpo_inpcb_create_from_socket_t mpo_inpcb_create_from_socket; + mpo_inpcb_create_t mpo_inpcb_create; mpo_inpcb_create_mbuf_t mpo_inpcb_create_mbuf; mpo_inpcb_sosetlabel_t mpo_inpcb_sosetlabel; mpo_inpcb_check_deliver_t mpo_inpcb_check_deliver; @@ -865,7 +862,7 @@ mpo_socket_externalize_peer_label_t mpo_socket_externalize_peer_label; mpo_socket_internalize_label_t mpo_socket_internalize_label; mpo_socket_create_t mpo_socket_create; - mpo_socket_create_from_socket_t mpo_socket_create_from_socket; + mpo_socket_accept_t mpo_socket_accept; mpo_socket_relabel_t mpo_socket_relabel; mpo_socket_set_peer_from_socket_t mpo_socket_set_peer_from_socket; mpo_socket_create_mbuf_t mpo_socket_create_mbuf; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 10:18:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A827316A4E5 for ; Thu, 6 Jul 2006 10:18:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E83DA43D46 for ; Thu, 6 Jul 2006 10:18:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BB22A46D04 for ; Thu, 6 Jul 2006 06:18:17 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5FCC3561D2; Thu, 6 Jul 2006 10:18:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 511B316A4E1; Thu, 6 Jul 2006 10:18:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0708016A4DA for ; Thu, 6 Jul 2006 10:18:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A939E43D49 for ; Thu, 6 Jul 2006 10:18:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66AIGpe061527 for ; Thu, 6 Jul 2006 10:18:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66AIGiL061524 for perforce@freebsd.org; Thu, 6 Jul 2006 10:18:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 10:18:16 GMT Message-Id: <200607061018.k66AIGiL061524@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 100711 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 10:18:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=100711 Change 100711 by rwatson@rwatson_zoo on 2006/07/06 10:18:02 Much renaming. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#4 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#4 (text+ko) ==== @@ -90,173 +90,177 @@ * Kernel functions to manage and evaluate labels. */ -void mac_init_bpfdesc(struct bpf_d *); -void mac_destroy_bpfdesc(struct bpf_d *); -void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d); -void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); -int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); +void mac_bpfdesc_init(struct bpf_d *); +void mac_bpfdesc_destroy(struct bpf_d *); +void mac_bpfdesc_create(struct ucred *cred, struct bpf_d *bpf_d); +void mac_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct mbuf *m); +int mac_bpfdesc_check_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); -void mac_init_devfsdirent(struct devfs_dirent *); -void mac_destroy_devfsdirent(struct devfs_dirent *); -void mac_associate_vnode_devfs(struct mount *mp, struct devfs_dirent *de, +void mac_devfsdirent_init(struct devfs_dirent *); +void mac_devfsdirent_destroy(struct devfs_dirent *); +void mac_devfs_vnode_associate(struct mount *mp, struct devfs_dirent *de, struct vnode *vp); -void mac_create_devfs_device(struct ucred *cred, struct mount *mp, +void mac_devfs_create_device(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *de); -void mac_create_devfs_directory(struct mount *mp, char *dirname, +void mac_devfs_create_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *de); -void mac_create_devfs_symlink(struct ucred *cred, struct mount *mp, +void mac_devfs_create_symlink(struct ucred *cred, struct mount *mp, struct devfs_dirent *dd, struct devfs_dirent *de); -void mac_update_devfsdirent(struct mount *mp, struct devfs_dirent *de, +void mac_devfsdirent_update(struct mount *mp, struct devfs_dirent *de, struct vnode *vp); -void mac_init_cred(struct ucred *); -void mac_destroy_cred(struct ucred *); -void mac_copy_cred(struct ucred *cr1, struct ucred *cr2); +void mac_cred_init(struct ucred *); +void mac_cred_destroy(struct ucred *); +void mac_cred_copy(struct ucred *cr1, struct ucred *cr2); struct label *mac_cred_label_alloc(void); void mac_cred_label_free(struct label *label); -int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); +int mac_cred_check_visible(struct ucred *u1, struct ucred *u2); -void mac_init_ifnet(struct ifnet *); -void mac_destroy_ifnet(struct ifnet *); -void mac_create_ifnet(struct ifnet *ifp); +void mac_ifnet_init(struct ifnet *); +void mac_ifnet_destroy(struct ifnet *); +void mac_ifnet_create(struct ifnet *ifp); void mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *m); -void mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m); +void mac_ifnet_create_mbuf(struct ifnet *ifnet, struct mbuf *m); void mac_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct ifnet *ifnet, struct mbuf *newmbuf); -int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); -int mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr, +int mac_ifnet_check_transmit(struct ifnet *ifnet, struct mbuf *m); +int mac_ifnet_ioctl_get(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifnet); -int mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, +int mac_ifnet_ioctl_set(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifnet); -int mac_init_inpcb(struct inpcb *, int flag); -void mac_destroy_inpcb(struct inpcb *); -void mac_create_inpcb_from_socket(struct socket *so, struct inpcb *inp); -void mac_create_mbuf_from_inpcb(struct inpcb *inp, struct mbuf *m); +int mac_inpcb_init(struct inpcb *, int flag); +void mac_inpcb_destroy_inpcb(struct inpcb *); +void mac_inpcb_create_from_socket(struct socket *so, struct inpcb *inp); +void mac_inpcb_create_mbuf(struct inpcb *inp, struct mbuf *m); void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp); -int mac_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m); +int mac_inpcb_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m); -int mac_init_ipq(struct ipq *, int flag); -void mac_destroy_ipq(struct ipq *); -void mac_create_ipq(struct mbuf *fragment, struct ipq *ipq); -void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram); -int mac_fragment_match(struct mbuf *fragment, struct ipq *ipq); -void mac_update_ipq(struct mbuf *fragment, struct ipq *ipq); +int mac_ipq_init(struct ipq *, int flag); +void mac_ipq_destroy(struct ipq *); +void mac_ipq_create(struct mbuf *fragment, struct ipq *ipq); +void mac_ipq_create_datagram(struct ipq *ipq, struct mbuf *datagram); +int mac_ipq_fragment_match(struct mbuf *fragment, struct ipq *ipq); +void mac_ipq_update(struct mbuf *fragment, struct ipq *ipq); -int mac_check_kenv_dump(struct ucred *cred); -int mac_check_kenv_get(struct ucred *cred, char *name); -int mac_check_kenv_set(struct ucred *cred, char *name, char *value); -int mac_check_kenv_unset(struct ucred *cred, char *name); +int mac_kenv_check_dump(struct ucred *cred); +int mac_kenv_check_get(struct ucred *cred, char *name); +int mac_kenv_check_set(struct ucred *cred, char *name, char *value); +int mac_kenv_check_unset(struct ucred *cred, char *name); -int mac_check_kld_load(struct ucred *cred, struct vnode *vp); -int mac_check_kld_stat(struct ucred *cred); -int mac_check_kld_unload(struct ucred *cred); +int mac_kld_check_load(struct ucred *cred, struct vnode *vp); +int mac_kld_check_stat(struct ucred *cred); +int mac_kld_check_unload(struct ucred *cred); -void mac_init_posix_sem(struct ksem *); -void mac_destroy_posix_sem(struct ksem *); -void mac_create_posix_sem(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_getvalue(struct ucred *cred,struct ksem *ksemptr); -int mac_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_unlink(struct ucred *cred, struct ksem *ksemptr); -int mac_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr); +void mac_posix_sem_init(struct ksem *); +void mac_posix_sem_destroy_posix_sem(struct ksem *); +void mac_posix_sem_create(struct ucred *cred, struct ksem *ksemptr); +int mac_posix_sem_check_destroy(struct ucred *cred, struct ksem *ksemptr); +int mac_posix_sem_check_getvalue(struct ucred *cred,struct ksem *ksemptr); +int mac_posix_sem_check_open(struct ucred *cred, struct ksem *ksemptr); +int mac_posix_sem_check_post(struct ucred *cred, struct ksem *ksemptr); +int mac_posix_sem_check_unlink(struct ucred *cred, struct ksem *ksemptr); +int mac_posix_sem_check_wait(struct ucred *cred, struct ksem *ksemptr); -int mac_init_mbuf(struct mbuf *mbuf, int flag); -int mac_init_mbuf_tag(struct m_tag *, int flag); -void mac_copy_mbuf(struct mbuf *m_from, struct mbuf *m_to); -void mac_copy_mbuf_tag(struct m_tag *, struct m_tag *); -void mac_destroy_mbuf_tag(struct m_tag *); -void mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment); -void mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf); -void mac_reflect_mbuf_icmp(struct mbuf *m); -void mac_reflect_mbuf_tcp(struct mbuf *m); +int mac_mbuf_init(struct mbuf *mbuf, int flag); +int mac_mbuf_tag_init(struct m_tag *, int flag); +void mac_mbuf_copy(struct mbuf *m_from, struct mbuf *m_to); +void mac_mbuf_tag_copy(struct m_tag *, struct m_tag *); +void mac_mbuf_tag_destroy(struct m_tag *); +void mac_mbuf_create_fragment(struct mbuf *datagram, struct mbuf *fragment); +void mac_mbuf_create_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf); +void mac_mbuf_reflect_icmp(struct mbuf *m); +void mac_mbuf_reflect_tcp(struct mbuf *m); -void mac_init_mount(struct mount *); -void mac_destroy_mount(struct mount *); -void mac_create_mount(struct ucred *cred, struct mount *mp); -int mac_check_mount_stat(struct ucred *cred, struct mount *mp); +void mac_mount_init(struct mount *); +void mac_mount_destroy(struct mount *); +void mac_mount_create(struct ucred *cred, struct mount *mp); +int mac_mount_check_stat(struct ucred *cred, struct mount *mp); -void mac_init_pipe(struct pipepair *); -void mac_destroy_pipe(struct pipepair *); -void mac_create_pipe(struct ucred *cred, struct pipepair *pp); -int mac_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp, +void mac_pipe_init(struct pipepair *); +void mac_pipe_destroy(struct pipepair *); +void mac_pipe_create(struct ucred *cred, struct pipepair *pp); +int mac_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp, unsigned long cmd, void *data); -int mac_check_pipe_poll(struct ucred *cred, struct pipepair *pp); -int mac_check_pipe_read(struct ucred *cred, struct pipepair *pp); -int mac_check_pipe_stat(struct ucred *cred, struct pipepair *pp); -int mac_check_pipe_write(struct ucred *cred, struct pipepair *pp); +int mac_pipe_check_poll(struct ucred *cred, struct pipepair *pp); +int mac_pipe_check_read(struct ucred *cred, struct pipepair *pp); +int mac_pipe_check_stat(struct ucred *cred, struct pipepair *pp); +int mac_pipe_check_write(struct ucred *cred, struct pipepair *pp); int mac_pipe_label_set(struct ucred *cred, struct pipepair *pp, struct label *label); -void mac_init_proc(struct proc *); -void mac_destroy_proc(struct proc *); -void mac_create_proc0(struct ucred *cred); -void mac_create_proc1(struct ucred *cred); +void mac_proc_init(struct proc *); +void mac_proc_destroy(struct proc *); +void mac_proc_create_swapper(struct ucred *cred); +void mac_proc_create_init(struct ucred *cred); void mac_thread_userret(struct thread *td); -int mac_check_proc_debug(struct ucred *cred, struct proc *proc); -int mac_check_proc_sched(struct ucred *cred, struct proc *proc); -int mac_check_proc_setuid(struct proc *proc, struct ucred *cred, +int mac_proc_check_debug(struct ucred *cred, struct proc *proc); +int mac_proc_check_sched(struct ucred *cred, struct proc *proc); +int mac_proc_check_setuid(struct proc *proc, struct ucred *cred, uid_t uid); -int mac_check_proc_seteuid(struct proc *proc, struct ucred *cred, +int mac_proc_check_seteuid(struct proc *proc, struct ucred *cred, uid_t euid); -int mac_check_proc_setgid(struct proc *proc, struct ucred *cred, +int mac_proc_check_setgid(struct proc *proc, struct ucred *cred, gid_t gid); -int mac_check_proc_setegid(struct proc *proc, struct ucred *cred, +int mac_proc_check_setegid(struct proc *proc, struct ucred *cred, gid_t egid); -int mac_check_proc_setgroups(struct proc *proc, struct ucred *cred, +int mac_proc_check_setgroups(struct proc *proc, struct ucred *cred, int ngroups, gid_t *gidset); -int mac_check_proc_setreuid(struct proc *proc, struct ucred *cred, +int mac_proc_check_setreuid(struct proc *proc, struct ucred *cred, uid_t ruid, uid_t euid); -int mac_check_proc_setregid(struct proc *proc, struct ucred *cred, +int mac_proc_check_setregid(struct proc *proc, struct ucred *cred, gid_t rgid, gid_t egid); -int mac_check_proc_setresuid(struct proc *proc, struct ucred *cred, +int mac_proc_check_setresuid(struct proc *proc, struct ucred *cred, uid_t ruid, uid_t euid, uid_t suid); -int mac_check_proc_setresgid(struct proc *proc, struct ucred *cred, +int mac_proc_check_setresgid(struct proc *proc, struct ucred *cred, gid_t rgid, gid_t egid, gid_t sgid); -int mac_check_proc_signal(struct ucred *cred, struct proc *proc, +int mac_proc_check_signal(struct ucred *cred, struct proc *proc, int signum); -int mac_check_proc_wait(struct ucred *cred, struct proc *proc); +int mac_proc_check_wait(struct ucred *cred, struct proc *proc); void mac_associate_nfsd_label(struct ucred *cred); void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); -int mac_init_socket(struct socket *, int flag); -void mac_destroy_socket(struct socket *); -void mac_create_mbuf_from_socket(struct socket *so, struct mbuf *m); -void mac_create_socket(struct ucred *cred, struct socket *socket); -void mac_create_socket_from_socket(struct socket *oldsocket, +int mac_socket_init(struct socket *, int flag); +void mac_socket_destroy(struct socket *); +void mac_socket_create_mbuf(struct socket *so, struct mbuf *m); +void mac_socket_create(struct ucred *cred, struct socket *socket); +void mac_socket_accept(struct socket *oldsocket, struct socket *newsocket); -void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, +void mac_socket_set_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket); -void mac_set_socket_peer_from_socket(struct socket *oldsocket, +void mac_socket_set_peer_from_socket(struct socket *oldsocket, struct socket *newsocket); -int mac_check_socket_accept(struct ucred *cred, struct socket *so); -int mac_check_socket_bind(struct ucred *cred, struct socket *so, +int mac_socket_check_accept(struct ucred *cred, struct socket *so); +int mac_socket_check_bind(struct ucred *cred, struct socket *so, struct sockaddr *sockaddr); -int mac_check_socket_connect(struct ucred *cred, struct socket *so, +int mac_socket_check_connect(struct ucred *cred, struct socket *so, struct sockaddr *sockaddr); -int mac_check_socket_create(struct ucred *cred, int domain, int type, +int mac_socket_check_create(struct ucred *cred, int domain, int type, int protocol); -int mac_check_socket_deliver(struct socket *so, struct mbuf *m); -int mac_check_socket_listen(struct ucred *cred, struct socket *so); -int mac_check_socket_poll(struct ucred *cred, struct socket *so); -int mac_check_socket_receive(struct ucred *cred, struct socket *so); -int mac_check_socket_send(struct ucred *cred, struct socket *so); -int mac_check_socket_stat(struct ucred *cred, struct socket *so); -int mac_check_socket_visible(struct ucred *cred, struct socket *so); +int mac_socket_check_deliver(struct socket *so, struct mbuf *m); +int mac_socket_check_listen(struct ucred *cred, struct socket *so); +int mac_socket_check_poll(struct ucred *cred, struct socket *so); +int mac_socket_check_receive(struct ucred *cred, struct socket *so); +int mac_socket_check_send(struct ucred *cred, struct socket *so); +int mac_socket_check_stat(struct ucred *cred, struct socket *so); +int mac_socket_check_visible(struct ucred *cred, struct socket *so); -int mac_check_sysarch_ioperm(struct ucred *cred); -int mac_check_system_acct(struct ucred *cred, struct vnode *vp); -int mac_check_system_nfsd(struct ucred *cred); -int mac_check_system_reboot(struct ucred *cred, int howto); -int mac_check_system_settime(struct ucred *cred); -int mac_check_system_swapon(struct ucred *cred, struct vnode *vp); -int mac_check_system_swapoff(struct ucred *cred, struct vnode *vp); -int mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, +int mac_system_check_sysarch_ioperm(struct ucred *cred); +int mac_system_check_acct(struct ucred *cred, struct vnode *vp); +int mac_system_check_nfsd(struct ucred *cred); +int mac_system_check_reboot(struct ucred *cred, int howto); +int mac_system_check_settime(struct ucred *cred); +int mac_system_check_swapon(struct ucred *cred, struct vnode *vp); +int mac_system_check_swapoff(struct ucred *cred, struct vnode *vp); +int mac_system_check_sysctl(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); +int mac_socket_getsockopt_label(struct ucred *cred, struct socket *so, + struct mac *extmac); +int mac_socket_getsockopt_peerlabel(struct ucred *cred, struct socket *so, + struct mac *extmac); +int mac_socket_setsockopt_label(struct ucred *cred, struct socket *so, + struct mac *extmac); -int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, - int acc_mode); void mac_init_sysv_msgqueue(struct msqid_kernel*); void mac_destroy_sysv_msgqueue(struct msqid_kernel *); void mac_cleanup_sysv_msgmsg(struct msg *msgptr); @@ -292,18 +296,18 @@ int mac_check_sysv_semop(struct ucred *cred,struct semid_kernel *semakptr, size_t accesstype); -void mac_init_sysv_shm(struct shmid_kernel*); -void mac_destroy_sysv_shm(struct shmid_kernel *); -void mac_create_sysv_shm(struct ucred *cred, +void mac_sysv_shm_init(struct shmid_kernel*); +void mac_sysv_shm_destroy(struct shmid_kernel *); +void mac_sysv_shm_create(struct ucred *cred, struct shmid_kernel *shmsegptr); -void mac_cleanup_sysv_shm(struct shmid_kernel *shmsegptr); -int mac_check_sysv_shmat(struct ucred *cred, +void mac_sysv_shm_cleanup(struct shmid_kernel *shmsegptr); +int mac_sysv_shm_check_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, int shmflg); -int mac_check_sysv_shmctl(struct ucred *cred, +int mac_sysv_shm_check_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, int cmd); -int mac_check_sysv_shmdt(struct ucred *cred, +int mac_sysv_shm_check_shmdt(struct ucred *cred, struct shmid_kernel *shmsegptr); -int mac_check_sysv_shmget(struct ucred *cred, +int mac_sysv_shm_check_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, int shmflg); int mac_execve_enter(struct image_params *imgp, struct mac *mac_p); @@ -314,78 +318,74 @@ int mac_execve_will_transition(struct ucred *old, struct vnode *vp, struct label *interpvnodelabel, struct image_params *imgp); -void mac_init_vnode(struct vnode *); -void mac_copy_vnode_label(struct label *, struct label *label); -void mac_destroy_vnode(struct vnode *); +void mac_vnode_init(struct vnode *); +void mac_vnode_copy_label(struct label *, struct label *label); +void mac_vnode_destroy(struct vnode *); struct label *mac_vnode_label_alloc(void); void mac_vnode_label_free(struct label *label); -int mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp); -void mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp); -int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, +int mac_vnode_associate_extattr(struct mount *mp, struct vnode *vp); +void mac_vnode_associate_singlelabel(struct mount *mp, struct vnode *vp); +int mac_vnode_create_extattr(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); -void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, +void mac_vnode_relabel(struct ucred *cred, struct vnode *vp, struct label *newlabel); -int mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp); -int mac_check_vnode_chroot(struct ucred *cred, struct vnode *dvp); -int mac_check_vnode_create(struct ucred *cred, struct vnode *dvp, +int mac_vnode_check_access(struct ucred *cred, struct vnode *vp, + int acc_mode); +int mac_vnode_check_chdir(struct ucred *cred, struct vnode *dvp); +int mac_vnode_check_chroot(struct ucred *cred, struct vnode *dvp); +int mac_vnode_check_create(struct ucred *cred, struct vnode *dvp, struct componentname *cnp, struct vattr *vap); -int mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, +int mac_vnode_check_delete(struct ucred *cred, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); -int mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp, acl_type_t type); -int mac_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name); -int mac_check_vnode_exec(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_exec(struct ucred *cred, struct vnode *vp, struct image_params *imgp); -int mac_check_vnode_getacl(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_getacl(struct ucred *cred, struct vnode *vp, acl_type_t type); -int mac_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_getextattr(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio); -int mac_check_vnode_link(struct ucred *cred, struct vnode *dvp, +int mac_vnode_check_link(struct ucred *cred, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); -int mac_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_listextattr(struct ucred *cred, struct vnode *vp, int attrnamespace); -int mac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, +int mac_vnode_check_lookup(struct ucred *cred, struct vnode *dvp, struct componentname *cnp); -int mac_check_vnode_mmap(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_mmap(struct ucred *cred, struct vnode *vp, int prot, int flags); -int mac_check_vnode_mprotect(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_mprotect(struct ucred *cred, struct vnode *vp, int prot); -int mac_check_vnode_open(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_open(struct ucred *cred, struct vnode *vp, int acc_mode); -int mac_check_vnode_poll(struct ucred *active_cred, +int mac_vnode_check_poll(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); -int mac_check_vnode_read(struct ucred *active_cred, +int mac_vnode_check_read(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); -int mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp); -int mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp); -int mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, +int mac_vnode_check_readdir(struct ucred *cred, struct vnode *vp); +int mac_vnode_check_readlink(struct ucred *cred, struct vnode *vp); +int mac_vnode_check_rename_from(struct ucred *cred, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); -int mac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, +int mac_vnode_check_rename_to(struct ucred *cred, struct vnode *dvp, struct vnode *vp, int samedir, struct componentname *cnp); -int mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp); -int mac_check_vnode_setacl(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_revoke(struct ucred *cred, struct vnode *vp); +int mac_vnode_check_setacl(struct ucred *cred, struct vnode *vp, acl_type_t type, struct acl *acl); -int mac_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_setextattr(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio); -int mac_check_vnode_setflags(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_setflags(struct ucred *cred, struct vnode *vp, u_long flags); -int mac_check_vnode_setmode(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_setmode(struct ucred *cred, struct vnode *vp, mode_t mode); -int mac_check_vnode_setowner(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_setowner(struct ucred *cred, struct vnode *vp, uid_t uid, gid_t gid); -int mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, +int mac_vnode_check_setutimes(struct ucred *cred, struct vnode *vp, struct timespec atime, struct timespec mtime); -int mac_check_vnode_stat(struct ucred *active_cred, +int mac_vnode_check_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); -int mac_check_vnode_write(struct ucred *active_cred, +int mac_vnode_check_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); -int mac_getsockopt_label(struct ucred *cred, struct socket *so, - struct mac *extmac); -int mac_getsockopt_peerlabel(struct ucred *cred, struct socket *so, - struct mac *extmac); -int mac_setsockopt_label(struct ucred *cred, struct socket *so, - struct mac *extmac); /* * Calls to help various file systems implement labeling functionality From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 10:20:22 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 829A316A55C for ; Thu, 6 Jul 2006 10:20:22 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDAD543D53 for ; Thu, 6 Jul 2006 10:20:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id DFF7F46D06 for ; Thu, 6 Jul 2006 06:20:20 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6B3C95632C; Thu, 6 Jul 2006 10:20:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C5D916A4E2; Thu, 6 Jul 2006 10:20:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E41716A4DE for ; Thu, 6 Jul 2006 10:20:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB7C643D46 for ; Thu, 6 Jul 2006 10:20:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66AKJv3061691 for ; Thu, 6 Jul 2006 10:20:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66AKJFS061688 for perforce@freebsd.org; Thu, 6 Jul 2006 10:20:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 10:20:19 GMT Message-Id: <200607061020.k66AKJFS061688@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 100712 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 10:20:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=100712 Change 100712 by rwatson@rwatson_zoo on 2006/07/06 10:20:03 Simplify entry point naming for devfs. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#5 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#12 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#5 (text+ko) ==== @@ -96,8 +96,8 @@ void mac_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct mbuf *m); int mac_bpfdesc_check_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); -void mac_devfsdirent_init(struct devfs_dirent *); -void mac_devfsdirent_destroy(struct devfs_dirent *); +void mac_devfs_init(struct devfs_dirent *); +void mac_devfs_destroy(struct devfs_dirent *); void mac_devfs_vnode_associate(struct mount *mp, struct devfs_dirent *de, struct vnode *vp); void mac_devfs_create_device(struct ucred *cred, struct mount *mp, @@ -106,7 +106,7 @@ int dirnamelen, struct devfs_dirent *de); void mac_devfs_create_symlink(struct ucred *cred, struct mount *mp, struct devfs_dirent *dd, struct devfs_dirent *de); -void mac_devfsdirent_update(struct mount *mp, struct devfs_dirent *de, +void mac_devfs_update(struct mount *mp, struct devfs_dirent *de, struct vnode *vp); void mac_cred_init(struct ucred *); ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#12 (text+ko) ==== @@ -145,8 +145,8 @@ /* * Object: struct devfsdirent (Devfs directory entry) */ -typedef void (*mpo_devfsdirent_init_label_t)(struct label *label); -typedef void (*mpo_devfsdirent_destroy_label_t)(struct label *label); +typedef void (*mpo_devfs_init_label_t)(struct label *label); +typedef void (*mpo_devfs_destroy_label_t)(struct label *label); typedef void (*mpo_devfs_vnode_associate_t)(struct mount *mp, struct label *fslabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, @@ -161,7 +161,7 @@ struct mount *mp, struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel); -typedef void (*mpo_devfsdirent_update_t)(struct mount *mp, +typedef void (*mpo_devfs_update_t)(struct mount *mp, struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel); @@ -675,13 +675,13 @@ * XXXRW: Naming consistency here -- perhaps should just be * mpo_devfs_*. */ - mpo_devfsdirent_init_label_t mpo_devfsdirent_init_label; - mpo_devfsdirent_destroy_label_t mpo_devfsdirent_destroy_label; + mpo_devfs_init_label_t mpo_devfs_init_label; + mpo_devfs_destroy_label_t mpo_devfs_destroy_label; mpo_devfs_vnode_associate_t mpo_devfs_vnode_associate; mpo_devfs_create_device_t mpo_devfs_create_device; mpo_devfs_create_directory_t mpo_devfs_create_directory; mpo_devfs_create_symlink_t mpo_devfs_create_symlink; - mpo_devfsdirent_update_t mpo_devfsdirent_update_t; + mpo_devfs_update_t mpo_devfs_update_t; /* * XXXRW: Perhaps should be mpo_ucred_*. From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 10:30:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54E9616A4DE for ; Thu, 6 Jul 2006 10:30:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B179643D46 for ; Thu, 6 Jul 2006 10:30:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D0D3746D06 for ; Thu, 6 Jul 2006 06:30:34 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6242355486; Thu, 6 Jul 2006 10:30:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 538E916A4DF; Thu, 6 Jul 2006 10:30:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 104CF16A4DD for ; Thu, 6 Jul 2006 10:30:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B552443D46 for ; Thu, 6 Jul 2006 10:30:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66AUWwv062282 for ; Thu, 6 Jul 2006 10:30:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66AUWU6062277 for perforce@freebsd.org; Thu, 6 Jul 2006 10:30:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 10:30:32 GMT Message-Id: <200607061030.k66AUWU6062277@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 100713 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 10:30:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=100713 Change 100713 by rwatson@rwatson_zoo on 2006/07/06 10:29:53 More renaming and cleanup: - inpcb's are always created from sockets, so decomplicate name. - Move some mbuf operations to being netinet operations; rename. - Simplify ipq names. - Simplify sysv* names. - Remove mount_fs label since it's unused in practice. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#6 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#13 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#6 (text+ko) ==== @@ -131,7 +131,7 @@ int mac_inpcb_init(struct inpcb *, int flag); void mac_inpcb_destroy_inpcb(struct inpcb *); -void mac_inpcb_create_from_socket(struct socket *so, struct inpcb *inp); +void mac_inpcb_create(struct socket *so, struct inpcb *inp); void mac_inpcb_create_mbuf(struct inpcb *inp, struct mbuf *m); void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp); int mac_inpcb_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m); @@ -139,8 +139,8 @@ int mac_ipq_init(struct ipq *, int flag); void mac_ipq_destroy(struct ipq *); void mac_ipq_create(struct mbuf *fragment, struct ipq *ipq); -void mac_ipq_create_datagram(struct ipq *ipq, struct mbuf *datagram); -int mac_ipq_fragment_match(struct mbuf *fragment, struct ipq *ipq); +void mac_ipq_reassemble(struct ipq *ipq, struct mbuf *datagram); +int mac_ipq_match(struct mbuf *fragment, struct ipq *ipq); void mac_ipq_update(struct mbuf *fragment, struct ipq *ipq); int mac_kenv_check_dump(struct ucred *cred); @@ -167,16 +167,17 @@ void mac_mbuf_copy(struct mbuf *m_from, struct mbuf *m_to); void mac_mbuf_tag_copy(struct m_tag *, struct m_tag *); void mac_mbuf_tag_destroy(struct m_tag *); -void mac_mbuf_create_fragment(struct mbuf *datagram, struct mbuf *fragment); void mac_mbuf_create_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf); -void mac_mbuf_reflect_icmp(struct mbuf *m); -void mac_mbuf_reflect_tcp(struct mbuf *m); void mac_mount_init(struct mount *); void mac_mount_destroy(struct mount *); void mac_mount_create(struct ucred *cred, struct mount *mp); int mac_mount_check_stat(struct ucred *cred, struct mount *mp); +void mac_netinet_fragment(struct mbuf *datagram, struct mbuf *fragment); +void mac_netinet_icmp_reply(struct mbuf *m); +void mac_netinet_tcp_reply(struct mbuf *m); + void mac_pipe_init(struct pipepair *); void mac_pipe_destroy(struct pipepair *); void mac_pipe_create(struct ucred *cred, struct pipepair *pp); @@ -261,40 +262,41 @@ int mac_socket_setsockopt_label(struct ucred *cred, struct socket *so, struct mac *extmac); -void mac_init_sysv_msgqueue(struct msqid_kernel*); -void mac_destroy_sysv_msgqueue(struct msqid_kernel *); -void mac_cleanup_sysv_msgmsg(struct msg *msgptr); -void mac_cleanup_sysv_msgqueue(struct msqid_kernel *msqkptr); -void mac_create_sysv_msgmsg(struct ucred *cred, +void mac_sysv_msq_init(struct msqid_kernel*); +void mac_sysv_msq_destroy(struct msqid_kernel *); +void mac_sysv_msq_cleanup(struct msqid_kernel *msqkptr); +void mac_sysv_msq_create_msg(struct ucred *cred, struct msqid_kernel *msqkptr, struct msg *msgptr); -void mac_create_sysv_msgqueue(struct ucred *cred, +void mac_sysv_msq_create(struct ucred *cred, struct msqid_kernel *msqkptr); -void mac_init_sysv_msgmsg(struct msg *); -void mac_destroy_sysv_msgmsg(struct msg *); -int mac_check_sysv_msgmsq(struct ucred *cred, struct msg *msgptr, +int mac_sysv_msq_check_msgmsq(struct ucred *cred, struct msg *msgptr, struct msqid_kernel *msqkptr); -int mac_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr); -int mac_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr); -int mac_check_sysv_msqget(struct ucred *cred, +int mac_sysv_msq_check_msgrcv(struct ucred *cred, struct msg *msgptr); +int mac_sysv_msq_check_msgrmid(struct ucred *cred, struct msg *msgptr); +int mac_sysv_msq_check_msqget(struct ucred *cred, struct msqid_kernel *msqkptr); -int mac_check_sysv_msqsnd(struct ucred *cred, +int mac_sysv_msq_check_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr); -int mac_check_sysv_msqrcv(struct ucred *cred, +int mac_sysv_msq_check_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr); -int mac_check_sysv_msqctl(struct ucred *cred, +int mac_sysv_msq_check_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, int cmd); -void mac_init_sysv_sem(struct semid_kernel*); -void mac_destroy_sysv_sem(struct semid_kernel *); -void mac_create_sysv_sem(struct ucred *cred, +void mac_sysv_msg_init(struct msg *); +void mac_sysv_msg_destroy(struct msg *); +void mac_sysv_msg_cleanup(struct msg *msgptr); + +void mac_sysv_sem_init(struct semid_kernel*); +void mac_sysv_sem_destroy(struct semid_kernel *); +void mac_sysv_sem_create(struct ucred *cred, struct semid_kernel *semakptr); -void mac_cleanup_sysv_sem(struct semid_kernel *semakptr); -int mac_check_sysv_semctl(struct ucred *cred, +void mac_sysv_sem_cleanup_sysv_sem(struct semid_kernel *semakptr); +int mac_sysv_sem_check_semctl(struct ucred *cred, struct semid_kernel *semakptr, int cmd); -int mac_check_sysv_semget(struct ucred *cred, +int mac_sysv_sem_check_semget(struct ucred *cred, struct semid_kernel *semakptr); -int mac_check_sysv_semop(struct ucred *cred,struct semid_kernel *semakptr, - size_t accesstype); +int mac_sysv_sem_check_semop(struct ucred *cred, + struct semid_kernel *semakptr, size_t accesstype); void mac_sysv_shm_init(struct shmid_kernel*); void mac_sysv_shm_destroy(struct shmid_kernel *); ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#13 (text+ko) ==== @@ -671,10 +671,6 @@ mpo_bpfdesc_create_mbuf_t mpo_bpfdesc_create_mbuf; mpo_bpfdesc_check_receive_t mpo_bpfdesc_check_receive; - /* - * XXXRW: Naming consistency here -- perhaps should just be - * mpo_devfs_*. - */ mpo_devfs_init_label_t mpo_devfs_init_label; mpo_devfs_destroy_label_t mpo_devfs_destroy_label; mpo_devfs_vnode_associate_t mpo_devfs_vnode_associate; @@ -718,15 +714,11 @@ mpo_inpcb_sosetlabel_t mpo_inpcb_sosetlabel; mpo_inpcb_check_deliver_t mpo_inpcb_check_deliver; - /* - * XXXRW: Maybe s/create_datagram/reassemble/, - * s/fragment_match/match/. - */ mpo_ipq_init_label_t mpo_ipq_init_label; mpo_ipq_destroy_label_t mpo_ipq_destroy_label; mpo_ipq_create_t mpo_ipq_create; - mpo_ipq_create_datagram_t mpo_ipq_create_datagram; - mpo_ipq_fragment_match_t mpo_ipq_fragment_match; + mpo_ipq_reassemble_t mpo_ipq_reassemble; + mpo_ipq_match_t mpo_ipq_match; mpo_ipq_update_t mpo_ipq_update; mpo_kenv_check_dump_t mpo_kenv_check_dump; @@ -754,30 +746,22 @@ mpo_posix_sem_check_wait_t mpo_posix_sem_check_wait; /* - * XXXRW: Perhaps fragment, netlayer, icmp, tcp, etc, should be - * netinet calls rather than mbuf calls? + * XXXRW: netlayer call is too generic. */ mpo_mbuf_init_label_t mpo_mbuf_init_label; mpo_mbuf_destroy_label_t mpo_mbuf_destroy_label; mpo_mbuf_copy_label_t mpo_mbuf_copy_label; - mpo_mbuf_create_fragment_t mpo_mbuf_create_fragment; mpo_mbuf_create_netlayer_t mpo_mbuf_create_netlayer; - mpo_mbuf_reflect_icmp_t mpo_mbuf_reflect_icmp; - mpo_mbuf_reflect_tcp_t mpo_mbuf_reflect_tcp; - /* - * XXXRW: Time to toast mount_fs label since it basically is unused? - */ mpo_mount_init_label_t mpo_mount_init_label; - mpo_mount_fs_init_label_t mpo_mount_fs_init_label; mpo_mount_destroy_label_t mpo_mount_destroy_label; - mpo_mount_fs_destroy_label_t mpo_mount_fs_destroy_label; mpo_mount_check_stat_t mpo_mount_check_stat; mpo_mount_create_t mpo_mount_create; - /* - * XXXRW: Technically, structure name here is pipepair, not pipe. - */ + mpo_netinet_fragment_t mpo_netinet_fragment; + mpo_netinet_icmp_reply_t mpo_netinet_icmp_reply; + mpo_netinet_tcp_reply_t mpo_netinet_tcp_reply; + mpo_pipe_init_label_t mpo_pipe_init_label; mpo_pipe_destroy_label_t mpo_pipe_destroy_label; mpo_pipe_copy_label_t mpo_pipe_copy_label; @@ -815,18 +799,18 @@ * XXXRW: These names are a bit awkard. Perhaps sysv_msq to match * conventional usage? */ - mpo_sysv_msgqueue_init_label_t mpo_sysv_msgqueue_init_label; - mpo_sysv_msgqueue_destroy_t mpo_sysv_msgqueue_destroy; - mpo_sysv_msgqueue_cleanup_t mpo_sysv_msgqueue_cleanup; - mpo_sysv_msgqueue_create_msg_t mpo_sysv_msgqueue_create_msg; - mpo_sysv_msgqueue_create_t mpo_sysv_msgqueue_create; - mpo_sysv_msgqueue_check_msgmsq_t mpo_sysv_msgqueue_check_msgmsq; - mpo_sysv_msgqueue_check_msgrcv_t mpo_sysv_msgqueue_check_msgrcv; - mpo_sysv_msgqueue_check_msgrmid_t mpo_sysv_msgqueue_check_msgrmid; - mpo_sysv_msgqueue_check_msqget_t mpo_sysv_msgqueue_check_msqget; - mpo_sysv_msgqueue_check_msqsnd_t mpo_sysv_msgqueue_check_msqsnd; - mpo_sysv_msgqueue_check_msqrcv_t mpo_sysv_msgqueue_check_msqrcv; - mpo_sysv_msgqueue_check_msqctl_t mpo_sysv_msgqueue_check_msqctl; + mpo_sysv_msq_init_label_t mpo_sysv_msq_init_label; + mpo_sysv_msq_destroy_t mpo_sysv_msq_destroy; + mpo_sysv_msq_cleanup_t mpo_sysv_msq_cleanup; + mpo_sysv_msq_create_msg_t mpo_sysv_msq_create_msg; + mpo_sysv_msq_create_t mpo_sysv_msq_create; + mpo_sysv_msq_check_msgmsq_t mpo_sysv_msq_check_msgmsq; + mpo_sysv_msq_check_msgrcv_t mpo_sysv_msq_check_msgrcv; + mpo_sysv_msq_check_msgrmid_t mpo_sysv_msq_check_msgrmid; + mpo_sysv_msq_check_msqget_t mpo_sysv_msq_check_msqget; + mpo_sysv_msq_check_msqsnd_t mpo_sysv_msq_check_msqsnd; + mpo_sysv_msq_check_msqrcv_t mpo_sysv_msq_check_msqrcv; + mpo_sysv_msq_check_msqctl_t mpo_sysv_msq_check_msqctl; mpo_sysv_msg_init_label_t mpo_sysv_msg_init_label; mpo_sysv_msg_destroy_label_t mpo_sysv_msg_destroy_label; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 10:33:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D73BB16A4E0 for ; Thu, 6 Jul 2006 10:33:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4685343D45 for ; Thu, 6 Jul 2006 10:33:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8BAE046D03 for ; Thu, 6 Jul 2006 06:33:39 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BF4BC55C00; Thu, 6 Jul 2006 10:33:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B0B1516A4E1; Thu, 6 Jul 2006 10:33:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B53D16A4DA for ; Thu, 6 Jul 2006 10:33:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4899443D45 for ; Thu, 6 Jul 2006 10:33:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66AXb3f062537 for ; Thu, 6 Jul 2006 10:33:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66AXart062534 for perforce@freebsd.org; Thu, 6 Jul 2006 10:33:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 10:33:36 GMT Message-Id: <200607061033.k66AXart062534@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 100714 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 10:33:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=100714 Change 100714 by rwatson@rwatson_zoo on 2006/07/06 10:33:28 Update to reflect name changes. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#14 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#14 (text+ko) ==== @@ -243,10 +243,10 @@ typedef void (*mpo_ipq_create_t)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); -typedef void (*mpo_ipq_create_datagram_t) +typedef void (*mpo_ipq_reassemble_t) (struct ipq *ipq, struct label *ipqlabel, struct mbuf *datagram, struct label *datagramlabel); -typedef int (*mpo_ipq_fragment_match_t)(struct mbuf *fragment, +typedef int (*mpo_ipq_match_t)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); typedef void (*mpo_ipq_update_t)(struct mbuf *fragment, @@ -297,16 +297,9 @@ typedef void (*mpo_mbuf_destroy_label_t)(struct label *label); typedef void (*mpo_mbuf_copy_label_t)(struct label *src, struct label *dest); -typedef void (*mpo_mbuf_create_fragment_t)(struct mbuf *datagram, - struct label *datagramlabel, struct mbuf *fragment, - struct label *fragmentlabel); typedef void (*mpo_mbuf_create_netlayer_t)(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel); -typedef void (*mpo_mbuf_reflect_icmp_t)(struct mbuf *m, - struct label *mlabel); -typedef void (*mpo_mbuf_reflect_tcp_t)(struct mbuf *m, - struct label *mlabel); /* * Object: struct mount (File system mountpoint) @@ -322,6 +315,17 @@ struct label *fslabel); /* + * IPv4 networking. + */ +typedef void (*mpo_netinet_fragment_t)(struct mbuf *datagram, + struct label *datagramlabel, struct mbuf *fragment, + struct label *fragmentlabel); +typedef void (*mpo_netinet_icmp_reply_t)(struct mbuf *m, + struct label *mlabel); +typedef void (*mpo_netinet_tcp_reply_t)(struct mbuf *m, + struct label *mlabel); + +/* * Object: struct pipepair (Pipe) */ typedef void (*mpo_pipe_init_label_t)(struct label *label); @@ -386,29 +390,28 @@ /* * Object: struct msqid_kernel (System V message queue) */ -typedef void (*mpo_sysv_msgqueue_init_label_t)(struct label *label); -typedef void (*mpo_sysv_msgqueue_destroy_t)(struct label *label); -typedef void (*mpo_sysv_msgqueue_cleanup_t)(struct label *msqlabel); -typedef void (*mpo_sysv_msgqueue_create_msg_t)(struct ucred *cred, +typedef void (*mpo_sysv_msq_init_label_t)(struct label *label); +typedef void (*mpo_sysv_msq_destroy_t)(struct label *label); +typedef void (*mpo_sysv_msq_cleanup_t)(struct label *msqlabel); +typedef void (*mpo_sysv_msq_create_msg_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel); -typedef void (*mpo_sysv_msgqueue_create_t)(struct ucred *cred, +typedef void (*mpo_sysv_msq_create_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel); - -typedef int (*mpo_sysv_msgqueue_check_msgmsq_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msgmsq_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msgrcv_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msgrcv_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel); -typedef int (*mpo_sysv_msgqueue_check_msgrmid_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msgrmid_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel); -typedef int (*mpo_sysv_msgqueue_check_msqget_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msqget_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msqsnd_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msqsnd_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msqrcv_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msqrcv_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msgqueue_check_msqctl_t)(struct ucred *cred, +typedef int (*mpo_sysv_msq_check_msqctl_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd); /* From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 11:06:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BBC816A55A for ; Thu, 6 Jul 2006 11:06:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC85943D45 for ; Thu, 6 Jul 2006 11:06:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C446F46C77 for ; Thu, 6 Jul 2006 07:06:23 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4E5A155471; Thu, 6 Jul 2006 11:06:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F45316A4E0; Thu, 6 Jul 2006 11:06:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F205316A4DF for ; Thu, 6 Jul 2006 11:06:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B70B43D45 for ; Thu, 6 Jul 2006 11:06:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66B6Mwt065342 for ; Thu, 6 Jul 2006 11:06:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66B6M88065339 for perforce@freebsd.org; Thu, 6 Jul 2006 11:06:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 11:06:22 GMT Message-Id: <200607061106.k66B6M88065339@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 100720 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 11:06:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=100720 Change 100720 by rwatson@rwatson_zoo on 2006/07/06 11:06:15 Update include files; in most cases, mac.h -> mac_framework.h, except in kern_mac.c. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_getcwd.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_stats.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_fcntl.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_devs.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vfsops.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/fs/unionfs/union_vnops.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/i386/i386/sys_machdep.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_misc.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/init_main.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_acct.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_acl.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_alq.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_environment.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_exit.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_jail.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_linker.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mbuf.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_prot.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_shutdown.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_sysctl.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_time.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/link_elf.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/link_elf_obj.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/subr_trap.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sys_pipe.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sys_socket.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_msg.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_sem.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_shm.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_mbuf.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_mbuf2.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_sem.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket2.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_lookup.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_mount.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_syscalls.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_vnops.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/bpf.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/bsd_comp.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_atmsubr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_fddisubr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_fwsubr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_gif.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_iso88025subr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_ppp.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_stf.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_tun.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_getcwd.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include /* XXX only for DIRBLKSIZ */ ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_stats.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_fcntl.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include /*#include */ #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include /* Must come after sys/malloc.h */ #include ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#2 (text+ko) ==== @@ -50,7 +50,7 @@ #include #include #include /* Must come after sys/malloc.h */ -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_devs.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vfsops.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#2 (text+ko) ==== @@ -40,8 +40,8 @@ * mkdir: want it ? */ -#include -#include +#include "opt_devfs.h" +#include "opt_mac.h" #include #include @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/fs/unionfs/union_vnops.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ #include #include #include -#include +#include /* XXXRW: Why is this needed? */ #include #include ==== //depot/projects/trustedbsd/mac2/sys/i386/i386/sys_machdep.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_misc.c#2 (text+ko) ==== @@ -65,7 +65,7 @@ #include #include #include -#include +#include #include #include /* Must come after sys/malloc.h */ #include ==== //depot/projects/trustedbsd/mac2/sys/kern/init_main.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_acct.c#2 (text+ko) ==== @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_acl.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_alq.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_environment.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_exit.c#2 (text+ko) ==== @@ -65,7 +65,7 @@ #include #include /* for acct_process() function prototype */ #include -#include +#include #include #include #ifdef KTRACE ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_jail.c#2 (text+ko) ==== @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_linker.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#2 (text+ko) ==== @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_mbuf.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_param.h" #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_prot.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_shutdown.c#2 (text+ko) ==== @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_sysctl.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_time.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/link_elf.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/link_elf_obj.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/subr_trap.c#2 (text+ko) ==== @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/sys_pipe.c#2 (text+ko) ==== @@ -101,7 +101,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/sys_socket.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/sysv_msg.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/sysv_sem.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ #include #include #include -#include +#include static MALLOC_DEFINE(M_SEM, "sem", "SVID compatible semaphores"); ==== //depot/projects/trustedbsd/mac2/sys/kern/sysv_shm.c#2 (text+ko) ==== @@ -84,7 +84,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_mbuf.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_mbuf2.c#2 (text+ko) ==== @@ -71,7 +71,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_sem.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#2 (text+ko) ==== @@ -101,7 +101,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket2.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #include /* for maxfiles */ #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_lookup.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_mount.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#2 (text+ko) ==== @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_syscalls.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_vnops.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/bpf.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/bsd_comp.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/if.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/if_atmsubr.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/if_fddisubr.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/if_fwsubr.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/if_gif.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/if_iso88025subr.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/if_ppp.c#2 (text+ko) ==== @@ -88,7 +88,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/if_stf.c#2 (text+ko) ==== @@ -82,7 +82,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/net/if_tun.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 11:49:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BADD16A4DE for ; Thu, 6 Jul 2006 11:49:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C921B43D76 for ; Thu, 6 Jul 2006 11:49:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BD6F546CFB for ; Thu, 6 Jul 2006 07:49:47 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 78B3C560F0; Thu, 6 Jul 2006 11:49:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 68DFB16A4E1; Thu, 6 Jul 2006 11:49:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C38D16A4DE for ; Thu, 6 Jul 2006 11:49:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 594E743D45 for ; Thu, 6 Jul 2006 11:49:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66BnLL4067770 for ; Thu, 6 Jul 2006 11:49:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66BnKuV067767 for perforce@freebsd.org; Thu, 6 Jul 2006 11:49:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 11:49:20 GMT Message-Id: <200607061149.k66BnKuV067767@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 100728 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 11:49:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=100728 Change 100728 by rwatson@rwatson_zoo on 2006/07/06 11:48:45 Include file update. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/netinet/if_ether.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/igmp.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_divert.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_icmp.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_input.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_ipsec.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_mroute.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_options.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_output.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/raw_ip.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_output.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/udp_usrreq.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/netinet/if_ether.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/igmp.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_divert.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_icmp.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_input.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_ipsec.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ #include #include #include -#include +#include /* XXXRW: Why is this needed? */ #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_mroute.c#2 (text+ko) ==== @@ -65,7 +65,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_options.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include -#include +#include #include /* #include */ #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_output.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/raw_ip.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include #include /* for proc0 declaration */ ==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_output.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #ifdef INET6 ==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include /* for proc0 declaration */ ==== //depot/projects/trustedbsd/mac2/sys/netinet/udp_usrreq.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 11:53:33 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A0CE16A4DA for ; Thu, 6 Jul 2006 11:53:33 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DA9043D5D for ; Thu, 6 Jul 2006 11:53:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7262C46D04 for ; Thu, 6 Jul 2006 07:53:29 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 27EAB56F79; Thu, 6 Jul 2006 11:53:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1883A16A4E0; Thu, 6 Jul 2006 11:53:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2C4D16A4DE for ; Thu, 6 Jul 2006 11:53:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C10C43D55 for ; Thu, 6 Jul 2006 11:53:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66BrRPl068048 for ; Thu, 6 Jul 2006 11:53:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66BrRvV068044 for perforce@freebsd.org; Thu, 6 Jul 2006 11:53:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 11:53:27 GMT Message-Id: <200607061153.k66BrRvV068044@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 100729 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 11:53:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=100729 Change 100729 by rwatson@rwatson_zoo on 2006/07/06 11:52:52 Include file updates. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/netatalk/aarp.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_input.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_output.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/netinet6/nd6.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvsock.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_syscalls.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/ufs/ffs/ffs_vfsops.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/ufs/ufs/ufs_vnops.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/vm/vm_mmap.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/netatalk/aarp.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_input.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_output.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/netinet6/nd6.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvsock.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_syscalls.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/ufs/ffs/ffs_vfsops.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/ufs/ufs/ufs_vnops.c#2 (text+ko) ==== @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/mac2/sys/vm/vm_mmap.c#2 (text+ko) ==== @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 12:03:21 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6136616A4DE for ; Thu, 6 Jul 2006 12:03:21 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7574B43D46 for ; Thu, 6 Jul 2006 12:03:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7FDF146CF8 for ; Thu, 6 Jul 2006 08:03:16 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3A1BB73C38; Thu, 6 Jul 2006 11:55:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A8BF16A4DF; Thu, 6 Jul 2006 11:55:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E113A16A4DD for ; Thu, 6 Jul 2006 11:55:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AF3343D45 for ; Thu, 6 Jul 2006 11:55: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.6/8.13.6) with ESMTP id k66BtU6l068325 for ; Thu, 6 Jul 2006 11:55:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66BtUCY068322 for perforce@freebsd.org; Thu, 6 Jul 2006 11:55:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 11:55:30 GMT Message-Id: <200607061155.k66BtUCY068322@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 100730 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 12:03:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=100730 Change 100730 by rwatson@rwatson_zoo on 2006/07/06 11:55:09 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket2.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#3 (text+ko) ==== @@ -251,7 +251,7 @@ if (so == NULL) return (NULL); #ifdef MAC - if (mac_init_socket(so, mflags) != 0) { + if (mac_socket_init(so, mflags) != 0) { uma_zfree(socket_zone, so); return (NULL); } @@ -288,7 +288,7 @@ do_setopt_accept_filter(so, NULL); #endif #ifdef MAC - mac_destroy_socket(so); + mac_socket_destroy(so); #endif crfree(so->so_cred); SOCKBUF_LOCK_DESTROY(&so->so_snd); @@ -344,7 +344,7 @@ so->so_cred = crhold(cred); so->so_proto = prp; #ifdef MAC - mac_create_socket(cred, so); + mac_socket_create(cred, so); #endif knlist_init(&so->so_rcv.sb_sel.si_note, SOCKBUF_MTX(&so->so_rcv), NULL, NULL, NULL); @@ -411,7 +411,7 @@ so->so_cred = crhold(head->so_cred); #ifdef MAC SOCK_LOCK(head); - mac_create_socket_from_socket(head, so); + mac_socket_accept(head, so); SOCK_UNLOCK(head); #endif knlist_init(&so->so_rcv.sb_sel.si_note, SOCKBUF_MTX(&so->so_rcv), @@ -2074,8 +2074,8 @@ sizeof extmac); if (error) goto bad; - error = mac_setsockopt_label(sopt->sopt_td->td_ucred, - so, &extmac); + error = mac_socket_setsockopt_label( + sopt->sopt_td->td_ucred, so, &extmac); #else error = EOPNOTSUPP; #endif @@ -2227,8 +2227,8 @@ sizeof(extmac)); if (error) return (error); - error = mac_getsockopt_label(sopt->sopt_td->td_ucred, - so, &extmac); + error = mac_socket_getsockopt_label( + sopt->sopt_td->td_ucred, so, &extmac); if (error) return (error); error = sooptcopyout(sopt, &extmac, sizeof extmac); @@ -2243,7 +2243,7 @@ sizeof(extmac)); if (error) return (error); - error = mac_getsockopt_peerlabel( + error = mac_socket_getsockopt_peerlabel( sopt->sopt_td->td_ucred, so, &extmac); if (error) return (error); ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket2.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ #include /* for maxfiles */ #include #include -#include +#include /* XXXRW: Why is this needed? */ #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#3 (text+ko) ==== @@ -161,7 +161,7 @@ int fd, error; #ifdef MAC - error = mac_check_socket_create(td->td_ucred, uap->domain, uap->type, + error = mac_socket_check_create(td->td_ucred, uap->domain, uap->type, uap->protocol); if (error) return (error); @@ -229,7 +229,7 @@ so = fp->f_data; #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_bind(td->td_ucred, so, sa); + error = mac_socket_check_bind(td->td_ucred, so, sa); SOCK_UNLOCK(so); if (error) goto done1; @@ -267,7 +267,7 @@ so = fp->f_data; #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_listen(td->td_ucred, so); + error = mac_socket_check_listen(td->td_ucred, so); SOCK_UNLOCK(so); if (error) goto done; @@ -326,7 +326,7 @@ } #ifdef MAC SOCK_LOCK(head); - error = mac_check_socket_accept(td->td_ucred, head); + error = mac_socket_check_accept(td->td_ucred, head); SOCK_UNLOCK(head); if (error != 0) goto done; @@ -531,7 +531,7 @@ } #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_connect(td->td_ucred, so, sa); + error = mac_socket_check_connect(td->td_ucred, so, sa); SOCK_UNLOCK(so); if (error) goto bad; @@ -591,7 +591,7 @@ #ifdef MAC /* We might want to have a separate check for socket pairs. */ - error = mac_check_socket_create(td->td_ucred, uap->domain, uap->type, + error = mac_socket_check_create(td->td_ucred, uap->domain, uap->type, uap->protocol); if (error) return (error); @@ -747,7 +747,7 @@ #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_send(td->td_ucred, so); + error = mac_socket_check_send(td->td_ucred, so); SOCK_UNLOCK(so); if (error) goto bad; @@ -961,7 +961,7 @@ #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_receive(td->td_ucred, so); + error = mac_socket_check_receive(td->td_ucred, so); SOCK_UNLOCK(so); if (error) { fdrop(fp, td); @@ -1863,7 +1863,7 @@ #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_send(td->td_ucred, so); + error = mac_socket_check_send(td->td_ucred, so); SOCK_UNLOCK(so); if (error) goto done; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 12:03:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCAC816A4DF for ; Thu, 6 Jul 2006 12:03:23 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D5CC43D46 for ; Thu, 6 Jul 2006 12:03:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C8DB046CFC for ; Thu, 6 Jul 2006 08:03:20 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 505A85B7B3; Thu, 6 Jul 2006 11:57:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 40A7C16A4DF; Thu, 6 Jul 2006 11:57:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1915F16A4DE for ; Thu, 6 Jul 2006 11:57:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B879943D45 for ; Thu, 6 Jul 2006 11:57: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.6/8.13.6) with ESMTP id k66BvXA6068451 for ; Thu, 6 Jul 2006 11:57:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66BvXvn068448 for perforce@freebsd.org; Thu, 6 Jul 2006 11:57:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 11:57:33 GMT Message-Id: <200607061157.k66BvXvn068448@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 100731 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 12:03:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=100731 Change 100731 by rwatson@rwatson_zoo on 2006/07/06 11:56:41 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_devs.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vfsops.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_devs.c#3 (text+ko) ==== @@ -181,7 +181,7 @@ de->de_mtime = de->de_atime = de->de_ctime; de->de_links = 1; #ifdef MAC - mac_init_devfsdirent(de); + mac_devfs_init(de); #endif return (de); } @@ -225,7 +225,7 @@ } #ifdef MAC - mac_create_devfs_directory(dmp->dm_mount, name, namelen, dd); + mac_devfs_create_directory(dmp->dm_mount, name, namelen, dd); #endif return (dd); } @@ -246,7 +246,7 @@ de->de_vnode = NULL; } #ifdef MAC - mac_destroy_devfsdirent(de); + mac_devfs_destroy(de); #endif if (de->de_inode > DEVFS_ROOTINO) { free_unr(devfs_inos, de->de_inode); @@ -417,7 +417,7 @@ de->de_inode = cdp->cdp_inode; de->de_cdp = cdp; #ifdef MAC - mac_create_devfs_device(cdp->cdp_c.si_cred, dm->dm_mount, + mac_devfs_create_device(cdp->cdp_c.si_cred, dm->dm_mount, &cdp->cdp_c, de); #endif de->de_dir = dd; ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vfsops.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include #include -#include +#include /* XXXRW: Is this needed? */ #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#3 (text+ko) ==== @@ -175,7 +175,7 @@ de->de_vnode = vp; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - mac_associate_vnode_devfs(mp, de, vp); + mac_devfs_vnode_associate(mp, de, vp); #endif *vpp = vp; return (0); @@ -1076,8 +1076,8 @@ vp = ap->a_vp; de = vp->v_data; - mac_relabel_vnode(ap->a_cred, vp, ap->a_label); - mac_update_devfsdirent(vp->v_mount, de, vp); + mac_vnode_relabel(ap->a_cred, vp, ap->a_label); + mac_devfs_update(vp->v_mount, de, vp); return (0); } @@ -1117,7 +1117,7 @@ bcopy(ap->a_target, de->de_symlink, i); sx_xlock(&dmp->dm_lock); #ifdef MAC - mac_create_devfs_symlink(ap->a_cnp->cn_cred, dmp->dm_mount, dd, de); + mac_devfs_create_symlink(ap->a_cnp->cn_cred, dmp->dm_mount, dd, de); #endif TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, td); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 12:03:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C721316A4E5 for ; Thu, 6 Jul 2006 12:03:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 982AE43D46 for ; Thu, 6 Jul 2006 12:03:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E399746D04 for ; Thu, 6 Jul 2006 08:03:45 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1CED858A2D; Thu, 6 Jul 2006 11:58:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C9CE16A4DF; Thu, 6 Jul 2006 11:58:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C73F316A4DD for ; Thu, 6 Jul 2006 11:58:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F2C243D45 for ; Thu, 6 Jul 2006 11:58:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66BwZA6068578 for ; Thu, 6 Jul 2006 11:58:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66BwZL3068575 for perforce@freebsd.org; Thu, 6 Jul 2006 11:58:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 11:58:35 GMT Message-Id: <200607061158.k66BwZL3068575@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 100732 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 12:03:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=100732 Change 100732 by rwatson@rwatson_zoo on 2006/07/06 11:57:44 Remove premature removal of ifndef on system calls, as mac.h needs to be included in kernel, and user space prototypes aren't desirbale. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac.h#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac.h#3 (text+ko) ==== @@ -68,6 +68,7 @@ typedef struct mac *mac_t; +#ifndef _KERNEL /* * Location of the userland MAC framework configuration file. mac.conf * binds policy names to shared libraries that understand those policies, @@ -102,5 +103,6 @@ int mac_syscall(const char *_policyname, int _call, void *_arg); int mac_to_text(mac_t mac, char **_text); __END_DECLS +#endif #endif /* !_SYS_MAC_H_ */ From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 12:07:16 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18CB616A4E1 for ; Thu, 6 Jul 2006 12:07:16 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9208243D5E for ; Thu, 6 Jul 2006 12:07:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CF6BA46D0D for ; Thu, 6 Jul 2006 08:06:59 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E88EE73F6C; Thu, 6 Jul 2006 12:00:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7520C16A51F; Thu, 6 Jul 2006 12:00:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F91216A540 for ; Thu, 6 Jul 2006 12:00:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C383643D46 for ; Thu, 6 Jul 2006 12:00: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.6/8.13.6) with ESMTP id k66C0cgw068758 for ; Thu, 6 Jul 2006 12:00:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66C0caI068754 for perforce@freebsd.org; Thu, 6 Jul 2006 12:00:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 12:00:38 GMT Message-Id: <200607061200.k66C0caI068754@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 100733 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 12:07:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=100733 Change 100733 by rwatson@rwatson_zoo on 2006/07/06 11:59:55 Rename delete to unlink for vnodes, since that is what is being authorized. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#7 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#15 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#7 (text+ko) ==== @@ -337,8 +337,6 @@ int mac_vnode_check_chroot(struct ucred *cred, struct vnode *dvp); int mac_vnode_check_create(struct ucred *cred, struct vnode *dvp, struct componentname *cnp, struct vattr *vap); -int mac_vnode_check_delete(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, struct componentname *cnp); int mac_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp, acl_type_t type); int mac_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp, @@ -386,6 +384,8 @@ struct timespec atime, struct timespec mtime); int mac_vnode_check_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); +int mac_vnode_check_unlink(struct ucred *cred, struct vnode *dvp, + struct vnode *vp, struct componentname *cnp); int mac_vnode_check_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp); ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#15 (text+ko) ==== @@ -581,9 +581,6 @@ typedef int (*mpo_vnode_check_create_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp, struct vattr *vap); -typedef int (*mpo_vnode_check_delete_t)(struct ucred *cred, - struct vnode *dvp, struct label *dlabel, - struct vnode *vp, struct label *label, struct componentname *cnp); typedef int (*mpo_vnode_check_deleteacl_t)(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type); @@ -658,6 +655,9 @@ typedef int (*mpo_vnode_check_stat_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); +typedef int (*mpo_vnode_check_unlink_t)(struct ucred *cred, + struct vnode *dvp, struct label *dlabel, + struct vnode *vp, struct label *label, typedef int (*mpo_vnode_check_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); @@ -896,7 +896,6 @@ mpo_check_vnode_chdir_t mpo_check_vnode_chdir; mpo_check_vnode_chroot_t mpo_check_vnode_chroot; mpo_vnode_check_create_t mpo_vnode_check_create; - mpo_vnode_check_delete_t mpo_vnode_check_delete; mpo_vnode_check_deleteacl_t mpo_vnode_check_deleteacl; mpo_vnode_check_deleteextattr_t mpo_vnode_check_deleteextattr; mpo_vnode_check_exec_t mpo_vnode_check_exec; @@ -924,6 +923,7 @@ mpo_vnode_check_setowner_t mpo_vnode_check_setowner; mpo_vnode_check_setutimes_t mpo_vnode_check_setutimes; mpo_vnode_check_stat_t mpo_vnode_check_stat; + mpo_vnode_check_unlink_t mpo_vnode_check_unlink; mpo_vnode_check_write_t mpo_vnode_check_write; }; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 12:10:02 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC44816A4E8 for ; Thu, 6 Jul 2006 12:10:01 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB14D43D55 for ; Thu, 6 Jul 2006 12:09:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1BD5E46D1A for ; Thu, 6 Jul 2006 08:09:47 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9B8735C44D; Thu, 6 Jul 2006 12:04:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B2C016A4E1; Thu, 6 Jul 2006 12:04:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BAFC16A4DE for ; Thu, 6 Jul 2006 12:04:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B888B43D53 for ; Thu, 6 Jul 2006 12:04:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66C4itp070168 for ; Thu, 6 Jul 2006 12:04:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66C4i0f070165 for perforce@freebsd.org; Thu, 6 Jul 2006 12:04:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 12:04:44 GMT Message-Id: <200607061204.k66C4i0f070165@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 100734 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 12:10:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=100734 Change 100734 by rwatson@rwatson_zoo on 2006/07/06 12:04:13 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/kern/init_main.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_acct.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_acl.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_environment.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_exit.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_jail.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_linker.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/kern/init_main.c#3 (text+ko) ==== @@ -445,7 +445,7 @@ audit_proc_kproc0(p); #endif #ifdef MAC - mac_create_proc0(p->p_ucred); + mac_proc_create_swapper(p->p_ucred); #endif td->td_ucred = crhold(p->p_ucred); @@ -704,7 +704,7 @@ oldcred = initproc->p_ucred; crcopy(newcred, oldcred); #ifdef MAC - mac_create_proc1(newcred); + mac_proc_create_init(newcred); #endif #ifdef AUDIT audit_proc_init(initproc); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_acct.c#3 (text+ko) ==== @@ -180,7 +180,7 @@ vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); #ifdef MAC - error = mac_check_system_acct(td->td_ucred, nd.ni_vp); + error = mac_system_check_acct(td->td_ucred, nd.ni_vp); if (error) { VOP_UNLOCK(nd.ni_vp, 0, td); vn_close(nd.ni_vp, flags, td->td_ucred, td); @@ -197,7 +197,7 @@ VFS_UNLOCK_GIANT(vfslocked); #ifdef MAC } else { - error = mac_check_system_acct(td->td_ucred, NULL); + error = mac_system_check_acct(td->td_ucred, NULL); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_acl.c#3 (text+ko) ==== @@ -673,7 +673,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_vnode_setacl(td->td_ucred, vp, type, &inkernacl); + error = mac_vnode_check_setacl(td->td_ucred, vp, type, &inkernacl); if (error != 0) goto out; #endif @@ -699,7 +699,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_vnode_getacl(td->td_ucred, vp, type); + error = mac_vnode_check_getacl(td->td_ucred, vp, type); if (error != 0) goto out; #endif @@ -728,7 +728,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_vnode_deleteacl(td->td_ucred, vp, type); + error = mac_vnode_check_deleteacl(td->td_ucred, vp, type); if (error) goto out; #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_environment.c#3 (text+ko) ==== @@ -95,7 +95,7 @@ error = 0; if (uap->what == KENV_DUMP) { #ifdef MAC - error = mac_check_kenv_dump(td->td_ucred); + error = mac_kenv_check_dump(td->td_ucred); if (error) return (error); #endif @@ -138,7 +138,7 @@ switch (uap->what) { case KENV_GET: #ifdef MAC - error = mac_check_kenv_get(td->td_ucred, name); + error = mac_kenv_check_get(td->td_ucred, name); if (error) goto done; #endif @@ -171,7 +171,7 @@ goto done; } #ifdef MAC - error = mac_check_kenv_set(td->td_ucred, name, value); + error = mac_kenv_check_set(td->td_ucred, name, value); if (error == 0) #endif setenv(name, value); @@ -179,7 +179,7 @@ break; case KENV_UNSET: #ifdef MAC - error = mac_check_kenv_unset(td->td_ucred, name); + error = mac_kenv_check_unset(td->td_ucred, name); if (error) goto done; #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#3 (text+ko) ==== @@ -437,7 +437,7 @@ NDFREE(ndp, NDF_ONLY_PNBUF); #ifdef MAC interplabel = mac_vnode_label_alloc(); - mac_copy_vnode_label(ndp->ni_vp->v_label, interplabel); + mac_vnode_copy_label(ndp->ni_vp->v_label, interplabel); #endif vput(ndp->ni_vp); vm_object_deallocate(imgp->object); @@ -1187,7 +1187,7 @@ return (error); #ifdef MAC - error = mac_check_vnode_exec(td->td_ucred, imgp->vp, imgp); + error = mac_vnode_check_exec(td->td_ucred, imgp->vp, imgp); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_exit.c#3 (text+ko) ==== @@ -813,7 +813,7 @@ */ vm_waitproc(p); #ifdef MAC - mac_destroy_proc(p); + mac_proc_destroy(p); #endif #ifdef AUDIT audit_proc_free(p); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#3 (text+ko) ==== @@ -288,7 +288,7 @@ /* Allocate new proc. */ newproc = uma_zalloc(proc_zone, M_WAITOK); #ifdef MAC - mac_init_proc(newproc); + mac_proc_init(newproc); #endif #ifdef AUDIT audit_proc_alloc(newproc); @@ -758,7 +758,7 @@ td->td_ucred->cr_ruid); sx_xunlock(&allproc_lock); #ifdef MAC - mac_destroy_proc(newproc); + mac_proc_destroy(newproc); #endif #ifdef AUDIT audit_proc_free(newproc); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_jail.c#3 (text+ko) ==== @@ -225,7 +225,7 @@ if ((error = change_dir(pr->pr_root, td)) != 0) goto e_unlock; #ifdef MAC - if ((error = mac_check_vnode_chroot(td->td_ucred, pr->pr_root))) + if ((error = mac_vnode_check_chroot(td->td_ucred, pr->pr_root))) goto e_unlock; #endif VOP_UNLOCK(pr->pr_root, 0, td); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#3 (text+ko) ==== @@ -949,7 +949,7 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); #ifdef MAC - error = mac_check_vnode_write(cred, NOCRED, vp); + error = mac_vnode_check_write(cred, NOCRED, vp); if (error == 0) #endif error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_linker.c#3 (text+ko) ==== @@ -552,7 +552,7 @@ if (securelevel > 0) return (EPERM); #ifdef MAC - error = mac_check_kld_unload(curthread->td_ucred); + error = mac_kld_check_unload(curthread->td_ucred); if (error) return (error); #endif @@ -985,7 +985,7 @@ int error; #ifdef MAC - error = mac_check_kld_stat(td->td_ucred); + error = mac_kld_check_stat(td->td_ucred); if (error) return (error); #endif @@ -1019,7 +1019,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_stat(td->td_ucred); + error = mac_kld_check_stat(td->td_ucred); if (error) return (error); #endif @@ -1065,7 +1065,7 @@ return (EINVAL); #ifdef MAC - error = mac_check_kld_stat(td->td_ucred); + error = mac_kld_check_stat(td->td_ucred); if (error) return (error); #endif @@ -1103,7 +1103,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_stat(td->td_ucred); + error = mac_kld_check_stat(td->td_ucred); if (error) return (error); #endif @@ -1138,7 +1138,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_stat(td->td_ucred); + error = mac_kld_check_stat(td->td_ucred); if (error) return (error); #endif @@ -1983,7 +1983,7 @@ int error; #ifdef MAC - error = mac_check_kld_stat(req->td->td_ucred); + error = mac_kld_check_stat(req->td->td_ucred); if (error) return (error); #endif From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 12:11:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1873516A4E6 for ; Thu, 6 Jul 2006 12:11:24 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A78943D49 for ; Thu, 6 Jul 2006 12:11:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C184746CED for ; Thu, 6 Jul 2006 08:11:16 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id F3B8273A0B; Thu, 6 Jul 2006 12:05:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D738F16A4E5; Thu, 6 Jul 2006 12:05:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B57C516A4E0 for ; Thu, 6 Jul 2006 12:05:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29AD043D5A for ; Thu, 6 Jul 2006 12:05:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66C5ke1070258 for ; Thu, 6 Jul 2006 12:05:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66C5jhu070255 for perforce@freebsd.org; Thu, 6 Jul 2006 12:05:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 12:05:45 GMT Message-Id: <200607061205.k66C5jhu070255@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 100735 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 12:11:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=100735 Change 100735 by rwatson@rwatson_zoo on 2006/07/06 12:05:06 Correct error made when renaming _unlink. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#16 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#16 (text+ko) ==== @@ -581,7 +581,6 @@ typedef int (*mpo_vnode_check_create_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp, struct vattr *vap); - struct componentname *cnp); typedef int (*mpo_vnode_check_deleteacl_t)(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type); typedef int (*mpo_vnode_check_deleteextattr_t)(struct ucred *cred, @@ -658,6 +657,7 @@ typedef int (*mpo_vnode_check_unlink_t)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp); typedef int (*mpo_vnode_check_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 12:16:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 348F416A4E1 for ; Thu, 6 Jul 2006 12:16:59 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D914B43D5C for ; Thu, 6 Jul 2006 12:16:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7A0EC46D0D for ; Thu, 6 Jul 2006 08:16:55 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DA94C73DA2; Thu, 6 Jul 2006 12:08:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C9D2016A4E1; Thu, 6 Jul 2006 12:08:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DA5716A4DE for ; Thu, 6 Jul 2006 12:08:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D0C343D46 for ; Thu, 6 Jul 2006 12:08:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66C8oBD070438 for ; Thu, 6 Jul 2006 12:08:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66C8nJt070435 for perforce@freebsd.org; Thu, 6 Jul 2006 12:08:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 12:08:49 GMT Message-Id: <200607061208.k66C8nJt070435@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 100736 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 12:16:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=100736 Change 100736 by rwatson@rwatson_zoo on 2006/07/06 12:08:24 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_internal.h#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_internal.h#2 (text+ko) ==== @@ -2,6 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2004 Networks Associates Technology, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -113,30 +114,30 @@ struct label *mac_socket_label_alloc(int flag); void mac_socket_label_free(struct label *label); -int mac_check_cred_relabel(struct ucred *cred, struct label *newlabel); -int mac_externalize_cred_label(struct label *label, char *elements, +int mac_cred_check_relabel(struct ucred *cred, struct label *newlabel); +int mac_cred_externalize_label(struct label *label, char *elements, char *outbuf, size_t outbuflen); -int mac_internalize_cred_label(struct label *label, char *string); -void mac_relabel_cred(struct ucred *cred, struct label *newlabel); +int mac_cred_internalize_label(struct label *label, char *string); +void mac_cred_relabel(struct ucred *cred, struct label *newlabel); struct label *mac_mbuf_to_label(struct mbuf *m); -void mac_copy_pipe_label(struct label *src, struct label *dest); -int mac_externalize_pipe_label(struct label *label, char *elements, +void mac_pipe_copy_label(struct label *src, struct label *dest); +int mac_pipe_externalize_label(struct label *label, char *elements, char *outbuf, size_t outbuflen); -int mac_internalize_pipe_label(struct label *label, char *string); +int mac_pipe_internalize_label(struct label *label, char *string); int mac_socket_label_set(struct ucred *cred, struct socket *so, struct label *label); -void mac_copy_socket_label(struct label *src, struct label *dest); -int mac_externalize_socket_label(struct label *label, char *elements, +void mac_socket_copy_label(struct label *src, struct label *dest); +int mac_socket_externalize_label(struct label *label, char *elements, char *outbuf, size_t outbuflen); -int mac_internalize_socket_label(struct label *label, char *string); +int mac_socket_internalize_label(struct label *label, char *string); -int mac_externalize_vnode_label(struct label *label, char *elements, +int mac_vnode_externalize_label(struct label *label, char *elements, char *outbuf, size_t outbuflen); -int mac_internalize_vnode_label(struct label *label, char *string); -void mac_check_vnode_mmap_downgrade(struct ucred *cred, struct vnode *vp, +int mac_vnode_internalize_label(struct label *label, char *string); +void mac_vnode_check_mmap_downgrade(struct ucred *cred, struct vnode *vp, int *prot); int vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 12:19:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C417F16A4DE for ; Thu, 6 Jul 2006 12:19:06 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBA7343D46 for ; Thu, 6 Jul 2006 12:18:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7F5E746D18 for ; Thu, 6 Jul 2006 08:18:45 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 30BFE739C3; Thu, 6 Jul 2006 12:11:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 20BEB16A4E1; Thu, 6 Jul 2006 12:11:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFA4516A4DF for ; Thu, 6 Jul 2006 12:11:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A332D43D46 for ; Thu, 6 Jul 2006 12:11:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66CBsxW070658 for ; Thu, 6 Jul 2006 12:11:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66CBsK2070655 for perforce@freebsd.org; Thu, 6 Jul 2006 12:11:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 12:11:54 GMT Message-Id: <200607061211.k66CBsK2070655@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 100737 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 12:19:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=100737 Change 100737 by rwatson@rwatson_zoo on 2006/07/06 12:11:04 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2005 Networks Associates Technology, Inc. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -456,8 +456,8 @@ LIST_INSERT_HEAD(&mac_policy_list, mpc, mpc_list); /* Per-policy initialization. */ - if (mpc->mpc_ops->mpo_init != NULL) - (*(mpc->mpc_ops->mpo_init))(mpc); + if (mpc->mpc_ops->mpo_policy_init != NULL) + (*(mpc->mpc_ops->mpo_policy_init))(mpc); mac_policy_updateflags(); printf("Security policy loaded: %s (%s)\n", mpc->mpc_fullname, @@ -499,8 +499,8 @@ mac_policy_release_exclusive(); return (EBUSY); } - if (mpc->mpc_ops->mpo_destroy != NULL) - (*(mpc->mpc_ops->mpo_destroy))(mpc); + if (mpc->mpc_ops->mpo_policy_destroy != NULL) + (*(mpc->mpc_ops->mpo_policy_destroy))(mpc); LIST_REMOVE(mpc, mpc_list); mpc->mpc_runtime_flags &= ~MPC_RUNTIME_FLAG_REGISTERED; @@ -622,7 +622,7 @@ } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - error = mac_externalize_cred_label(tcred->cr_label, elements, + error = mac_cred_externalize_label(tcred->cr_label, elements, buffer, mac.m_buflen); if (error == 0) error = copyout(buffer, mac.m_string, strlen(buffer)+1); @@ -659,7 +659,7 @@ } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - error = mac_externalize_cred_label(td->td_ucred->cr_label, + error = mac_cred_externalize_label(td->td_ucred->cr_label, elements, buffer, mac.m_buflen); if (error == 0) error = copyout(buffer, mac.m_string, strlen(buffer)+1); @@ -698,7 +698,7 @@ } intlabel = mac_cred_label_alloc(); - error = mac_internalize_cred_label(intlabel, buffer); + error = mac_cred_internalize_label(intlabel, buffer); free(buffer, M_MACTEMP); if (error) goto out; @@ -709,7 +709,7 @@ PROC_LOCK(p); oldcred = p->p_ucred; - error = mac_check_cred_relabel(oldcred, intlabel); + error = mac_cred_check_relabel(oldcred, intlabel); if (error) { PROC_UNLOCK(p); crfree(newcred); @@ -718,7 +718,7 @@ setsugid(p); crcopy(newcred, oldcred); - mac_relabel_cred(newcred, intlabel); + mac_cred_relabel(newcred, intlabel); p->p_ucred = newcred; /* @@ -784,10 +784,10 @@ intlabel = mac_vnode_label_alloc(); vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - mac_copy_vnode_label(vp->v_label, intlabel); + mac_vnode_copy_label(vp->v_label, intlabel); VOP_UNLOCK(vp, 0, td); VFS_UNLOCK_GIANT(vfslocked); - error = mac_externalize_vnode_label(intlabel, elements, + error = mac_vnode_externalize_label(intlabel, elements, buffer, mac.m_buflen); mac_vnode_label_free(intlabel); break; @@ -796,9 +796,9 @@ pipe = fp->f_data; intlabel = mac_pipe_label_alloc(); PIPE_LOCK(pipe); - mac_copy_pipe_label(pipe->pipe_pair->pp_label, intlabel); + mac_pipe_copy_label(pipe->pipe_pair->pp_label, intlabel); PIPE_UNLOCK(pipe); - error = mac_externalize_pipe_label(intlabel, elements, + error = mac_pipe_externalize_label(intlabel, elements, buffer, mac.m_buflen); mac_pipe_label_free(intlabel); break; @@ -808,10 +808,10 @@ intlabel = mac_socket_label_alloc(M_WAITOK); NET_LOCK_GIANT(); SOCK_LOCK(so); - mac_copy_socket_label(so->so_label, intlabel); + mac_socket_copy_label(so->so_label, intlabel); SOCK_UNLOCK(so); NET_UNLOCK_GIANT(); - error = mac_externalize_socket_label(intlabel, elements, + error = mac_socket_externalize_label(intlabel, elements, buffer, mac.m_buflen); mac_socket_label_free(intlabel); break; @@ -865,8 +865,8 @@ intlabel = mac_vnode_label_alloc(); vfslocked = NDHASGIANT(&nd); - mac_copy_vnode_label(nd.ni_vp->v_label, intlabel); - error = mac_externalize_vnode_label(intlabel, elements, buffer, + mac_vnode_copy_label(nd.ni_vp->v_label, intlabel); + error = mac_vnode_externalize_label(intlabel, elements, buffer, mac.m_buflen); NDFREE(&nd, 0); @@ -918,8 +918,8 @@ intlabel = mac_vnode_label_alloc(); vfslocked = NDHASGIANT(&nd); - mac_copy_vnode_label(nd.ni_vp->v_label, intlabel); - error = mac_externalize_vnode_label(intlabel, elements, buffer, + mac_vnode_copy_label(nd.ni_vp->v_label, intlabel); + error = mac_vnode_externalize_label(intlabel, elements, buffer, mac.m_buflen); NDFREE(&nd, 0); VFS_UNLOCK_GIANT(vfslocked); @@ -974,7 +974,7 @@ case DTYPE_FIFO: case DTYPE_VNODE: intlabel = mac_vnode_label_alloc(); - error = mac_internalize_vnode_label(intlabel, buffer); + error = mac_vnode_internalize_label(intlabel, buffer); if (error) { mac_vnode_label_free(intlabel); break; @@ -997,7 +997,7 @@ case DTYPE_PIPE: intlabel = mac_pipe_label_alloc(); - error = mac_internalize_pipe_label(intlabel, buffer); + error = mac_pipe_internalize_label(intlabel, buffer); if (error == 0) { pipe = fp->f_data; PIPE_LOCK(pipe); @@ -1010,7 +1010,7 @@ case DTYPE_SOCKET: intlabel = mac_socket_label_alloc(M_WAITOK); - error = mac_internalize_socket_label(intlabel, buffer); + error = mac_socket_internalize_label(intlabel, buffer); if (error == 0) { so = fp->f_data; NET_LOCK_GIANT(); @@ -1059,7 +1059,7 @@ } intlabel = mac_vnode_label_alloc(); - error = mac_internalize_vnode_label(intlabel, buffer); + error = mac_vnode_internalize_label(intlabel, buffer); free(buffer, M_MACTEMP); if (error) goto out; @@ -1113,7 +1113,7 @@ } intlabel = mac_vnode_label_alloc(); - error = mac_internalize_vnode_label(intlabel, buffer); + error = mac_vnode_internalize_label(intlabel, buffer); free(buffer, M_MACTEMP); if (error) goto out; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 12:51:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 99E6516A4DF for ; Thu, 6 Jul 2006 12:51:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D433E43D49 for ; Thu, 6 Jul 2006 12:51:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D7FB546CE3 for ; Thu, 6 Jul 2006 08:51:46 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 36BD856A25; Thu, 6 Jul 2006 12:51:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2721416A4E0; Thu, 6 Jul 2006 12:51:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F36F016A4DA for ; Thu, 6 Jul 2006 12:51:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9988643D45 for ; Thu, 6 Jul 2006 12:51:45 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66Cpjap080720 for ; Thu, 6 Jul 2006 12:51:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66CpjhU080717 for perforce@freebsd.org; Thu, 6 Jul 2006 12:51:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 12:51:45 GMT Message-Id: <200607061251.k66CpjhU080717@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 100740 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 12:51:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=100740 Change 100740 by rwatson@rwatson_zoo on 2006/07/06 12:51:34 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mbuf.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_prot.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_shutdown.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_sysctl.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_time.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/link_elf.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sys_pipe.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sys_socket.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_mbuf.c#3 (text+ko) ==== @@ -328,7 +328,7 @@ SLIST_INIT(&m->m_pkthdr.tags); #ifdef MAC /* If the label init fails, fail the alloc */ - error = mac_init_mbuf(m, how); + error = mac_mbuf_init(m, how); if (error) return (error); #endif @@ -526,7 +526,7 @@ SLIST_INIT(&m->m_pkthdr.tags); #ifdef MAC /* If the label init fails, fail the alloc */ - error = mac_init_mbuf(m, how); + error = mac_mbuf_init(m, how); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_prot.c#3 (text+ko) ==== @@ -505,7 +505,7 @@ oldcred = p->p_ucred; #ifdef MAC - error = mac_check_proc_setuid(p, oldcred, uid); + error = mac_proc_check_setuid(p, oldcred, uid); if (error) goto fail; #endif @@ -619,7 +619,7 @@ oldcred = p->p_ucred; #ifdef MAC - error = mac_check_proc_seteuid(p, oldcred, euid); + error = mac_proc_check_seteuid(p, oldcred, euid); if (error) goto fail; #endif @@ -675,7 +675,7 @@ oldcred = p->p_ucred; #ifdef MAC - error = mac_check_proc_setgid(p, oldcred, gid); + error = mac_proc_check_setgid(p, oldcred, gid); if (error) goto fail; #endif @@ -776,7 +776,7 @@ oldcred = p->p_ucred; #ifdef MAC - error = mac_check_proc_setegid(p, oldcred, egid); + error = mac_proc_check_setegid(p, oldcred, egid); if (error) goto fail; #endif @@ -835,7 +835,7 @@ oldcred = p->p_ucred; #ifdef MAC - error = mac_check_proc_setgroups(p, oldcred, ngrp, + error = mac_proc_check_setgroups(p, oldcred, ngrp, tempcred->cr_groups); if (error) goto fail; @@ -907,7 +907,7 @@ oldcred = p->p_ucred; #ifdef MAC - error = mac_check_proc_setreuid(p, oldcred, ruid, euid); + error = mac_proc_check_setreuid(p, oldcred, ruid, euid); if (error) goto fail; #endif @@ -975,7 +975,7 @@ oldcred = p->p_ucred; #ifdef MAC - error = mac_check_proc_setregid(p, oldcred, rgid, egid); + error = mac_proc_check_setregid(p, oldcred, rgid, egid); if (error) goto fail; #endif @@ -1050,7 +1050,7 @@ oldcred = p->p_ucred; #ifdef MAC - error = mac_check_proc_setresuid(p, oldcred, ruid, euid, suid); + error = mac_proc_check_setresuid(p, oldcred, ruid, euid, suid); if (error) goto fail; #endif @@ -1131,7 +1131,7 @@ oldcred = p->p_ucred; #ifdef MAC - error = mac_check_proc_setresgid(p, oldcred, rgid, egid, sgid); + error = mac_proc_check_setresgid(p, oldcred, rgid, egid, sgid); if (error) goto fail; #endif @@ -1481,7 +1481,7 @@ if ((error = prison_check(u1, u2))) return (error); #ifdef MAC - if ((error = mac_check_cred_visible(u1, u2))) + if ((error = mac_cred_check_visible(u1, u2))) return (error); #endif if ((error = cr_seeotheruids(u1, u2))) @@ -1542,7 +1542,7 @@ if (error) return (error); #ifdef MAC - if ((error = mac_check_proc_signal(cred, proc, signum))) + if ((error = mac_proc_check_signal(cred, proc, signum))) return (error); #endif if ((error = cr_seeotheruids(cred, proc->p_ucred))) @@ -1661,7 +1661,7 @@ if ((error = prison_check(td->td_ucred, p->p_ucred))) return (error); #ifdef MAC - if ((error = mac_check_proc_sched(td->td_ucred, p))) + if ((error = mac_proc_check_sched(td->td_ucred, p))) return (error); #endif if ((error = cr_seeotheruids(td->td_ucred, p->p_ucred))) @@ -1724,7 +1724,7 @@ if ((error = prison_check(td->td_ucred, p->p_ucred))) return (error); #ifdef MAC - if ((error = mac_check_proc_debug(td->td_ucred, p))) + if ((error = mac_proc_check_debug(td->td_ucred, p))) return (error); #endif if ((error = cr_seeotheruids(td->td_ucred, p->p_ucred))) @@ -1805,7 +1805,7 @@ return (ENOENT); #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_visible(cred, so); + error = mac_socket_check_visible(cred, so); SOCK_UNLOCK(so); if (error) return (error); @@ -1837,7 +1837,7 @@ if ((error = prison_check(td->td_ucred, p->p_ucred))) return (error); #ifdef MAC - if ((error = mac_check_proc_wait(td->td_ucred, p))) + if ((error = mac_proc_check_wait(td->td_ucred, p))) return (error); #endif #if 0 @@ -1861,7 +1861,7 @@ MALLOC(cr, struct ucred *, sizeof(*cr), M_CRED, M_WAITOK | M_ZERO); refcount_init(&cr->cr_ref, 1); #ifdef MAC - mac_init_cred(cr); + mac_cred_init(cr); #endif return (cr); } @@ -1905,7 +1905,7 @@ if (jailed(cr)) prison_free(cr->cr_prison); #ifdef MAC - mac_destroy_cred(cr); + mac_cred_destroy(cr); #endif FREE(cr, M_CRED); } @@ -1939,7 +1939,7 @@ if (jailed(dest)) prison_hold(dest->cr_prison); #ifdef MAC - mac_copy_cred(src, dest); + mac_cred_copy(src, dest); #endif } ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_shutdown.c#3 (text+ko) ==== @@ -160,7 +160,7 @@ error = 0; #ifdef MAC - error = mac_check_system_reboot(td->td_ucred, uap->opt); + error = mac_system_check_reboot(td->td_ucred, uap->opt); #endif if (error == 0) error = suser(td); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_sysctl.c#3 (text+ko) ==== @@ -1273,7 +1273,7 @@ arg2 = oid->oid_arg2; } #ifdef MAC - error = mac_check_system_sysctl(req->td->td_ucred, oid, arg1, arg2, + error = mac_system_check_sysctl(req->td->td_ucred, oid, arg1, arg2, req); if (error != 0) return (error); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_time.c#3 (text+ko) ==== @@ -281,7 +281,7 @@ int error; #ifdef MAC - error = mac_check_system_settime(td->td_ucred); + error = mac_system_check_settime(td->td_ucred); if (error) return (error); #endif @@ -499,7 +499,7 @@ int error; #ifdef MAC - error = mac_check_system_settime(td->td_ucred); + error = mac_system_check_settime(td->td_ucred); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/link_elf.c#3 (text+ko) ==== @@ -570,7 +570,7 @@ vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); #ifdef MAC - error = mac_check_kld_load(curthread->td_ucred, nd.ni_vp); + error = mac_kld_check_load(curthread->td_ucred, nd.ni_vp); if (error) { firstpage = NULL; goto out; ==== //depot/projects/trustedbsd/mac2/sys/kern/sys_pipe.c#3 (text+ko) ==== @@ -340,11 +340,11 @@ #ifdef MAC /* * The MAC label is shared between the connected endpoints. As a - * result mac_init_pipe() and mac_create_pipe() are called once + * result mac_pipe_init() and mac_create_pipe() are called once * for the pair, and not on the endpoints. */ - mac_init_pipe(pp); - mac_create_pipe(td->td_ucred, pp); + mac_pipe_init(pp); + mac_pipe_create(td->td_ucred, pp); #endif rpipe = &pp->pp_rpipe; wpipe = &pp->pp_wpipe; @@ -593,7 +593,7 @@ goto unlocked_error; #ifdef MAC - error = mac_check_pipe_read(active_cred, rpipe->pipe_pair); + error = mac_pipe_check_read(active_cred, rpipe->pipe_pair); if (error) goto locked_error; #endif @@ -1003,7 +1003,7 @@ return (EPIPE); } #ifdef MAC - error = mac_check_pipe_write(active_cred, wpipe->pipe_pair); + error = mac_pipe_check_write(active_cred, wpipe->pipe_pair); if (error) { pipeunlock(wpipe); PIPE_UNLOCK(rpipe); @@ -1268,7 +1268,7 @@ PIPE_LOCK(mpipe); #ifdef MAC - error = mac_check_pipe_ioctl(active_cred, mpipe->pipe_pair, cmd, data); + error = mac_pipe_check_ioctl(active_cred, mpipe->pipe_pair, cmd, data); if (error) { PIPE_UNLOCK(mpipe); return (error); @@ -1342,7 +1342,7 @@ wpipe = rpipe->pipe_peer; PIPE_LOCK(rpipe); #ifdef MAC - error = mac_check_pipe_poll(active_cred, rpipe->pipe_pair); + error = mac_pipe_check_poll(active_cred, rpipe->pipe_pair); if (error) goto locked_error; #endif @@ -1398,7 +1398,7 @@ int error; PIPE_LOCK(pipe); - error = mac_check_pipe_stat(active_cred, pipe->pipe_pair); + error = mac_pipe_check_stat(active_cred, pipe->pipe_pair); PIPE_UNLOCK(pipe); if (error) return (error); @@ -1527,7 +1527,7 @@ if (ppipe->pipe_present == 0) { PIPE_UNLOCK(cpipe); #ifdef MAC - mac_destroy_pipe(pp); + mac_pipe_destroy(pp); #endif uma_zfree(pipe_zone, cpipe->pipe_pair); } else ==== //depot/projects/trustedbsd/mac2/sys/kern/sys_socket.c#3 (text+ko) ==== @@ -81,7 +81,7 @@ NET_LOCK_GIANT(); #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_receive(active_cred, so); + error = mac_socket_check_receive(active_cred, so); SOCK_UNLOCK(so); if (error) { NET_UNLOCK_GIANT(); @@ -108,7 +108,7 @@ NET_LOCK_GIANT(); #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_send(active_cred, so); + error = mac_socket_check_send(active_cred, so); SOCK_UNLOCK(so); if (error) { NET_UNLOCK_GIANT(); @@ -236,7 +236,7 @@ NET_LOCK_GIANT(); #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_poll(active_cred, so); + error = mac_socket_check_poll(active_cred, so); SOCK_UNLOCK(so); if (error) { NET_UNLOCK_GIANT(); @@ -265,7 +265,7 @@ NET_LOCK_GIANT(); #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_stat(active_cred, so); + error = mac_socket_check_stat(active_cred, so); SOCK_UNLOCK(so); if (error) { NET_UNLOCK_GIANT(); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 12:57:09 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4FCDF16A587 for ; Thu, 6 Jul 2006 12:57:09 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F38E443D5C for ; Thu, 6 Jul 2006 12:57:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9D79E46D14 for ; Thu, 6 Jul 2006 08:57:04 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D34D5739B3; Thu, 6 Jul 2006 12:56:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id ED85D16A503; Thu, 6 Jul 2006 12:56:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B00C916A500 for ; Thu, 6 Jul 2006 12:56:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59F2E43D46 for ; Thu, 6 Jul 2006 12:56:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66CuqVw081027 for ; Thu, 6 Jul 2006 12:56:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66CuqTe081024 for perforce@freebsd.org; Thu, 6 Jul 2006 12:56:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 12:56:52 GMT Message-Id: <200607061256.k66CuqTe081024@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 100741 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 12:57:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=100741 Change 100741 by rwatson@rwatson_zoo on 2006/07/06 12:56:11 Further system v ipc renaming. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#8 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#17 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#8 (text+ko) ==== @@ -262,54 +262,54 @@ int mac_socket_setsockopt_label(struct ucred *cred, struct socket *so, struct mac *extmac); -void mac_sysv_msq_init(struct msqid_kernel*); -void mac_sysv_msq_destroy(struct msqid_kernel *); -void mac_sysv_msq_cleanup(struct msqid_kernel *msqkptr); -void mac_sysv_msq_create_msg(struct ucred *cred, +void mac_sysvmsq_init(struct msqid_kernel*); +void mac_sysvmsq_destroy(struct msqid_kernel *); +void mac_sysvmsq_cleanup(struct msqid_kernel *msqkptr); +void mac_sysvmsq_create_msg(struct ucred *cred, struct msqid_kernel *msqkptr, struct msg *msgptr); -void mac_sysv_msq_create(struct ucred *cred, +void mac_sysvmsq_create(struct ucred *cred, struct msqid_kernel *msqkptr); -int mac_sysv_msq_check_msgmsq(struct ucred *cred, struct msg *msgptr, +int mac_sysvmsq_check_msgmsq(struct ucred *cred, struct msg *msgptr, struct msqid_kernel *msqkptr); -int mac_sysv_msq_check_msgrcv(struct ucred *cred, struct msg *msgptr); -int mac_sysv_msq_check_msgrmid(struct ucred *cred, struct msg *msgptr); -int mac_sysv_msq_check_msqget(struct ucred *cred, +int mac_sysvmsq_check_msgrcv(struct ucred *cred, struct msg *msgptr); +int mac_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr); +int mac_sysvmsq_check_msqget(struct ucred *cred, struct msqid_kernel *msqkptr); -int mac_sysv_msq_check_msqsnd(struct ucred *cred, +int mac_sysvmsq_check_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr); -int mac_sysv_msq_check_msqrcv(struct ucred *cred, +int mac_sysvmsq_check_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr); -int mac_sysv_msq_check_msqctl(struct ucred *cred, +int mac_sysvmsq_check_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, int cmd); -void mac_sysv_msg_init(struct msg *); -void mac_sysv_msg_destroy(struct msg *); -void mac_sysv_msg_cleanup(struct msg *msgptr); +void mac_sysvmsg_init(struct msg *); +void mac_sysvmsg_destroy(struct msg *); +void mac_sysvmsg_cleanup(struct msg *msgptr); -void mac_sysv_sem_init(struct semid_kernel*); -void mac_sysv_sem_destroy(struct semid_kernel *); -void mac_sysv_sem_create(struct ucred *cred, +void mac_sysvsem_init(struct semid_kernel*); +void mac_sysvsem_destroy(struct semid_kernel *); +void mac_sysvsem_create(struct ucred *cred, struct semid_kernel *semakptr); -void mac_sysv_sem_cleanup_sysv_sem(struct semid_kernel *semakptr); -int mac_sysv_sem_check_semctl(struct ucred *cred, +void mac_sysvsem_cleanup_sysvsem(struct semid_kernel *semakptr); +int mac_sysvsem_check_semctl(struct ucred *cred, struct semid_kernel *semakptr, int cmd); -int mac_sysv_sem_check_semget(struct ucred *cred, +int mac_sysvsem_check_semget(struct ucred *cred, struct semid_kernel *semakptr); -int mac_sysv_sem_check_semop(struct ucred *cred, +int mac_sysvsem_check_semop(struct ucred *cred, struct semid_kernel *semakptr, size_t accesstype); -void mac_sysv_shm_init(struct shmid_kernel*); -void mac_sysv_shm_destroy(struct shmid_kernel *); -void mac_sysv_shm_create(struct ucred *cred, +void mac_sysvshm_init(struct shmid_kernel*); +void mac_sysvshm_destroy(struct shmid_kernel *); +void mac_sysvshm_create(struct ucred *cred, struct shmid_kernel *shmsegptr); -void mac_sysv_shm_cleanup(struct shmid_kernel *shmsegptr); -int mac_sysv_shm_check_shmat(struct ucred *cred, +void mac_sysvshm_cleanup(struct shmid_kernel *shmsegptr); +int mac_sysvshm_check_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, int shmflg); -int mac_sysv_shm_check_shmctl(struct ucred *cred, +int mac_sysvshm_check_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, int cmd); -int mac_sysv_shm_check_shmdt(struct ucred *cred, +int mac_sysvshm_check_shmdt(struct ucred *cred, struct shmid_kernel *shmsegptr); -int mac_sysv_shm_check_shmget(struct ucred *cred, +int mac_sysvshm_check_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, int shmflg); int mac_execve_enter(struct image_params *imgp, struct mac *mac_p); ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#17 (text+ko) ==== @@ -390,72 +390,72 @@ /* * Object: struct msqid_kernel (System V message queue) */ -typedef void (*mpo_sysv_msq_init_label_t)(struct label *label); -typedef void (*mpo_sysv_msq_destroy_t)(struct label *label); -typedef void (*mpo_sysv_msq_cleanup_t)(struct label *msqlabel); -typedef void (*mpo_sysv_msq_create_msg_t)(struct ucred *cred, +typedef void (*mpo_sysvmsq_init_label_t)(struct label *label); +typedef void (*mpo_sysvmsq_destroy_t)(struct label *label); +typedef void (*mpo_sysvmsq_cleanup_t)(struct label *msqlabel); +typedef void (*mpo_sysvmsq_create_msg_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel); -typedef void (*mpo_sysv_msq_create_t)(struct ucred *cred, +typedef void (*mpo_sysvmsq_create_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel); -typedef int (*mpo_sysv_msq_check_msgmsq_t)(struct ucred *cred, +typedef int (*mpo_sysvmsq_check_msgmsq_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msq_check_msgrcv_t)(struct ucred *cred, +typedef int (*mpo_sysvmsq_check_msgrcv_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel); -typedef int (*mpo_sysv_msq_check_msgrmid_t)(struct ucred *cred, +typedef int (*mpo_sysvmsq_check_msgrmid_t)(struct ucred *cred, struct msg *msgptr, struct label *msglabel); -typedef int (*mpo_sysv_msq_check_msqget_t)(struct ucred *cred, +typedef int (*mpo_sysvmsq_check_msqget_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msq_check_msqsnd_t)(struct ucred *cred, +typedef int (*mpo_sysvmsq_check_msqsnd_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msq_check_msqrcv_t)(struct ucred *cred, +typedef int (*mpo_sysvmsq_check_msqrcv_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel); -typedef int (*mpo_sysv_msq_check_msqctl_t)(struct ucred *cred, +typedef int (*mpo_sysvmsq_check_msqctl_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd); /* * Object: struct msg (System V message) */ -typedef void (*mpo_sysv_msg_init_label_t)(struct label *label); -typedef void (*mpo_sysv_msg_destroy_label_t)(struct label *label); -typedef void (*mpo_sysv_msg_cleanup_t)(struct label *msglabel); +typedef void (*mpo_sysvmsg_init_label_t)(struct label *label); +typedef void (*mpo_sysvmsg_destroy_label_t)(struct label *label); +typedef void (*mpo_sysvmsg_cleanup_t)(struct label *msglabel); /* * Object: struct semid_kernel (System V IPC semaphore) */ -typedef void (*mpo_sysv_sem_init_label_t)(struct label *label); -typedef void (*mpo_sysv_sem_destroy_label_t)(struct label *label); -typedef void (*mpo_sysv_sem_cleanup_t)(struct label *semalabel); -typedef void (*mpo_sysv_sem_create_t)(struct ucred *cred, +typedef void (*mpo_sysvsem_init_label_t)(struct label *label); +typedef void (*mpo_sysvsem_destroy_label_t)(struct label *label); +typedef void (*mpo_sysvsem_cleanup_t)(struct label *semalabel); +typedef void (*mpo_sysvsem_create_t)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel); -typedef int (*mpo_sysv_sem_check_semctl_t)(struct ucred *cred, +typedef int (*mpo_sysvsem_check_semctl_t)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, int cmd); -typedef int (*mpo_sysv_sem_check_semget_t)(struct ucred *cred, +typedef int (*mpo_sysvsem_check_semget_t)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel); -typedef int (*mpo_sysv_sem_check_semop_t)(struct ucred *cred, +typedef int (*mpo_sysvsem_check_semop_t)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, size_t accesstype); /* * Object: struct shmid_kernel (System V shared memory segment) */ -typedef void (*mpo_sysv_shm_init_label_t)(struct label *label); -typedef void (*mpo_sysv_shm_destroy_label_t)(struct label *label); -typedef void (*mpo_sysv_shm_cleanup_t)(struct label *shmlabel); -typedef void (*mpo_sysv_shm_create_t)(struct ucred *cred, +typedef void (*mpo_sysvshm_init_label_t)(struct label *label); +typedef void (*mpo_sysvshm_destroy_label_t)(struct label *label); +typedef void (*mpo_sysvshm_cleanup_t)(struct label *shmlabel); +typedef void (*mpo_sysvshm_create_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmlabel); -typedef int (*mpo_sysv_shm_check_shmat_t)(struct ucred *cred, +typedef int (*mpo_sysvshm_check_shmat_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg); -typedef int (*mpo_sysv_shm_check_shmctl_t)(struct ucred *cred, +typedef int (*mpo_sysvshm_check_shmctl_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int cmd); -typedef int (*mpo_sysv_shm_check_shmdt_t)(struct ucred *cred, +typedef int (*mpo_sysvshm_check_shmdt_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel); -typedef int (*mpo_sysv_shm_check_shmget_t)(struct ucred *cred, +typedef int (*mpo_sysvshm_check_shmget_t)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg); @@ -798,43 +798,39 @@ mpo_proc_check_signal_t mpo_proc_check_signal; mpo_proc_check_wait_t mpo_proc_check_wait; - /* - * XXXRW: These names are a bit awkard. Perhaps sysv_msq to match - * conventional usage? - */ - mpo_sysv_msq_init_label_t mpo_sysv_msq_init_label; - mpo_sysv_msq_destroy_t mpo_sysv_msq_destroy; - mpo_sysv_msq_cleanup_t mpo_sysv_msq_cleanup; - mpo_sysv_msq_create_msg_t mpo_sysv_msq_create_msg; - mpo_sysv_msq_create_t mpo_sysv_msq_create; - mpo_sysv_msq_check_msgmsq_t mpo_sysv_msq_check_msgmsq; - mpo_sysv_msq_check_msgrcv_t mpo_sysv_msq_check_msgrcv; - mpo_sysv_msq_check_msgrmid_t mpo_sysv_msq_check_msgrmid; - mpo_sysv_msq_check_msqget_t mpo_sysv_msq_check_msqget; - mpo_sysv_msq_check_msqsnd_t mpo_sysv_msq_check_msqsnd; - mpo_sysv_msq_check_msqrcv_t mpo_sysv_msq_check_msqrcv; - mpo_sysv_msq_check_msqctl_t mpo_sysv_msq_check_msqctl; + mpo_sysvmsq_init_label_t mpo_sysvmsq_init_label; + mpo_sysvmsq_destroy_t mpo_sysvmsq_destroy; + mpo_sysvmsq_cleanup_t mpo_sysvmsq_cleanup; + mpo_sysvmsq_create_msg_t mpo_sysvmsq_create_msg; + mpo_sysvmsq_create_t mpo_sysvmsq_create; + mpo_sysvmsq_check_msgmsq_t mpo_sysvmsq_check_msgmsq; + mpo_sysvmsq_check_msgrcv_t mpo_sysvmsq_check_msgrcv; + mpo_sysvmsq_check_msgrmid_t mpo_sysvmsq_check_msgrmid; + mpo_sysvmsq_check_msqget_t mpo_sysvmsq_check_msqget; + mpo_sysvmsq_check_msqsnd_t mpo_sysvmsq_check_msqsnd; + mpo_sysvmsq_check_msqrcv_t mpo_sysvmsq_check_msqrcv; + mpo_sysvmsq_check_msqctl_t mpo_sysvmsq_check_msqctl; - mpo_sysv_msg_init_label_t mpo_sysv_msg_init_label; - mpo_sysv_msg_destroy_label_t mpo_sysv_msg_destroy_label; - mpo_sysv_msg_cleanup_t mpo_sysv_msg_cleanup; + mpo_sysvmsg_init_label_t mpo_sysvmsg_init_label; + mpo_sysvmsg_destroy_label_t mpo_sysvmsg_destroy_label; + mpo_sysvmsg_cleanup_t mpo_sysvmsg_cleanup; - mpo_sysv_sem_init_label_t mpo_sysv_sem_init_label; - mpo_sysv_sem_destroy_label_t mpo_sysv_sem_destroy_label; - mpo_sysv_sem_cleanup_t mpo_sysv_sem_cleanup; - mpo_sysv_sem_create_t mpo_sysv_sem_create; - mpo_sysv_sem_check_semctl_t mpo_sysv_sem_check_semctl; - mpo_sysv_sem_check_semget_t mpo_sysv_sem_check_semget; - mpo_sysv_sem_check_semop_t mpo_sysv_sem_check_semop; + mpo_sysvsem_init_label_t mpo_sysvsem_init_label; + mpo_sysvsem_destroy_label_t mpo_sysvsem_destroy_label; + mpo_sysvsem_cleanup_t mpo_sysvsem_cleanup; + mpo_sysvsem_create_t mpo_sysvsem_create; + mpo_sysvsem_check_semctl_t mpo_sysvsem_check_semctl; + mpo_sysvsem_check_semget_t mpo_sysvsem_check_semget; + mpo_sysvsem_check_semop_t mpo_sysvsem_check_semop; - mpo_sysv_shm_init_label_t mpo_sysv_shm_init_label; - mpo_sysv_shm_destroy_label_t mpo_sysv_shm_destroy_label; - mpo_sysv_shm_cleanup_t mpo_sysv_shm_cleanup; - mpo_sysv_shm_create_t mpo_sysv_shm_create; - mpo_sysv_shm_check_shmat_t mpo_sysv_shm_check_shmat; - mpo_sysv_shm_check_shmctl_t mpo_sysv_shm_check_shmctl; - mpo_sysv_shm_check_shmdt_t mpo_sysv_shm_check_shmdt; - mpo_sysv_shm_check_shmget_t mpo_sysv_shm_check_shmget; + mpo_sysvshm_init_label_t mpo_sysvshm_init_label; + mpo_sysvshm_destroy_label_t mpo_sysvshm_destroy_label; + mpo_sysvshm_cleanup_t mpo_sysvshm_cleanup; + mpo_sysvshm_create_t mpo_sysvshm_create; + mpo_sysvshm_check_shmat_t mpo_sysvshm_check_shmat; + mpo_sysvshm_check_shmctl_t mpo_sysvshm_check_shmctl; + mpo_sysvshm_check_shmdt_t mpo_sysvshm_check_shmdt; + mpo_sysvshm_check_shmget_t mpo_sysvshm_check_shmget; /* * XXXRW: Further naming consistency work is desirable here. Might From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 13:05:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCDA016A4E2 for ; Thu, 6 Jul 2006 13:05:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AEC543D82 for ; Thu, 6 Jul 2006 13:05:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E306B46D18 for ; Thu, 6 Jul 2006 09:05:23 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E36D8738A2; Thu, 6 Jul 2006 13:05:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D249916A4E2; Thu, 6 Jul 2006 13:05:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7ABB216A4DD for ; Thu, 6 Jul 2006 13:05:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E29A543D4C for ; Thu, 6 Jul 2006 13:05: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.6/8.13.6) with ESMTP id k66D5267082616 for ; Thu, 6 Jul 2006 13:05:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66D52hg082613 for perforce@freebsd.org; Thu, 6 Jul 2006 13:05:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 13:05:02 GMT Message-Id: <200607061305.k66D52hg082613@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 100742 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 13:05:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=100742 Change 100742 by rwatson@rwatson_zoo on 2006/07/06 13:04:44 Further System V IPC renaming. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_msg.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_sem.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_shm.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_internal.h#3 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#9 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#18 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/kern/sysv_msg.c#3 (text+ko) ==== @@ -227,7 +227,7 @@ msghdrs[i-1].msg_next = &msghdrs[i]; msghdrs[i].msg_next = NULL; #ifdef MAC - mac_init_sysv_msgmsg(&msghdrs[i]); + mac_sysvmsg_init(&msghdrs[i]); #endif } free_msghdrs = &msghdrs[0]; @@ -240,7 +240,7 @@ msqids[i].u.msg_perm.seq = 0; /* reset to a known value */ msqids[i].u.msg_perm.mode = 0; #ifdef MAC - mac_init_sysv_msgqueue(&msqids[i]); + mac_sysvmsq_init(&msqids[i]); #endif } mtx_init(&msq_mtx, "msq", NULL, MTX_DEF); @@ -272,9 +272,9 @@ #ifdef MAC for (i = 0; i < msginfo.msgtql; i++) - mac_destroy_sysv_msgmsg(&msghdrs[i]); + mac_sysvmsg_destroy(&msghdrs[i]); for (msqid = 0; msqid < msginfo.msgmni; msqid++) - mac_destroy_sysv_msgqueue(&msqids[msqid]); + mac_sysvmsq_destroy(&msqids[msqid]); #endif free(msgpool, M_MSG); free(msgmaps, M_MSG); @@ -374,7 +374,7 @@ msghdr->msg_next = free_msghdrs; free_msghdrs = msghdr; #ifdef MAC - mac_cleanup_sysv_msgmsg(msghdr); + mac_sysvmsg_cleanup(msghdr); #endif } @@ -444,9 +444,9 @@ goto done2; } #ifdef MAC - error = mac_check_sysv_msqctl(td->td_ucred, msqkptr, cmd); + error = mac_sysvmsq_check_msqctl(td->td_ucred, msqkptr, cmd); if (error != 0) { - MPRINTF(("mac_check_sysv_msqctl returned %d\n", error)); + MPRINTF(("mac_sysvmsq_check_msqctl returned %d\n", error)); goto done2; } #endif @@ -474,9 +474,11 @@ */ for (msghdr = msqkptr->u.msg_first; msghdr != NULL; msghdr = msghdr->msg_next) { - error = mac_check_sysv_msgrmid(td->td_ucred, msghdr); + error = mac_sysvmsq_check_msgrmid(td->td_ucred, + msghdr); if (error != 0) { - MPRINTF(("mac_check_sysv_msgrmid returned %d\n", + MPRINTF(( + "mac_sysvmsq_check_msgrmid returned %d\n", error)); goto done2; } @@ -504,7 +506,7 @@ msqkptr->u.msg_qbytes = 0; /* Mark it as free */ #ifdef MAC - mac_cleanup_sysv_msgqueue(msqkptr); + mac_sysvmsq_cleanup(msqkptr); #endif wakeup(msqkptr); @@ -607,9 +609,10 @@ goto done2; } #ifdef MAC - error = mac_check_sysv_msqget(cred, msqkptr); + error = mac_sysvmsq_check_msqget(cred, msqkptr); if (error != 0) { - MPRINTF(("mac_check_sysv_msqget returned %d\n", + MPRINTF(( + "mac_sysvmsq_check_msqget returned %d\n", error)); goto done2; } @@ -657,7 +660,7 @@ msqkptr->u.msg_rtime = 0; msqkptr->u.msg_ctime = time_second; #ifdef MAC - mac_create_sysv_msgqueue(cred, msqkptr); + mac_sysvmsq_create(cred, msqkptr); #endif } else { DPRINTF(("didn't find it and wasn't asked to create it\n")); @@ -732,9 +735,9 @@ } #ifdef MAC - error = mac_check_sysv_msqsnd(td->td_ucred, msqkptr); + error = mac_sysvmsq_check_msqsnd(td->td_ucred, msqkptr); if (error != 0) { - MPRINTF(("mac_check_sysv_msqsnd returned %d\n", error)); + MPRINTF(("mac_sysvmsq_check_msqsnd returned %d\n", error)); goto done2; } #endif @@ -858,7 +861,7 @@ * immediately? Or, should it be checked just before the msg is * enqueued in the msgq (as it is done now)? */ - mac_create_sysv_msgmsg(td->td_ucred, msqkptr, msghdr); + mac_sysvmsg_create(td->td_ucred, msqkptr, msghdr); #endif /* @@ -969,16 +972,16 @@ * Note: Since the task/thread allocates the msghdr and usually * primes it with its own MAC label, for a majority of policies, it * won't be necessary to check whether the msghdr has access - * permissions to the msgq. The mac_check_sysv_msqsnd check would + * permissions to the msgq. The mac_sysvmsq_check_msqsnd check would * suffice in that case. However, this hook may be required where * individual policies derive a non-identical label for the msghdr * from the current thread label and may want to check the msghdr * enqueue permissions, along with read/write permissions to the * msgq. */ - error = mac_check_sysv_msgmsq(td->td_ucred, msghdr, msqkptr); + error = mac_sysvmsq_check_msgmsq(td->td_ucred, msghdr, msqkptr); if (error != 0) { - MPRINTF(("mac_check_sysv_msqmsq returned %d\n", error)); + MPRINTF(("mac_sysvmsq_check_msqmsq returned %d\n", error)); msg_freehdr(msghdr); wakeup(msqkptr); goto done2; @@ -1071,9 +1074,9 @@ } #ifdef MAC - error = mac_check_sysv_msqrcv(td->td_ucred, msqkptr); + error = mac_sysvmsq_check_msqrcv(td->td_ucred, msqkptr); if (error != 0) { - MPRINTF(("mac_check_sysv_msqrcv returned %d\n", error)); + MPRINTF(("mac_sysvmsq_check_msqrcv returned %d\n", error)); goto done2; } #endif @@ -1092,10 +1095,10 @@ goto done2; } #ifdef MAC - error = mac_check_sysv_msgrcv(td->td_ucred, + error = mac_sysvmsq_check_msgrcv(td->td_ucred, msghdr); if (error != 0) { - MPRINTF(("mac_check_sysv_msgrcv " + MPRINTF(("mac_sysvmsq_check_msgrcv " "returned %d\n", error)); goto done2; } @@ -1140,10 +1143,10 @@ goto done2; } #ifdef MAC - error = mac_check_sysv_msgrcv( + error = mac_sysvmsq_check_msgrcv( td->td_ucred, msghdr); if (error != 0) { - MPRINTF(("mac_check_sysv_" + MPRINTF(("mac_sysvmsq_check_" "msgrcv returned %d\n", error)); goto done2; ==== //depot/projects/trustedbsd/mac2/sys/kern/sysv_sem.c#3 (text+ko) ==== @@ -249,7 +249,7 @@ sema[i].u.sem_perm.mode = 0; sema[i].u.sem_perm.seq = 0; #ifdef MAC - mac_init_sysv_sem(&sema[i]); + mac_sysvsem_init(&sema[i]); #endif } for (i = 0; i < seminfo.semmni; i++) @@ -275,7 +275,7 @@ EVENTHANDLER_DEREGISTER(process_exit, semexit_tag); #ifdef MAC for (i = 0; i < seminfo.semmni; i++) - mac_destroy_sysv_sem(&sema[i]); + mac_sysvsem_destroy(&sema[i]); #endif free(sem, M_SEM); free(sema, M_SEM); @@ -618,9 +618,9 @@ if ((error = ipcperm(td, &semakptr->u.sem_perm, IPC_R))) goto done2; #ifdef MAC - error = mac_check_sysv_semctl(cred, semakptr, cmd); + error = mac_sysvsem_check_semctl(cred, semakptr, cmd); if (error != 0) { - MPRINTF(("mac_check_sysv_semctl returned %d\n", + MPRINTF(("mac_sysvsem_check_semctl returned %d\n", error)); goto done2; } @@ -645,9 +645,9 @@ sema_mtxp = &sema_mtx[semidx]; #ifdef MAC mtx_lock(sema_mtxp); - error = mac_check_sysv_semctl(cred, semakptr, cmd); + error = mac_sysvsem_check_semctl(cred, semakptr, cmd); if (error != 0) { - MPRINTF(("mac_check_sysv_semctl returned %d\n", error)); + MPRINTF(("mac_sysvsem_check_semctl returned %d\n", error)); mtx_unlock(sema_mtxp); return (error); } @@ -676,7 +676,7 @@ } semakptr->u.sem_perm.mode = 0; #ifdef MAC - mac_cleanup_sysv_sem(semakptr); + mac_sysvsem_cleanup(semakptr); #endif SEMUNDO_LOCK(); semundo_clear(semidx, -1); @@ -922,9 +922,10 @@ goto done2; } #ifdef MAC - error = mac_check_sysv_semget(cred, &sema[semid]); + error = mac_sysvsem_check_semget(cred, &sema[semid]); if (error != 0) { - MPRINTF(("mac_check_sysv_semget returned %d\n", + MPRINTF(( + "mac_sysvsem_check_semget returned %d\n", error)); goto done2; } @@ -974,7 +975,7 @@ bzero(sema[semid].u.sem_base, sizeof(sema[semid].u.sem_base[0])*nsems); #ifdef MAC - mac_create_sysv_sem(cred, &sema[semid]); + mac_sysvsem_create(cred, &sema[semid]); #endif DPRINTF(("sembase = 0x%x, next = 0x%x\n", sema[semid].u.sem_base, &sem[semtot])); @@ -1083,9 +1084,9 @@ goto done2; } #ifdef MAC - error = mac_check_sysv_semop(td->td_ucred, semakptr, j); + error = mac_sysvsem_check_semop(td->td_ucred, semakptr, j); if (error != 0) { - MPRINTF(("mac_check_sysv_semop returned %d\n", error)); + MPRINTF(("mac_sysvsem_check_semop returned %d\n", error)); goto done2; } #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/sysv_shm.c#3 (text+ko) ==== @@ -260,7 +260,7 @@ shm_nused--; shmseg->u.shm_perm.mode = SHMSEG_FREE; #ifdef MAC - mac_cleanup_sysv_shm(shmseg); + mac_sysvshm_cleanup(shmseg); #endif } @@ -331,9 +331,9 @@ } #ifdef MAC shmsegptr = &shmsegs[IPCID_TO_IX(shmmap_s->shmid)]; - error = mac_check_sysv_shmdt(td->td_ucred, shmsegptr); + error = mac_sysvshm_check_shmdt(td->td_ucred, shmsegptr); if (error != 0) { - MPRINTF(("mac_check_sysv_shmdt returned %d\n", error)); + MPRINTF(("mac_sysvshm_check_shmdt returned %d\n", error)); goto done2; } #endif @@ -392,9 +392,9 @@ if (error) goto done2; #ifdef MAC - error = mac_check_sysv_shmat(td->td_ucred, shmseg, shmflg); + error = mac_sysvshm_check_shmat(td->td_ucred, shmseg, shmflg); if (error != 0) { - MPRINTF(("mac_check_sysv_shmat returned %d\n", error)); + MPRINTF(("mac_sysvshm_check_shmat returned %d\n", error)); goto done2; } #endif @@ -513,9 +513,9 @@ if (error) goto done2; #ifdef MAC - error = mac_check_sysv_shmctl(td->td_ucred, shmseg, uap->cmd); + error = mac_sysvshm_check_shmctl(td->td_ucred, shmseg, uap->cmd); if (error != 0) { - MPRINTF(("mac_check_sysv_shmctl returned %d\n", + MPRINTF(("mac_sysvshm_check_shmctl returned %d\n", error)); goto done2; } @@ -603,9 +603,9 @@ goto done2; } #ifdef MAC - error = mac_check_sysv_shmctl(td->td_ucred, shmseg, cmd); + error = mac_sysvshm_check_shmctl(td->td_ucred, shmseg, cmd); if (error != 0) { - MPRINTF(("mac_check_sysv_shmctl returned %d\n", error)); + MPRINTF(("mac_sysvshm_check_shmctl returned %d\n", error)); goto done2; } #endif @@ -732,9 +732,9 @@ if ((uap->shmflg & (IPC_CREAT | IPC_EXCL)) == (IPC_CREAT | IPC_EXCL)) return (EEXIST); #ifdef MAC - error = mac_check_sysv_shmget(td->td_ucred, shmseg, uap->shmflg); + error = mac_sysvshm_check_shmget(td->td_ucred, shmseg, uap->shmflg); if (error != 0) { - MPRINTF(("mac_check_sysv_shmget returned %d\n", error)); + MPRINTF(("mac_sysvshm_check_shmget returned %d\n", error)); return (error); } #endif @@ -815,7 +815,7 @@ shmseg->u.shm_lpid = shmseg->u.shm_nattch = 0; shmseg->u.shm_atime = shmseg->u.shm_dtime = 0; #ifdef MAC - mac_create_sysv_shm(cred, shmseg); + mac_sysvshm_create(cred, shmseg); #endif shmseg->u.shm_ctime = time_second; shm_committed += btoc(size); @@ -953,7 +953,7 @@ shmsegs[i].u.shm_perm.mode = SHMSEG_FREE; shmsegs[i].u.shm_perm.seq = 0; #ifdef MAC - mac_init_sysv_shm(&shmsegs[i]); + mac_sysvshm_init(&shmsegs[i]); #endif } free(shmsegs, M_SHM); @@ -985,7 +985,7 @@ shmsegs[i].u.shm_perm.mode = SHMSEG_FREE; shmsegs[i].u.shm_perm.seq = 0; #ifdef MAC - mac_init_sysv_shm(&shmsegs[i]); + mac_sysvshm_init(&shmsegs[i]); #endif } shm_last_free = 0; @@ -1007,7 +1007,7 @@ #ifdef MAC for (i = 0; i < shmalloced; i++) - mac_destroy_sysv_shm(&shmsegs[i]); + mac_sysvshm_destroy(&shmsegs[i]); #endif free(shmsegs, M_SHM); shmexit_hook = NULL; ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_internal.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#9 (text+ko) ==== @@ -265,8 +265,6 @@ void mac_sysvmsq_init(struct msqid_kernel*); void mac_sysvmsq_destroy(struct msqid_kernel *); void mac_sysvmsq_cleanup(struct msqid_kernel *msqkptr); -void mac_sysvmsq_create_msg(struct ucred *cred, - struct msqid_kernel *msqkptr, struct msg *msgptr); void mac_sysvmsq_create(struct ucred *cred, struct msqid_kernel *msqkptr); int mac_sysvmsq_check_msgmsq(struct ucred *cred, struct msg *msgptr, @@ -285,12 +283,14 @@ void mac_sysvmsg_init(struct msg *); void mac_sysvmsg_destroy(struct msg *); void mac_sysvmsg_cleanup(struct msg *msgptr); +void mac_sysvmsg_create(struct ucred *cred, struct msqid_kernel *msqkptr, + struct msg *msgptr); void mac_sysvsem_init(struct semid_kernel*); void mac_sysvsem_destroy(struct semid_kernel *); void mac_sysvsem_create(struct ucred *cred, struct semid_kernel *semakptr); -void mac_sysvsem_cleanup_sysvsem(struct semid_kernel *semakptr); +void mac_sysvsem_cleanup(struct semid_kernel *semakptr); int mac_sysvsem_check_semctl(struct ucred *cred, struct semid_kernel *semakptr, int cmd); int mac_sysvsem_check_semget(struct ucred *cred, ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#18 (text+ko) ==== @@ -393,9 +393,6 @@ typedef void (*mpo_sysvmsq_init_label_t)(struct label *label); typedef void (*mpo_sysvmsq_destroy_t)(struct label *label); typedef void (*mpo_sysvmsq_cleanup_t)(struct label *msqlabel); -typedef void (*mpo_sysvmsq_create_msg_t)(struct ucred *cred, - struct msqid_kernel *msqkptr, struct label *msqlabel, - struct msg *msgptr, struct label *msglabel); typedef void (*mpo_sysvmsq_create_t)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel); typedef int (*mpo_sysvmsq_check_msgmsq_t)(struct ucred *cred, @@ -420,6 +417,9 @@ typedef void (*mpo_sysvmsg_init_label_t)(struct label *label); typedef void (*mpo_sysvmsg_destroy_label_t)(struct label *label); typedef void (*mpo_sysvmsg_cleanup_t)(struct label *msglabel); +typedef void (*mpo_sysvmsg_create_t)(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqlabel, + struct msg *msgptr, struct label *msglabel); /* * Object: struct semid_kernel (System V IPC semaphore) @@ -801,7 +801,6 @@ mpo_sysvmsq_init_label_t mpo_sysvmsq_init_label; mpo_sysvmsq_destroy_t mpo_sysvmsq_destroy; mpo_sysvmsq_cleanup_t mpo_sysvmsq_cleanup; - mpo_sysvmsq_create_msg_t mpo_sysvmsq_create_msg; mpo_sysvmsq_create_t mpo_sysvmsq_create; mpo_sysvmsq_check_msgmsq_t mpo_sysvmsq_check_msgmsq; mpo_sysvmsq_check_msgrcv_t mpo_sysvmsq_check_msgrcv; @@ -814,6 +813,7 @@ mpo_sysvmsg_init_label_t mpo_sysvmsg_init_label; mpo_sysvmsg_destroy_label_t mpo_sysvmsg_destroy_label; mpo_sysvmsg_cleanup_t mpo_sysvmsg_cleanup; + mpo_sysvmsg_create_t mpo_sysvmsg_create; mpo_sysvsem_init_label_t mpo_sysvsem_init_label; mpo_sysvsem_destroy_label_t mpo_sysvsem_destroy_label; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 13:16:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05EA816A4DE for ; Thu, 6 Jul 2006 13:16:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17F8443D5D for ; Thu, 6 Jul 2006 13:16:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9030D46D05 for ; Thu, 6 Jul 2006 09:16:22 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2147256BE0; Thu, 6 Jul 2006 13:16:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 12A9416A4E0; Thu, 6 Jul 2006 13:16:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE0A416A4DD for ; Thu, 6 Jul 2006 13:16:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D22E743D5D for ; Thu, 6 Jul 2006 13:16:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66DGIqR083159 for ; Thu, 6 Jul 2006 13:16:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66DGI75083156 for perforce@freebsd.org; Thu, 6 Jul 2006 13:16:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 13:16:18 GMT Message-Id: <200607061316.k66DGI75083156@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 100744 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 13:16:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=100744 Change 100744 by rwatson@rwatson_zoo on 2006/07/06 13:15:26 More renaming. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_mbuf2.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#4 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_lookup.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_mount.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_syscalls.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_vnops.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_mbuf2.c#3 (text+ko) ==== @@ -308,7 +308,7 @@ { #ifdef MAC if (t->m_tag_id == PACKET_TAG_MACLABEL) - mac_destroy_mbuf_tag(t); + mac_mbuf_tag_destroy(t); #endif free(t, M_PACKET_TAGS); } @@ -412,11 +412,11 @@ * special from the mbuf code? */ if (t->m_tag_id == PACKET_TAG_MACLABEL) { - if (mac_init_mbuf_tag(p, how) != 0) { + if (mac_mbuf_tag_init(p, how) != 0) { m_tag_free(p); return (NULL); } - mac_copy_mbuf_tag(t, p); + mac_mbuf_tag_copy(t, p); } else #endif bcopy(t + 1, p + 1, t->m_tag_len); /* Copy the data */ ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#4 (text+ko) ==== @@ -101,6 +101,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#3 (text+ko) ==== @@ -817,7 +817,7 @@ vattr.va_type = VSOCK; vattr.va_mode = (ACCESSPERMS & ~td->td_proc->p_fd->fd_cmask); #ifdef MAC - error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, + error = mac_vnode_check_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); #endif if (error == 0) { @@ -951,8 +951,8 @@ unp3->unp_flags |= UNP_WANTCRED; #ifdef MAC SOCK_LOCK(so); - mac_set_socket_peer_from_socket(so, so3); - mac_set_socket_peer_from_socket(so3, so); + mac_socket_set_peer_from_socket(so, so3); + mac_socket_set_peer_from_socket(so3, so); SOCK_UNLOCK(so); #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_lookup.c#3 (text+ko) ==== @@ -244,7 +244,7 @@ } #ifdef MAC if ((cnp->cn_flags & NOMACCHECK) == 0) { - error = mac_check_vnode_readlink(td->td_ucred, + error = mac_vnode_check_readlink(td->td_ucred, ndp->ni_vp); if (error) break; @@ -536,7 +536,7 @@ unionlookup: #ifdef MAC if ((cnp->cn_flags & NOMACCHECK) == 0) { - error = mac_check_vnode_lookup(td->td_ucred, dp, cnp); + error = mac_vnode_check_lookup(td->td_ucred, dp, cnp); if (error) goto bad; } ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_mount.c#3 (text+ko) ==== @@ -479,8 +479,8 @@ strlcpy(mp->mnt_stat.f_mntonname, fspath, MNAMELEN); mp->mnt_iosize_max = DFLTPHYS; #ifdef MAC - mac_init_mount(mp); - mac_create_mount(td->td_ucred, mp); + mac_mount_init(mp); + mac_mount_create(td->td_ucred, mp); #endif arc4rand(&mp->mnt_hashseed, sizeof mp->mnt_hashseed, 0); return (mp); @@ -558,7 +558,7 @@ mp->mnt_secondary_writes = -1000; MNT_IUNLOCK(mp); #ifdef MAC - mac_destroy_mount(mp); + mac_mount_destroy(mp); #endif if (mp->mnt_opt != NULL) vfs_freeopts(mp->mnt_opt); ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#3 (text+ko) ==== @@ -797,7 +797,7 @@ lockdestroy(vp->v_vnlock); mtx_destroy(&vp->v_interlock); #ifdef MAC - mac_destroy_vnode(vp); + mac_vnode_destroy(vp); #endif uma_zfree(vnode_zone, vp); } @@ -920,9 +920,9 @@ v_incr_usecount(vp); vp->v_data = 0; #ifdef MAC - mac_init_vnode(vp); + mac_vnode_init(vp); if (mp != NULL && (mp->mnt_flag & MNT_MULTILABEL) == 0) - mac_associate_vnode_singlelabel(mp, vp); + mac_vnode_associate_singlelabel(mp, vp); else if (mp == NULL) printf("NULL mp in getnewvnode()\n"); #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_syscalls.c#3 (text+ko) ==== @@ -252,7 +252,7 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_vp); #ifdef MAC - error = mac_check_mount_stat(td->td_ucred, mp); + error = mac_mount_check_stat(td->td_ucred, mp); if (error) { vfs_rel(mp); goto out; @@ -341,7 +341,7 @@ goto out; } #ifdef MAC - error = mac_check_mount_stat(td->td_ucred, mp); + error = mac_mount_check_stat(td->td_ucred, mp); if (error) { vfs_rel(mp); goto out; @@ -434,7 +434,7 @@ continue; } #ifdef MAC - if (mac_check_mount_stat(td->td_ucred, mp) != 0) { + if (mac_mount_check_stat(td->td_ucred, mp) != 0) { nmp = TAILQ_NEXT(mp, mnt_list); continue; } @@ -700,7 +700,7 @@ if (vp->v_type != VDIR) error = ENOTDIR; #ifdef MAC - else if ((error = mac_check_vnode_chdir(td->td_ucred, vp)) != 0) { + else if ((error = mac_vnode_check_chdir(td->td_ucred, vp)) != 0) { } #endif else @@ -860,7 +860,7 @@ if ((error = change_dir(nd.ni_vp, td)) != 0) goto e_vunlock; #ifdef MAC - if ((error = mac_check_vnode_chroot(td->td_ucred, nd.ni_vp))) + if ((error = mac_vnode_check_chroot(td->td_ucred, nd.ni_vp))) goto e_vunlock; #endif VOP_UNLOCK(nd.ni_vp, 0, td); @@ -892,7 +892,7 @@ if (vp->v_type != VDIR) return (ENOTDIR); #ifdef MAC - error = mac_check_vnode_chdir(td->td_ucred, vp); + error = mac_vnode_check_chdir(td->td_ucred, vp); if (error) return (error); #endif @@ -902,8 +902,8 @@ /* * Common routine for kern_chroot() and jail_attach(). The caller is - * responsible for invoking suser() and mac_check_chroot() to authorize this - * operation. + * responsible for invoking suser() and mac_vnode_check_chroot() to authorize + * this operation. */ int change_root(vp, td) @@ -1102,7 +1102,7 @@ vat.va_size = 0; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_vnode_write(td->td_ucred, fp->f_cred, vp); + error = mac_vnode_check_write(td->td_ucred, fp->f_cred, vp); if (error == 0) #endif error = VOP_SETATTR(vp, &vat, td->td_ucred, td); @@ -1254,7 +1254,7 @@ } #ifdef MAC if (error == 0 && !whiteout) - error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, + error = mac_vnode_check_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); #endif if (!error) { @@ -1337,7 +1337,7 @@ vattr.va_mode = (mode & ALLPERMS) & ~td->td_proc->p_fd->fd_cmask; FILEDESC_UNLOCK_FAST(td->td_proc->p_fd); #ifdef MAC - error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, + error = mac_vnode_check_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); if (error) goto out; @@ -1466,7 +1466,7 @@ error = can_hardlink(vp, td, td->td_ucred); if (error == 0) #ifdef MAC - error = mac_check_vnode_link(td->td_ucred, + error = mac_vnode_check_link(td->td_ucred, nd.ni_dvp, vp, &nd.ni_cnd); if (error == 0) #endif @@ -1554,7 +1554,7 @@ FILEDESC_UNLOCK_FAST(td->td_proc->p_fd); #ifdef MAC vattr.va_type = VLNK; - error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, + error = mac_vnode_check_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); if (error) goto out2; @@ -1692,7 +1692,7 @@ goto restart; } #ifdef MAC - error = mac_check_vnode_delete(td->td_ucred, nd.ni_dvp, vp, + error = mac_vnode_check_unlink(td->td_ucred, nd.ni_dvp, vp, &nd.ni_cnd); if (error) goto out; @@ -1853,7 +1853,7 @@ if (user_flags & X_OK) flags |= VEXEC; #ifdef MAC - error = mac_check_vnode_access(cred, vp, flags); + error = mac_vnode_check_access(cred, vp, flags); if (error) return (error); #endif @@ -2322,7 +2322,7 @@ vfslocked = NDHASGIANT(&nd); vp = nd.ni_vp; #ifdef MAC - error = mac_check_vnode_readlink(td->td_ucred, vp); + error = mac_vnode_check_readlink(td->td_ucred, vp); if (error) { vput(vp); VFS_UNLOCK_GIANT(vfslocked); @@ -2381,7 +2381,7 @@ VATTR_NULL(&vattr); vattr.va_flags = flags; #ifdef MAC - error = mac_check_vnode_setflags(td->td_ucred, vp, vattr.va_flags); + error = mac_vnode_check_setflags(td->td_ucred, vp, vattr.va_flags); if (error == 0) #endif error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); @@ -2509,7 +2509,7 @@ VATTR_NULL(&vattr); vattr.va_mode = mode & ALLPERMS; #ifdef MAC - error = mac_check_vnode_setmode(td->td_ucred, vp, vattr.va_mode); + error = mac_vnode_check_setmode(td->td_ucred, vp, vattr.va_mode); if (error == 0) #endif error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); @@ -2651,7 +2651,7 @@ vattr.va_uid = uid; vattr.va_gid = gid; #ifdef MAC - error = mac_check_vnode_setowner(td->td_ucred, vp, vattr.va_uid, + error = mac_vnode_check_setowner(td->td_ucred, vp, vattr.va_uid, vattr.va_gid); if (error == 0) #endif @@ -2854,7 +2854,7 @@ if (nullflag) vattr.va_vaflags |= VA_UTIMES_NULL; #ifdef MAC - error = mac_check_vnode_setutimes(td->td_ucred, vp, vattr.va_atime, + error = mac_vnode_check_setutimes(td->td_ucred, vp, vattr.va_atime, vattr.va_mtime); #endif if (error == 0) @@ -3050,7 +3050,7 @@ if (vp->v_type == VDIR) error = EISDIR; #ifdef MAC - else if ((error = mac_check_vnode_write(td->td_ucred, NOCRED, vp))) { + else if ((error = mac_vnode_check_write(td->td_ucred, NOCRED, vp))) { } #endif else if ((error = vn_writechk(vp)) == 0 && @@ -3110,7 +3110,7 @@ if (vp->v_type == VDIR) error = EISDIR; #ifdef MAC - else if ((error = mac_check_vnode_write(td->td_ucred, fp->f_cred, + else if ((error = mac_vnode_check_write(td->td_ucred, fp->f_cred, vp))) { } #endif @@ -3275,7 +3275,7 @@ fvfslocked = NDHASGIANT(&fromnd); tvfslocked = 0; #ifdef MAC - error = mac_check_vnode_rename_from(td->td_ucred, fromnd.ni_dvp, + error = mac_vnode_check_rename_from(td->td_ucred, fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd); VOP_UNLOCK(fromnd.ni_dvp, 0, td); VOP_UNLOCK(fromnd.ni_vp, 0, td); @@ -3325,7 +3325,7 @@ error = -1; #ifdef MAC else - error = mac_check_vnode_rename_to(td->td_ucred, tdvp, + error = mac_vnode_check_rename_to(td->td_ucred, tdvp, tond.ni_vp, fromnd.ni_dvp == tdvp, &tond.ni_cnd); #endif out: @@ -3435,7 +3435,7 @@ vattr.va_mode = (mode & ACCESSPERMS) &~ td->td_proc->p_fd->fd_cmask; FILEDESC_UNLOCK_FAST(td->td_proc->p_fd); #ifdef MAC - error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, + error = mac_vnode_check_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); if (error) goto out; @@ -3509,7 +3509,7 @@ goto out; } #ifdef MAC - error = mac_check_vnode_delete(td->td_ucred, nd.ni_dvp, vp, + error = mac_vnode_check_unlink(td->td_ucred, nd.ni_dvp, vp, &nd.ni_cnd); if (error) goto out; @@ -3598,7 +3598,7 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); loff = auio.uio_offset = fp->f_offset; #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, vp); + error = mac_vnode_check_readdir(td->td_ucred, vp); if (error) { VOP_UNLOCK(vp, 0, td); fdrop(fp, td); @@ -3752,7 +3752,7 @@ AUDIT_ARG(vnode, vp, ARG_VNODE1); loff = auio.uio_offset = fp->f_offset; #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, vp); + error = mac_vnode_check_readdir(td->td_ucred, vp); if (error == 0) #endif error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, NULL, @@ -3884,7 +3884,7 @@ goto out; } #ifdef MAC - error = mac_check_vnode_revoke(td->td_ucred, vp); + error = mac_vnode_check_revoke(td->td_ucred, vp); if (error) goto out; #endif @@ -4109,7 +4109,7 @@ if (fmode & O_APPEND) mode |= VAPPEND; #ifdef MAC - error = mac_check_vnode_open(td->td_ucred, vp, mode); + error = mac_vnode_check_open(td->td_ucred, vp, mode); if (error) goto bad; #endif @@ -4131,7 +4131,7 @@ * We don't yet have fp->f_cred, so use td->td_ucred, which * should be right. */ - error = mac_check_vnode_write(td->td_ucred, td->td_ucred, vp); + error = mac_vnode_check_write(td->td_ucred, td->td_ucred, vp); if (error == 0) { #endif VATTR_NULL(vap); @@ -4323,7 +4323,7 @@ if (error) goto out; #ifdef MAC - error = mac_check_mount_stat(td->td_ucred, mp); + error = mac_mount_check_stat(td->td_ucred, mp); if (error) goto out; #endif @@ -4477,7 +4477,7 @@ cnt = nbytes; #ifdef MAC - error = mac_check_vnode_setextattr(td->td_ucred, vp, attrnamespace, + error = mac_vnode_check_setextattr(td->td_ucred, vp, attrnamespace, attrname, &auio); if (error) goto done; @@ -4648,7 +4648,7 @@ sizep = &size; #ifdef MAC - error = mac_check_vnode_getextattr(td->td_ucred, vp, attrnamespace, + error = mac_vnode_check_getextattr(td->td_ucred, vp, attrnamespace, attrname, &auio); if (error) goto done; @@ -4795,7 +4795,7 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_vnode_deleteextattr(td->td_ucred, vp, attrnamespace, + error = mac_vnode_check_deleteextattr(td->td_ucred, vp, attrnamespace, attrname); if (error) goto done; @@ -4952,7 +4952,7 @@ sizep = &size; #ifdef MAC - error = mac_check_vnode_listextattr(td->td_ucred, vp, attrnamespace); + error = mac_vnode_check_listextattr(td->td_ucred, vp, attrnamespace); if (error) goto done; #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_vnops.c#3 (text+ko) ==== @@ -145,7 +145,7 @@ goto restart; } #ifdef MAC - error = mac_check_vnode_create(cred, ndp->ni_dvp, + error = mac_vnode_check_create(cred, ndp->ni_dvp, &ndp->ni_cnd, vap); if (error == 0) { #endif @@ -210,7 +210,7 @@ if (fmode & O_APPEND) mode |= VAPPEND; #ifdef MAC - error = mac_check_vnode_open(cred, vp, mode); + error = mac_vnode_check_open(cred, vp, mode); if (error) goto bad; #endif @@ -381,10 +381,10 @@ #ifdef MAC if ((ioflg & IO_NOMACCHECK) == 0) { if (rw == UIO_READ) - error = mac_check_vnode_read(active_cred, file_cred, + error = mac_vnode_check_read(active_cred, file_cred, vp); else - error = mac_check_vnode_write(active_cred, file_cred, + error = mac_vnode_check_write(active_cred, file_cred, vp); } #endif @@ -514,7 +514,7 @@ ioflag |= sequential_heuristic(uio, fp); #ifdef MAC - error = mac_check_vnode_read(active_cred, fp->f_cred, vp); + error = mac_vnode_check_read(active_cred, fp->f_cred, vp); if (error == 0) #endif error = VOP_READ(vp, uio, ioflag, fp->f_cred); @@ -574,7 +574,7 @@ uio->uio_offset = fp->f_offset; ioflag |= sequential_heuristic(uio, fp); #ifdef MAC - error = mac_check_vnode_write(active_cred, fp->f_cred, vp); + error = mac_vnode_check_write(active_cred, fp->f_cred, vp); if (error == 0) #endif error = VOP_WRITE(vp, uio, ioflag, fp->f_cred); @@ -629,7 +629,7 @@ u_short mode; #ifdef MAC - error = mac_check_vnode_stat(active_cred, file_cred, vp); + error = mac_vnode_check_stat(active_cred, file_cred, vp); if (error) return (error); #endif @@ -782,7 +782,7 @@ vfslocked = VFS_LOCK_GIANT(vp->v_mount); #ifdef MAC vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = mac_check_vnode_poll(active_cred, fp->f_cred, vp); + error = mac_vnode_check_poll(active_cred, fp->f_cred, vp); VOP_UNLOCK(vp, 0, td); if (!error) #endif From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 13:20:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F094816A4DA for ; Thu, 6 Jul 2006 13:20:27 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D7F343D45 for ; Thu, 6 Jul 2006 13:20:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4115146CDB for ; Thu, 6 Jul 2006 09:20:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9DC775612C; Thu, 6 Jul 2006 13:20:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 90AA616A4E1; Thu, 6 Jul 2006 13:20:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6434E16A4DF for ; Thu, 6 Jul 2006 13:20:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B53C43D4C for ; Thu, 6 Jul 2006 13:20:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66DKNXm083380 for ; Thu, 6 Jul 2006 13:20:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66DKN5p083377 for perforce@freebsd.org; Thu, 6 Jul 2006 13:20:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 13:20:23 GMT Message-Id: <200607061320.k66DKN5p083377@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 100745 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 13:20:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=100745 Change 100745 by rwatson@rwatson_zoo on 2006/07/06 13:19:22 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/net/bpf.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/net/if.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_gif.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_ppp.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_tun.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/net/bpf.c#3 (text+ko) ==== @@ -375,8 +375,8 @@ d->bd_seesent = 1; d->bd_pid = td->td_proc->p_pid; #ifdef MAC - mac_init_bpfdesc(d); - mac_create_bpfdesc(td->td_ucred, d); + mac_bpfdesc_init(d); + mac_bpfdesc_create(td->td_ucred, d); #endif mtx_init(&d->bd_mtx, devtoname(dev), "bpf cdev lock", MTX_DEF); callout_init(&d->bd_callout, NET_CALLOUT_MPSAFE); @@ -407,7 +407,7 @@ mtx_unlock(&bpf_mtx); selwakeuppri(&d->bd_sel, PRINET); #ifdef MAC - mac_destroy_bpfdesc(d); + mac_bpfdesc_destroy(d); #endif /* MAC */ knlist_destroy(&d->bd_sel.si_note); bpf_freed(d); @@ -597,7 +597,7 @@ #ifdef MAC BPFD_LOCK(d); - mac_create_mbuf_from_bpfdesc(d, m); + mac_bpfdesc_create_mbuf(d, m); BPFD_UNLOCK(d); #endif NET_LOCK_GIANT(); @@ -1213,7 +1213,7 @@ if (slen != 0) { d->bd_fcount++; #ifdef MAC - if (mac_check_bpfdesc_receive(d, bp->bif_ifp) == 0) + if (mac_bpfdesc_check_receive(d, bp->bif_ifp) == 0) #endif catchpacket(d, pkt, pktlen, slen, bcopy); } @@ -1275,7 +1275,7 @@ if (slen != 0) { d->bd_fcount++; #ifdef MAC - if (mac_check_bpfdesc_receive(d, bp->bif_ifp) == 0) + if (mac_bpfdesc_check_receive(d, bp->bif_ifp) == 0) #endif catchpacket(d, (u_char *)m, pktlen, slen, bpf_mcopy); @@ -1317,7 +1317,7 @@ if (slen != 0) { d->bd_fcount++; #ifdef MAC - if (mac_check_bpfdesc_receive(d, bp->bif_ifp) == 0) + if (mac_bpfdesc_check_receive(d, bp->bif_ifp) == 0) #endif catchpacket(d, (u_char *)&mb, pktlen, slen, bpf_mcopy); ==== //depot/projects/trustedbsd/mac2/sys/net/if.c#3 (text+ko) ==== @@ -452,8 +452,8 @@ ifp->if_data.ifi_datalen = sizeof(struct if_data); #ifdef MAC - mac_init_ifnet(ifp); - mac_create_ifnet(ifp); + mac_ifnet_init(ifp); + mac_ifnet_create(ifp); #endif ifdev_byindex(ifp->if_index) = make_dev(&net_cdevsw, @@ -713,7 +713,7 @@ IF_AFDATA_UNLOCK(ifp); #ifdef MAC - mac_destroy_ifnet(ifp); + mac_ifnet_destroy(ifp); #endif /* MAC */ KNOTE_UNLOCKED(&ifp->if_klist, NOTE_EXIT); knlist_clear(&ifp->if_klist, 0); @@ -1444,7 +1444,7 @@ #ifdef MAC case SIOCGIFMAC: - error = mac_ioctl_ifnet_get(td->td_ucred, ifr, ifp); + error = mac_ifnet_ioctl_get(td->td_ucred, ifr, ifp); break; #endif @@ -1520,7 +1520,7 @@ #ifdef MAC case SIOCSIFMAC: - error = mac_ioctl_ifnet_set(td->td_ucred, ifr, ifp); + error = mac_ifnet_ioctl_set(td->td_ucred, ifr, ifp); break; #endif ==== //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#3 (text+ko) ==== @@ -148,7 +148,7 @@ int hlen; /* link layer header length */ #ifdef MAC - error = mac_check_ifnet_transmit(ifp, m); + error = mac_ifnet_check_transmit(ifp, m); if (error) senderr(error); #endif @@ -541,7 +541,7 @@ * Tag the mbuf with an appropriate MAC label before any other * consumers can get to it. */ - mac_create_mbuf_from_ifnet(ifp, m); + mac_ifnet_create_mbuf(ifp, m); #endif /* ==== //depot/projects/trustedbsd/mac2/sys/net/if_gif.c#3 (text+ko) ==== @@ -360,7 +360,7 @@ u_int32_t af; #ifdef MAC - error = mac_check_ifnet_transmit(ifp, m); + error = mac_ifnet_check_transmit(ifp, m); if (error) { m_freem(m); goto end; @@ -479,7 +479,7 @@ m->m_pkthdr.rcvif = ifp; #ifdef MAC - mac_create_mbuf_from_ifnet(ifp, m); + mac_ifnet_create_mbuf(ifp, m); #endif if (bpf_peers_present(ifp->if_bpf)) { ==== //depot/projects/trustedbsd/mac2/sys/net/if_ppp.c#3 (text+ko) ==== @@ -785,7 +785,7 @@ int len; #ifdef MAC - error = mac_check_ifnet_transmit(ifp, m0); + error = mac_ifnet_check_transmit(ifp, m0); if (error) goto bad; #endif @@ -1180,7 +1180,7 @@ if (m == NULL) break; #ifdef MAC - mac_create_mbuf_from_ifnet(PPP2IFP(sc), m); + mac_ifnet_create_mbuf(PPP2IFP(sc), m); #endif ppp_inproc(sc, m); } @@ -1458,7 +1458,7 @@ } } #ifdef MAC - mac_copy_mbuf(m, mp); + mac_mbuf_copy(m, mp); #endif cp = mtod(mp, u_char *); cp[0] = adrs; @@ -1512,7 +1512,7 @@ MGETHDR(mp, M_DONTWAIT, MT_DATA); if (mp != NULL) { #ifdef MAC - mac_copy_mbuf(m, mp); + mac_mbuf_copy(m, mp); #endif m_copydata(m, 0, ilen, mtod(mp, caddr_t)); m_freem(m); ==== //depot/projects/trustedbsd/mac2/sys/net/if_tun.c#3 (text+ko) ==== @@ -475,7 +475,7 @@ TUNDEBUG (ifp, "tunoutput\n"); #ifdef MAC - error = mac_check_ifnet_transmit(ifp, m0); + error = mac_ifnet_check_transmit(ifp, m0); if (error) { m_freem(m0); return (error); @@ -769,7 +769,7 @@ m->m_pkthdr.rcvif = ifp; #ifdef MAC - mac_create_mbuf_from_ifnet(ifp, m); + mac_ifnet_create_mbuf(ifp, m); #endif /* Could be unlocked read? */ From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 13:50:10 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9ACEA16A55C for ; Thu, 6 Jul 2006 13:50:10 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE4E643D53 for ; Thu, 6 Jul 2006 13:50:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D74E146D17 for ; Thu, 6 Jul 2006 09:50:07 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 53E4655A9E; Thu, 6 Jul 2006 13:50:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4933316A4DE; Thu, 6 Jul 2006 13:50:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0149E16A4DA for ; Thu, 6 Jul 2006 13:50:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F43A43D4C for ; Thu, 6 Jul 2006 13:50: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.6/8.13.6) with ESMTP id k66Do6mt085422 for ; Thu, 6 Jul 2006 13:50:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66Do6LE085419 for perforce@freebsd.org; Thu, 6 Jul 2006 13:50:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 13:50:06 GMT Message-Id: <200607061350.k66Do6LE085419@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 100753 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 13:50:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=100753 Change 100753 by rwatson@rwatson_zoo on 2006/07/06 13:49:53 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_icmp.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_input.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_options.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_output.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/raw_ip.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_output.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/udp_usrreq.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_syscalls.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#10 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.c#3 (text+ko) ==== @@ -183,11 +183,11 @@ inp->inp_pcbinfo = pcbinfo; inp->inp_socket = so; #ifdef MAC - error = mac_init_inpcb(inp, M_NOWAIT); + error = mac_inpcb_init(inp, M_NOWAIT); if (error != 0) goto out; SOCK_LOCK(so); - mac_create_inpcb_from_socket(so, inp); + mac_inpcb_create(so, inp); SOCK_UNLOCK(so); #endif #if defined(IPSEC) || defined(FAST_IPSEC) @@ -723,7 +723,7 @@ inp->inp_vflag = 0; INP_LOCK_DESTROY(inp); #ifdef MAC - mac_destroy_inpcb(inp); + mac_inpcb_destroy(inp); #endif uma_zfree(ipi->ipi_zone, inp); } ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_icmp.c#3 (text+ko) ==== @@ -228,7 +228,7 @@ if (m == NULL) goto freeit; #ifdef MAC - mac_create_mbuf_netlayer(n, m); + mac_mbuf_create_netlayer(n, m); #endif icmplen = min(icmplen, M_TRAILINGSPACE(m) - sizeof(struct ip) - ICMP_MINLEN); m_align(m, ICMP_MINLEN + icmplen); @@ -709,7 +709,7 @@ } match: #ifdef MAC - mac_reflect_mbuf_icmp(m); + mac_netinet_icmp_reply(m); #endif t = IA_SIN(ia)->sin_addr; ip->ip_src = t; ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_input.c#3 (text+ko) ==== @@ -770,7 +770,7 @@ ip->ip_src.s_addr == fp->ipq_src.s_addr && ip->ip_dst.s_addr == fp->ipq_dst.s_addr && #ifdef MAC - mac_fragment_match(m, fp) && + mac_ipq_match(m, fp) && #endif ip->ip_p == fp->ipq_p) goto found; @@ -846,12 +846,12 @@ if (fp == NULL) goto dropfrag; #ifdef MAC - if (mac_init_ipq(fp, M_NOWAIT) != 0) { + if (mac_ipq_init(fp, M_NOWAIT) != 0) { uma_zfree(ipq_zone, fp); fp = NULL; goto dropfrag; } - mac_create_ipq(m, fp); + mac_ipq_create(m, fp); #endif TAILQ_INSERT_HEAD(head, fp, ipq_list); nipq++; @@ -867,7 +867,7 @@ } else { fp->ipq_nfrags++; #ifdef MAC - mac_update_ipq(m, fp); + mac_ipq_update(m, fp); #endif } @@ -1009,8 +1009,8 @@ m->m_pkthdr.csum_data = (m->m_pkthdr.csum_data & 0xffff) + (m->m_pkthdr.csum_data >> 16); #ifdef MAC - mac_create_datagram_from_ipq(fp, m); - mac_destroy_ipq(fp); + mac_ipq_reassemble(fp, m); + mac_ipq_destroy(fp); #endif /* ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_options.c#3 (text+ko) ==== @@ -514,7 +514,7 @@ M_MOVE_PKTHDR(n, m); n->m_pkthdr.rcvif = NULL; #ifdef MAC - mac_copy_mbuf(m, n); + mac_mbuf_copy(m, n); #endif n->m_pkthdr.len += optlen; m->m_len -= sizeof(struct ip); ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_output.c#3 (text+ko) ==== @@ -726,7 +726,7 @@ m->m_pkthdr.len = mhlen + len; m->m_pkthdr.rcvif = NULL; #ifdef MAC - mac_create_fragment(m0, m); + mac_netinet_fragment(m0, m); #endif m->m_pkthdr.csum_flags = m0->m_pkthdr.csum_flags; mhip->ip_off = htons(mhip->ip_off); ==== //depot/projects/trustedbsd/mac2/sys/netinet/raw_ip.c#3 (text+ko) ==== @@ -163,7 +163,7 @@ } #endif /*IPSEC || FAST_IPSEC*/ #ifdef MAC - if (!policyfail && mac_check_inpcb_deliver(last, n) != 0) + if (!policyfail && mac_inpcb_check_deliver(last, n) != 0) policyfail = 1; #endif /* Check the minimum TTL for socket. */ @@ -329,7 +329,7 @@ flags |= IP_SENDONES; #ifdef MAC - mac_create_mbuf_from_inpcb(inp, m); + mac_inpcb_create_mbuf(inp, m); #endif error = ip_output(m, inp->inp_options, NULL, flags, ==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#3 (text+ko) ==== @@ -792,7 +792,7 @@ #ifdef MAC INP_LOCK_ASSERT(inp); - if (mac_check_inpcb_deliver(inp, m)) + if (mac_inpcb_check_deliver(inp, m)) goto drop; #endif so = inp->inp_socket; @@ -1403,7 +1403,7 @@ soisconnected(so); #ifdef MAC SOCK_LOCK(so); - mac_set_socket_peer_from_mbuf(m, so); + mac_socket_set_peer_from_mbuf(m, so); SOCK_UNLOCK(so); #endif /* Do window scaling on this connection? */ ==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_output.c#3 (text+ko) ==== @@ -819,7 +819,7 @@ SOCKBUF_UNLOCK_ASSERT(&so->so_snd); m->m_pkthdr.rcvif = (struct ifnet *)0; #ifdef MAC - mac_create_mbuf_from_inpcb(tp->t_inpcb, m); + mac_inpcb_create_mbuf(tp->t_inpcb, m); #endif #ifdef INET6 if (isipv6) { ==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#3 (text+ko) ==== @@ -541,13 +541,13 @@ * label of the response to reflect the socket label. */ INP_LOCK_ASSERT(inp); - mac_create_mbuf_from_inpcb(inp, m); + mac_inpcb_create_mbuf(inp, m); } else { /* * Packet is not associated with a socket, so possibly * update the label in place. */ - mac_reflect_mbuf_tcp(m); + mac_netinet_tcp_reply(m); } #endif nth->th_seq = htonl(seq); @@ -1924,7 +1924,7 @@ m->m_data += max_linkhdr; #ifdef MAC - mac_create_mbuf_from_inpcb(inp, m); + mac_inpcb_create_mbuf(inp, m); #endif #ifdef INET6 ==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.c#3 (text+ko) ==== @@ -562,7 +562,7 @@ } #ifdef MAC SOCK_LOCK(so); - mac_set_socket_peer_from_mbuf(m, so); + mac_socket_set_peer_from_mbuf(m, so); SOCK_UNLOCK(so); #endif @@ -1118,7 +1118,7 @@ INP_INFO_RUNLOCK(&tcbinfo); return (ESHUTDOWN); } - mac_create_mbuf_from_inpcb(inp, m); + mac_inpcb_create_mbuf(inp, m); INP_UNLOCK(inp); INP_INFO_RUNLOCK(&tcbinfo); #endif /* MAC */ ==== //depot/projects/trustedbsd/mac2/sys/netinet/udp_usrreq.c#3 (text+ko) ==== @@ -466,7 +466,7 @@ } #endif /*IPSEC || FAST_IPSEC*/ #ifdef MAC - if (mac_check_inpcb_deliver(inp, n) != 0) { + if (mac_inpcb_check_deliver(inp, n) != 0) { m_freem(n); return; } @@ -793,7 +793,7 @@ INP_LOCK(inp); #ifdef MAC - mac_create_mbuf_from_inpcb(inp, m); + mac_inpcb_create_mbuf(inp, m); #endif laddr = inp->inp_laddr; ==== //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_syscalls.c#3 (text+ko) ==== @@ -137,7 +137,7 @@ KASSERT(!mtx_owned(&Giant), ("nfssvc(): called with Giant")); #ifdef MAC - error = mac_check_system_nfsd(td->td_ucred); + error = mac_system_check_nfsd(td->td_ucred); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#10 (text+ko) ==== @@ -57,7 +57,6 @@ struct devfs_dirent; struct ifnet; struct ifreq; -struct inpcb; struct image_params; struct inpcb; struct ipq; @@ -130,11 +129,11 @@ struct ifnet *ifnet); int mac_inpcb_init(struct inpcb *, int flag); -void mac_inpcb_destroy_inpcb(struct inpcb *); +void mac_inpcb_destroy(struct inpcb *); void mac_inpcb_create(struct socket *so, struct inpcb *inp); void mac_inpcb_create_mbuf(struct inpcb *inp, struct mbuf *m); void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp); -int mac_inpcb_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m); +int mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *m); int mac_ipq_init(struct ipq *, int flag); void mac_ipq_destroy(struct ipq *); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 15:38:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28B3D16A4DA for ; Thu, 6 Jul 2006 15:38:27 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70C2543D46 for ; Thu, 6 Jul 2006 15:38:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7E2AB46CE5 for ; Thu, 6 Jul 2006 11:38:25 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9A3FD56233; Thu, 6 Jul 2006 15:38:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 935A616A4E0; Thu, 6 Jul 2006 15:38:23 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 705D216A4DD for ; Thu, 6 Jul 2006 15:38:23 +0000 (UTC) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 342CF43D46 for ; Thu, 6 Jul 2006 15:38:23 +0000 (GMT) (envelope-from deker@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66FcNgV094273 for ; Thu, 6 Jul 2006 15:38:23 GMT (envelope-from deker@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66FcMCJ094270 for perforce@freebsd.org; Thu, 6 Jul 2006 15:38:22 GMT (envelope-from deker@FreeBSD.org) Date: Thu, 6 Jul 2006 15:38:22 GMT Message-Id: <200607061538.k66FcMCJ094270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to deker@FreeBSD.org using -f From: Rob Deker To: Perforce Change Reviews Cc: Subject: PERFORCE change 100759 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 15:38:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=100759 Change 100759 by deker@sebsd_build on 2006/07/06 15:37:35 Update SEBSD page for new 7.0 version snapshot and add supfile/Install notes. Affected files ... .. //depot/projects/trustedbsd/www/downloads/20060705-7.0-SEBSD-supfile#1 add .. //depot/projects/trustedbsd/www/downloads/20060705-7.0-SEBSDInstall.txt#1 add .. //depot/projects/trustedbsd/www/sebsd.page#6 edit Differences ... ==== //depot/projects/trustedbsd/www/sebsd.page#6 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/sebsd.page#5 $ + $P4: //depot/projects/trustedbsd/www/sebsd.page#6 $ @@ -76,6 +76,15 @@ However, these components are available as source code module that plugs into the MAC Framework.

    +

    2006-07-05 7.0-SEBSD supfile: Download. + Install notes. + This SEBSD snapshot is based on a March 2006 snapshot of FreeBSD 7.x + and SELinux sources from the same timeframe. It also includes the new + SELinux Reference Policy + as a new policy baseline. It should be noted that SEBSD will not + currently function in enforcing mode as the new policy development + is still at a relatively early stage.

    +

    2005-06-24 6.0-SEBSD snapshot ISO: Download. Install notes. From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 16:16:49 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 48FE616A4DD for ; Thu, 6 Jul 2006 16:16:49 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47B8643D66 for ; Thu, 6 Jul 2006 16:16:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BB35A46CEF for ; Thu, 6 Jul 2006 12:16:29 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 03EC05590D; Thu, 6 Jul 2006 16:16:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F1EF116A4DE; Thu, 6 Jul 2006 16:16:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A5E416A4E9 for ; Thu, 6 Jul 2006 16:16:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7C9F43D5E for ; Thu, 6 Jul 2006 16:16:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66GGC3r097301 for ; Thu, 6 Jul 2006 16:16:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66GGCw6097298 for perforce@freebsd.org; Thu, 6 Jul 2006 16:16:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 16:16:12 GMT Message-Id: <200607061616.k66GGCw6097298@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 100766 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 16:16:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=100766 Change 100766 by rwatson@rwatson_zoo on 2006/07/06 16:15:55 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_inet.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_internal.h#4 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_label.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_net.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_pipe.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_posix_sem.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_process.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_vfs.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#11 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#19 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_inet.c#2 (text+ko) ==== @@ -2,6 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2004 Networks Associates Technology, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -12,6 +13,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -42,9 +46,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -84,9 +88,9 @@ label = mac_labelzone_alloc(flag); if (label == NULL) return (NULL); - MAC_CHECK(init_inpcb_label, label, flag); + MAC_CHECK(inpcb_init_label, label, flag); if (error) { - MAC_PERFORM(destroy_inpcb_label, label); + MAC_PERFORM(inpcb_destroy_label, label); mac_labelzone_free(label); return (NULL); } @@ -95,7 +99,7 @@ } int -mac_init_inpcb(struct inpcb *inp, int flag) +mac_inpcb_init(struct inpcb *inp, int flag) { inp->inp_label = mac_inpcb_label_alloc(flag); @@ -114,9 +118,9 @@ if (label == NULL) return (NULL); - MAC_CHECK(init_ipq_label, label, flag); + MAC_CHECK(ipq_init_label, label, flag); if (error) { - MAC_PERFORM(destroy_ipq_label, label); + MAC_PERFORM(ipq_destroy_label, label); mac_labelzone_free(label); return (NULL); } @@ -125,7 +129,7 @@ } int -mac_init_ipq(struct ipq *ipq, int flag) +mac_ipq_init(struct ipq *ipq, int flag) { ipq->ipq_label = mac_ipq_label_alloc(flag); @@ -138,13 +142,13 @@ mac_inpcb_label_free(struct label *label) { - MAC_PERFORM(destroy_inpcb_label, label); + MAC_PERFORM(inpcb_destroy_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacinpcbs); } void -mac_destroy_inpcb(struct inpcb *inp) +mac_inpcb_destroy(struct inpcb *inp) { mac_inpcb_label_free(inp->inp_label); @@ -155,13 +159,13 @@ mac_ipq_label_free(struct label *label) { - MAC_PERFORM(destroy_ipq_label, label); + MAC_PERFORM(ipq_destroy_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacipqs); } void -mac_destroy_ipq(struct ipq *ipq) +mac_ipq_destroy(struct ipq *ipq) { mac_ipq_label_free(ipq->ipq_label); @@ -169,59 +173,57 @@ } void -mac_create_inpcb_from_socket(struct socket *so, struct inpcb *inp) +mac_inpcb_create(struct socket *so, struct inpcb *inp) { - MAC_PERFORM(create_inpcb_from_socket, so, so->so_label, inp, - inp->inp_label); + MAC_PERFORM(inpcb_create, so, so->so_label, inp, inp->inp_label); } void -mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram) +mac_ipq_reassemble(struct ipq *ipq, struct mbuf *datagram) { struct label *label; label = mac_mbuf_to_label(datagram); - MAC_PERFORM(create_datagram_from_ipq, ipq, ipq->ipq_label, - datagram, label); + MAC_PERFORM(ipq_reassemble, ipq, ipq->ipq_label, datagram, label); } void -mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment) +mac_netinet_fragment(struct mbuf *datagram, struct mbuf *fragment) { struct label *datagramlabel, *fragmentlabel; datagramlabel = mac_mbuf_to_label(datagram); fragmentlabel = mac_mbuf_to_label(fragment); - MAC_PERFORM(create_fragment, datagram, datagramlabel, fragment, + MAC_PERFORM(netinet_fragment, datagram, datagramlabel, fragment, fragmentlabel); } void -mac_create_ipq(struct mbuf *fragment, struct ipq *ipq) +mac_ipq_create(struct mbuf *fragment, struct ipq *ipq) { struct label *label; label = mac_mbuf_to_label(fragment); - MAC_PERFORM(create_ipq, fragment, label, ipq, ipq->ipq_label); + MAC_PERFORM(ipq_create, fragment, label, ipq, ipq->ipq_label); } void -mac_create_mbuf_from_inpcb(struct inpcb *inp, struct mbuf *m) +mac_inpcb_create_mbuf(struct inpcb *inp, struct mbuf *m) { struct label *mlabel; INP_LOCK_ASSERT(inp); mlabel = mac_mbuf_to_label(m); - MAC_PERFORM(create_mbuf_from_inpcb, inp, inp->inp_label, m, mlabel); + MAC_PERFORM(inpcb_create_mbuf, inp, inp->inp_label, m, mlabel); } int -mac_fragment_match(struct mbuf *fragment, struct ipq *ipq) +mac_ipq_match(struct mbuf *fragment, struct ipq *ipq) { struct label *label; int result; @@ -229,43 +231,42 @@ label = mac_mbuf_to_label(fragment); result = 1; - MAC_BOOLEAN(fragment_match, &&, fragment, label, ipq, - ipq->ipq_label); + MAC_BOOLEAN(ipq_match, &&, fragment, label, ipq, ipq->ipq_label); return (result); } void -mac_reflect_mbuf_icmp(struct mbuf *m) +mac_netinet_icmp_reply(struct mbuf *m) { struct label *label; label = mac_mbuf_to_label(m); - MAC_PERFORM(reflect_mbuf_icmp, m, label); + MAC_PERFORM(netinet_icmp_reply, m, label); } void -mac_reflect_mbuf_tcp(struct mbuf *m) +mac_netinet_tcp_reply(struct mbuf *m) { struct label *label; label = mac_mbuf_to_label(m); - MAC_PERFORM(reflect_mbuf_tcp, m, label); + MAC_PERFORM(netinet_tcp_reply, m, label); } void -mac_update_ipq(struct mbuf *fragment, struct ipq *ipq) +mac_ipq_update(struct mbuf *fragment, struct ipq *ipq) { struct label *label; label = mac_mbuf_to_label(fragment); - MAC_PERFORM(update_ipq, fragment, label, ipq, ipq->ipq_label); + MAC_PERFORM(ipq_update, fragment, label, ipq, ipq->ipq_label); } int -mac_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m) +mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *m) { struct label *label; int error; @@ -277,7 +278,7 @@ label = mac_mbuf_to_label(m); - MAC_CHECK(check_inpcb_deliver, inp, inp->inp_label, m, label); + MAC_CHECK(inpcb_check_deliver, inp, inp->inp_label, m, label); return (error); } ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_internal.h#4 (text+ko) ==== @@ -13,6 +13,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -223,7 +226,7 @@ break; \ } \ claimed = 0; \ - MAC_CHECK(externalize_ ## type ## _label, label, \ + MAC_CHECK(type ## _externalize_label, label, \ element_name, &sb, &claimed); \ if (error) \ break; \ @@ -254,7 +257,7 @@ break; \ } \ claimed = 0; \ - MAC_CHECK(internalize_ ## type ## _label, label, \ + MAC_CHECK(type ## _internalize_label, label, \ element_name, element_data, &claimed); \ if (error) \ break; \ ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_label.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include "opt_mac.h" #include -#include +#include #include #include ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_net.c#2 (text+ko) ==== @@ -2,6 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2004 Networks Associates Technology, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -12,6 +13,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -45,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -114,13 +119,13 @@ struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(init_bpfdesc_label, label); + MAC_PERFORM(bpfdesc_init_label, label); MAC_DEBUG_COUNTER_INC(&nmacbpfdescs); return (label); } void -mac_init_bpfdesc(struct bpf_d *bpf_d) +mac_bpfdesc_init(struct bpf_d *bpf_d) { bpf_d->bd_label = mac_bpfdesc_label_alloc(); @@ -132,20 +137,20 @@ struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(init_ifnet_label, label); + MAC_PERFORM(ifnet_init_label, label); MAC_DEBUG_COUNTER_INC(&nmacifnets); return (label); } void -mac_init_ifnet(struct ifnet *ifp) +mac_ifnet_init(struct ifnet *ifp) { ifp->if_label = mac_ifnet_label_alloc(); } int -mac_init_mbuf_tag(struct m_tag *tag, int flag) +mac_mbuf_tag_init(struct m_tag *tag, int flag) { struct label *label; int error; @@ -153,9 +158,9 @@ label = (struct label *) (tag + 1); mac_init_label(label); - MAC_CHECK(init_mbuf_label, label, flag); + MAC_CHECK(mbuf_init_label, label, flag); if (error) { - MAC_PERFORM(destroy_mbuf_label, label); + MAC_PERFORM(mbuf_destroy_label, label); mac_destroy_label(label); } else { MAC_DEBUG_COUNTER_INC(&nmacmbufs); @@ -164,7 +169,7 @@ } int -mac_init_mbuf(struct mbuf *m, int flag) +mac_mbuf_init(struct mbuf *m, int flag) { struct m_tag *tag; int error; @@ -183,7 +188,7 @@ flag); if (tag == NULL) return (ENOMEM); - error = mac_init_mbuf_tag(tag, flag); + error = mac_mbuf_tag_init(tag, flag); if (error) { m_tag_free(tag); return (error); @@ -196,13 +201,13 @@ mac_bpfdesc_label_free(struct label *label) { - MAC_PERFORM(destroy_bpfdesc_label, label); + MAC_PERFORM(bpfdesc_destroy_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacbpfdescs); } void -mac_destroy_bpfdesc(struct bpf_d *bpf_d) +mac_bpfdesc_destroy(struct bpf_d *bpf_d) { mac_bpfdesc_label_free(bpf_d->bd_label); @@ -213,13 +218,13 @@ mac_ifnet_label_free(struct label *label) { - MAC_PERFORM(destroy_ifnet_label, label); + MAC_PERFORM(ifnet_destroy_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacifnets); } void -mac_destroy_ifnet(struct ifnet *ifp) +mac_ifnet_destroy(struct ifnet *ifp) { mac_ifnet_label_free(ifp->if_label); @@ -227,19 +232,19 @@ } void -mac_destroy_mbuf_tag(struct m_tag *tag) +mac_mbuf_tag_destroy(struct m_tag *tag) { struct label *label; label = (struct label *)(tag+1); - MAC_PERFORM(destroy_mbuf_label, label); + MAC_PERFORM(mbuf_destroy_label, label); mac_destroy_label(label); MAC_DEBUG_COUNTER_DEC(&nmacmbufs); } void -mac_copy_mbuf_tag(struct m_tag *src, struct m_tag *dest) +mac_mbuf_tag_copy(struct m_tag *src, struct m_tag *dest) { struct label *src_label, *dest_label; @@ -247,32 +252,32 @@ dest_label = (struct label *)(dest+1); /* - * mac_init_mbuf_tag() is called on the target tag in + * mac_mbuf_tag_init() is called on the target tag in * m_tag_copy(), so we don't need to call it here. */ - MAC_PERFORM(copy_mbuf_label, src_label, dest_label); + MAC_PERFORM(mbuf_copy_label, src_label, dest_label); } void -mac_copy_mbuf(struct mbuf *m_from, struct mbuf *m_to) +mac_mbuf_copy(struct mbuf *m_from, struct mbuf *m_to) { struct label *src_label, *dest_label; src_label = mac_mbuf_to_label(m_from); dest_label = mac_mbuf_to_label(m_to); - MAC_PERFORM(copy_mbuf_label, src_label, dest_label); + MAC_PERFORM(mbuf_copy_label, src_label, dest_label); } static void -mac_copy_ifnet_label(struct label *src, struct label *dest) +mac_ifnet_copy_label(struct label *src, struct label *dest) { - MAC_PERFORM(copy_ifnet_label, src, dest); + MAC_PERFORM(ifnet_copy_label, src, dest); } static int -mac_externalize_ifnet_label(struct label *label, char *elements, +mac_ifnet_externalize_label(struct label *label, char *elements, char *outbuf, size_t outbuflen) { int error; @@ -283,7 +288,7 @@ } static int -mac_internalize_ifnet_label(struct label *label, char *string) +mac_ifnet_internalize_label(struct label *label, char *string) { int error; @@ -293,23 +298,23 @@ } void -mac_create_ifnet(struct ifnet *ifnet) +mac_ifnet_create(struct ifnet *ifnet) { MAC_IFNET_LOCK(ifnet); - MAC_PERFORM(create_ifnet, ifnet, ifnet->if_label); + MAC_PERFORM(ifnet_create, ifnet, ifnet->if_label); MAC_IFNET_UNLOCK(ifnet); } void -mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d) +mac_bpfdesc_create(struct ucred *cred, struct bpf_d *bpf_d) { - MAC_PERFORM(create_bpfdesc, cred, bpf_d, bpf_d->bd_label); + MAC_PERFORM(bpfdesc_create, cred, bpf_d, bpf_d->bd_label); } void -mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *mbuf) +mac_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct mbuf *mbuf) { struct label *label; @@ -317,8 +322,7 @@ label = mac_mbuf_to_label(mbuf); - MAC_PERFORM(create_mbuf_from_bpfdesc, bpf_d, bpf_d->bd_label, mbuf, - label); + MAC_PERFORM(bpfdesc_create_mbuf, bpf_d, bpf_d->bd_label, mbuf, label); } void @@ -335,20 +339,19 @@ } void -mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *mbuf) +mac_ifnet_create_mbuf(struct ifnet *ifnet, struct mbuf *mbuf) { struct label *label; label = mac_mbuf_to_label(mbuf); MAC_IFNET_LOCK(ifnet); - MAC_PERFORM(create_mbuf_from_ifnet, ifnet, ifnet->if_label, mbuf, - label); + MAC_PERFORM(ifnet_create_mbuf, ifnet, ifnet->if_label, mbuf, label); MAC_IFNET_UNLOCK(ifnet); } void -mac_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct ifnet *ifnet, +mac_mbuf_create_multicast_encap(struct mbuf *oldmbuf, struct ifnet *ifnet, struct mbuf *newmbuf) { struct label *oldmbuflabel, *newmbuflabel; @@ -357,25 +360,25 @@ newmbuflabel = mac_mbuf_to_label(newmbuf); MAC_IFNET_LOCK(ifnet); - MAC_PERFORM(create_mbuf_multicast_encap, oldmbuf, oldmbuflabel, + MAC_PERFORM(mbuf_create_multicast_encap, oldmbuf, oldmbuflabel, ifnet, ifnet->if_label, newmbuf, newmbuflabel); MAC_IFNET_UNLOCK(ifnet); } void -mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf) +mac_mbuf_create_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf) { struct label *oldmbuflabel, *newmbuflabel; oldmbuflabel = mac_mbuf_to_label(oldmbuf); newmbuflabel = mac_mbuf_to_label(newmbuf); - MAC_PERFORM(create_mbuf_netlayer, oldmbuf, oldmbuflabel, newmbuf, + MAC_PERFORM(mbuf_create_netlayer, oldmbuf, oldmbuflabel, newmbuf, newmbuflabel); } int -mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet) +mac_bpfdesc_check_receive(struct bpf_d *bpf_d, struct ifnet *ifnet) { int error; @@ -385,7 +388,7 @@ return (0); MAC_IFNET_LOCK(ifnet); - MAC_CHECK(check_bpfdesc_receive, bpf_d, bpf_d->bd_label, ifnet, + MAC_CHECK(bpfdesc_check_receive, bpf_d, bpf_d->bd_label, ifnet, ifnet->if_label); MAC_IFNET_UNLOCK(ifnet); @@ -393,7 +396,7 @@ } int -mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf) +mac_ifnet_check_transmit(struct ifnet *ifnet, struct mbuf *mbuf) { struct label *label; int error; @@ -406,15 +409,14 @@ label = mac_mbuf_to_label(mbuf); MAC_IFNET_LOCK(ifnet); - MAC_CHECK(check_ifnet_transmit, ifnet, ifnet->if_label, mbuf, - label); + MAC_CHECK(ifnet_check_transmit, ifnet, ifnet->if_label, mbuf, label); MAC_IFNET_UNLOCK(ifnet); return (error); } int -mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr, +mac_ifnet_ioctl_get(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifnet) { char *elements, *buffer; @@ -440,9 +442,9 @@ buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); intlabel = mac_ifnet_label_alloc(); MAC_IFNET_LOCK(ifnet); - mac_copy_ifnet_label(ifnet->if_label, intlabel); + mac_ifnet_copy_label(ifnet->if_label, intlabel); MAC_IFNET_UNLOCK(ifnet); - error = mac_externalize_ifnet_label(ifnet->if_label, elements, + error = mac_ifnet_externalize_label(ifnet->if_label, elements, buffer, mac.m_buflen); mac_ifnet_label_free(intlabel); if (error == 0) @@ -455,7 +457,7 @@ } int -mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, +mac_ifnet_ioctl_set(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifnet) { struct label *intlabel; @@ -479,7 +481,7 @@ } intlabel = mac_ifnet_label_alloc(); - error = mac_internalize_ifnet_label(intlabel, buffer); + error = mac_ifnet_internalize_label(intlabel, buffer); free(buffer, M_MACTEMP); if (error) { mac_ifnet_label_free(intlabel); @@ -498,7 +500,7 @@ } MAC_IFNET_LOCK(ifnet); - MAC_CHECK(check_ifnet_relabel, cred, ifnet, ifnet->if_label, + MAC_CHECK(ifnet_check_relabel, cred, ifnet, ifnet->if_label, intlabel); if (error) { MAC_IFNET_UNLOCK(ifnet); @@ -506,7 +508,7 @@ return (error); } - MAC_PERFORM(relabel_ifnet, cred, ifnet, ifnet->if_label, intlabel); + MAC_PERFORM(ifnet_relabel, cred, ifnet, ifnet->if_label, intlabel); MAC_IFNET_UNLOCK(ifnet); mac_ifnet_label_free(intlabel); ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_pipe.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2002, 2003 Networks Associates Technology, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project in part by Network @@ -7,6 +8,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -41,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -68,13 +73,13 @@ struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(init_pipe_label, label); + MAC_PERFORM(pipe_init_label, label); MAC_DEBUG_COUNTER_INC(&nmacpipes); return (label); } void -mac_init_pipe(struct pipepair *pp) +mac_pipe_init(struct pipepair *pp) { pp->pp_label = mac_pipe_label_alloc(); @@ -84,13 +89,13 @@ mac_pipe_label_free(struct label *label) { - MAC_PERFORM(destroy_pipe_label, label); + MAC_PERFORM(pipe_destroy_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacpipes); } void -mac_destroy_pipe(struct pipepair *pp) +mac_pipe_destroy(struct pipepair *pp) { mac_pipe_label_free(pp->pp_label); @@ -98,14 +103,14 @@ } void -mac_copy_pipe_label(struct label *src, struct label *dest) +mac_pipe_copy_label(struct label *src, struct label *dest) { - MAC_PERFORM(copy_pipe_label, src, dest); + MAC_PERFORM(pipe_copy_label, src, dest); } int -mac_externalize_pipe_label(struct label *label, char *elements, +mac_pipe_externalize_label(struct label *label, char *elements, char *outbuf, size_t outbuflen) { int error; @@ -116,7 +121,7 @@ } int -mac_internalize_pipe_label(struct label *label, char *string) +mac_pipe_internalize_label(struct label *label, char *string) { int error; @@ -126,22 +131,22 @@ } void -mac_create_pipe(struct ucred *cred, struct pipepair *pp) +mac_pipe_create(struct ucred *cred, struct pipepair *pp) { - MAC_PERFORM(create_pipe, cred, pp, pp->pp_label); + MAC_PERFORM(pipe_create, cred, pp, pp->pp_label); } static void -mac_relabel_pipe(struct ucred *cred, struct pipepair *pp, +mac_pipe_relabel(struct ucred *cred, struct pipepair *pp, struct label *newlabel) { - MAC_PERFORM(relabel_pipe, cred, pp, pp->pp_label, newlabel); + MAC_PERFORM(pipe_relabel, cred, pp, pp->pp_label, newlabel); } int -mac_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp, +mac_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp, unsigned long cmd, void *data) { int error; @@ -151,13 +156,13 @@ if (!mac_enforce_pipe) return (0); - MAC_CHECK(check_pipe_ioctl, cred, pp, pp->pp_label, cmd, data); + MAC_CHECK(pipe_check_ioctl, cred, pp, pp->pp_label, cmd, data); return (error); } int -mac_check_pipe_poll(struct ucred *cred, struct pipepair *pp) +mac_pipe_check_poll(struct ucred *cred, struct pipepair *pp) { int error; @@ -166,13 +171,13 @@ if (!mac_enforce_pipe) return (0); - MAC_CHECK(check_pipe_poll, cred, pp, pp->pp_label); + MAC_CHECK(pipe_check_poll, cred, pp, pp->pp_label); return (error); } int -mac_check_pipe_read(struct ucred *cred, struct pipepair *pp) +mac_pipe_check_read(struct ucred *cred, struct pipepair *pp) { int error; @@ -181,13 +186,13 @@ if (!mac_enforce_pipe) return (0); - MAC_CHECK(check_pipe_read, cred, pp, pp->pp_label); + MAC_CHECK(pipe_check_read, cred, pp, pp->pp_label); return (error); } static int -mac_check_pipe_relabel(struct ucred *cred, struct pipepair *pp, +mac_pipe_check_relabel(struct ucred *cred, struct pipepair *pp, struct label *newlabel) { int error; @@ -197,13 +202,13 @@ if (!mac_enforce_pipe) return (0); - MAC_CHECK(check_pipe_relabel, cred, pp, pp->pp_label, newlabel); + MAC_CHECK(pipe_check_relabel, cred, pp, pp->pp_label, newlabel); return (error); } int -mac_check_pipe_stat(struct ucred *cred, struct pipepair *pp) +mac_pipe_check_stat(struct ucred *cred, struct pipepair *pp) { int error; @@ -212,13 +217,13 @@ if (!mac_enforce_pipe) return (0); - MAC_CHECK(check_pipe_stat, cred, pp, pp->pp_label); + MAC_CHECK(pipe_check_stat, cred, pp, pp->pp_label); return (error); } int -mac_check_pipe_write(struct ucred *cred, struct pipepair *pp) +mac_pipe_check_write(struct ucred *cred, struct pipepair *pp) { int error; @@ -227,7 +232,7 @@ if (!mac_enforce_pipe) return (0); - MAC_CHECK(check_pipe_write, cred, pp, pp->pp_label); + MAC_CHECK(pipe_check_write, cred, pp, pp->pp_label); return (error); } @@ -240,11 +245,11 @@ mtx_assert(&pp->pp_mtx, MA_OWNED); - error = mac_check_pipe_relabel(cred, pp, label); + error = mac_pipe_check_relabel(cred, pp, label); if (error) return (error); - mac_relabel_pipe(cred, pp, label); + mac_pipe_relabel(cred, pp, label); return (0); } ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_posix_sem.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include @@ -66,13 +66,13 @@ struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(init_posix_sem_label, label); + MAC_PERFORM(posix_sem_init_label, label); MAC_DEBUG_COUNTER_INC(&nmacposixsems); return (label); } void -mac_init_posix_sem(struct ksem *ksemptr) +mac_posix_sem_init(struct ksem *ksemptr) { ksemptr->ks_label = mac_posix_sem_label_alloc(); @@ -82,12 +82,12 @@ mac_posix_sem_label_free(struct label *label) { - MAC_PERFORM(destroy_posix_sem_label, label); + MAC_PERFORM(posix_sem_destroy_label, label); MAC_DEBUG_COUNTER_DEC(&nmacposixsems); } void -mac_destroy_posix_sem(struct ksem *ksemptr) +mac_posix_sem_destroy(struct ksem *ksemptr) { mac_posix_sem_label_free(ksemptr->ks_label); @@ -95,87 +95,87 @@ } void -mac_create_posix_sem(struct ucred *cred, struct ksem *ksemptr) +mac_posix_sem_create(struct ucred *cred, struct ksem *ksemptr) { - MAC_PERFORM(create_posix_sem, cred, ksemptr, ksemptr->ks_label); + MAC_PERFORM(posix_sem_create, cred, ksemptr, ksemptr->ks_label); } int -mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr) +mac_posix_sem_check_destroy(struct ucred *cred, struct ksem *ksemptr) { int error; if (!mac_enforce_posix_sem) return (0); - MAC_CHECK(check_posix_sem_destroy, cred, ksemptr, ksemptr->ks_label); + MAC_CHECK(posix_sem_check_destroy, cred, ksemptr, ksemptr->ks_label); return(error); } int -mac_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr) +mac_posix_sem_check_open(struct ucred *cred, struct ksem *ksemptr) { int error; if (!mac_enforce_posix_sem) return (0); - MAC_CHECK(check_posix_sem_open, cred, ksemptr, ksemptr->ks_label); + MAC_CHECK(posix_sem_check_open, cred, ksemptr, ksemptr->ks_label); return(error); } int -mac_check_posix_sem_getvalue(struct ucred *cred, struct ksem *ksemptr) +mac_posix_sem_check_getvalue(struct ucred *cred, struct ksem *ksemptr) { int error; if (!mac_enforce_posix_sem) return (0); - MAC_CHECK(check_posix_sem_getvalue, cred, ksemptr, + MAC_CHECK(posix_sem_check_getvalue, cred, ksemptr, ksemptr->ks_label); return(error); } int -mac_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 16:17:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E59616A563 for ; Thu, 6 Jul 2006 16:17:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6601F43D49 for ; Thu, 6 Jul 2006 16:17:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8796E46CEA for ; Thu, 6 Jul 2006 12:17:54 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8028355697; Thu, 6 Jul 2006 16:17:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C1B716A4E1; Thu, 6 Jul 2006 16:17:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0262C16A4DE for ; Thu, 6 Jul 2006 16:17:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAA4143D46 for ; Thu, 6 Jul 2006 16:17:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66GHECi097406 for ; Thu, 6 Jul 2006 16:17:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66GHELp097403 for perforce@freebsd.org; Thu, 6 Jul 2006 16:17:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 16:17:14 GMT Message-Id: <200607061617.k66GHELp097403@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 100769 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2006 16:17:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=100769 Change 100769 by rwatson@rwatson_zoo on 2006/07/06 16:17:09 Rename of userret function premature. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#12 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#20 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#12 (text+ko) ==== ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#20 (text+ko) ==== @@ -363,7 +363,6 @@ typedef void (*mpo_proc_destroy_label_t)(struct label *label); typedef void (*mpo_proc_create_init_t)(struct ucred *cred); typedef void (*mpo_proc_create_swapper_t)(struct ucred *cred); -typedef void (*mpo_proc_thread_userret_t)(struct thread *thread); typedef int (*mpo_proc_check_debug_t)(struct ucred *cred, struct proc *proc); typedef int (*mpo_proc_check_sched_t)(struct ucred *cred, @@ -386,6 +385,7 @@ struct proc *proc, int signum); typedef int (*mpo_proc_check_wait_t)(struct ucred *cred, struct proc *proc); +typedef void (*mpo_thread_userret_t)(struct thread *thread); typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); /* @@ -784,7 +784,6 @@ mpo_proc_destroy_label_t mpo_proc_destroy_label; mpo_proc_create_init_t mpo_proc_create_init; mpo_proc_create_swapper_t mpo_proc_create_swapper; - mpo_proc_thread_userret_t mpo_proc_thread_userret; mpo_proc_check_debug_t mpo_proc_check_debug; mpo_proc_check_sched_t mpo_proc_check_sched; mpo_proc_check_setuid_t mpo_proc_check_setuid; @@ -798,6 +797,7 @@ mpo_proc_check_setresgid_t mpo_proc_check_setresgid; mpo_proc_check_signal_t mpo_proc_check_signal; mpo_proc_check_wait_t mpo_proc_check_wait; + mpo_thread_userret_t mpo_thread_userret; mpo_sysvmsq_init_label_t mpo_sysvmsq_init_label; mpo_sysvmsq_destroy_t mpo_sysvmsq_destroy; From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 10:13:00 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0981616A4DD for ; Sat, 8 Jul 2006 10:13:00 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5704443D45 for ; Sat, 8 Jul 2006 10:12:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1D64B46D1A for ; Sat, 8 Jul 2006 06:12:58 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D884F56ED8; Sat, 8 Jul 2006 10:11:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CED1D16A4DD; Sat, 8 Jul 2006 10:11:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A5B6016A4DF for ; Sat, 8 Jul 2006 10:11:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4826543D46 for ; Sat, 8 Jul 2006 10:11:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68ABWpq082850 for ; Sat, 8 Jul 2006 10:11:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68ABVeD082835 for perforce@freebsd.org; Sat, 8 Jul 2006 10:11:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 10:11:31 GMT Message-Id: <200607081011.k68ABVeD082835@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 100972 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 10:13:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=100972 Change 100972 by rwatson@rwatson_zoo on 2006/07/08 10:10:35 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/i386/i386/sys_machdep.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#4 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_sem.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/net/bsd_comp.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_atmsubr.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_fddisubr.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_fwsubr.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_iso88025subr.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/net/if_stf.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_input.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_output.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_divert.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_mroute.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_process.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_socket.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_system.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_msg.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_sem.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_shm.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_vfs.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac.h#4 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#13 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#21 edit .. //depot/projects/trustedbsd/mac2/sys/ufs/ffs/ffs_vfsops.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/ufs/ufs/ufs_vnops.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/vm/swap_pager.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/vm/vm_mmap.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/i386/i386/sys_machdep.c#3 (text+ko) ==== @@ -286,7 +286,7 @@ char *iomap; #ifdef MAC - if ((error = mac_check_sysarch_ioperm(td->td_ucred)) != 0) + if ((error = mac_system_check_ioperm(td->td_ucred)) != 0) return (error); #endif if ((error = suser(td)) != 0) ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#4 (text+ko) ==== @@ -548,7 +548,7 @@ credential_changing |= (attr.va_mode & VSGID) && oldcred->cr_gid != attr.va_gid; #ifdef MAC - will_transition = mac_execve_will_transition(oldcred, imgp->vp, + will_transition = mac_vnode_execve_will_transition(oldcred, imgp->vp, interplabel, imgp); credential_changing |= will_transition; #endif @@ -600,8 +600,8 @@ change_egid(newcred, attr.va_gid); #ifdef MAC if (will_transition) { - mac_execve_transition(oldcred, newcred, imgp->vp, - interplabel, imgp); + mac_vnode_execve_transition(oldcred, newcred, + imgp->vp, interplabel, imgp); } #endif /* ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_sem.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002 Alfred Perlstein - * Copyright (c) 2003-2005 SPARTA, Inc. + * Copyright (c) 2003-2006 SPARTA, Inc. * Copyright (c) 2005 Robert N. M. Watson * All rights reserved. * @@ -9,6 +9,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -213,8 +216,8 @@ cv_init(&ret->ks_cv, "sem"); LIST_INIT(&ret->ks_users); #ifdef MAC - mac_init_posix_sem(ret); - mac_create_posix_sem(uc, ret); + mac_posix_sem_init(ret); + mac_posix_sem_create(uc, ret); #endif if (name != NULL) sem_enter(td->td_proc, ret); @@ -379,7 +382,7 @@ } } else { #ifdef MAC - error = mac_check_posix_sem_open(td->td_ucred, ks); + error = mac_posix_sem_check_open(td->td_ucred, ks); if (error) goto err_open; #endif @@ -531,7 +534,7 @@ ks = sem_lookup_byname(name); if (ks != NULL) { #ifdef MAC - error = mac_check_posix_sem_unlink(td->td_ucred, ks); + error = mac_posix_sem_check_unlink(td->td_ucred, ks); if (error) { mtx_unlock(&sem_lock); return (error); @@ -606,7 +609,7 @@ goto err; } #ifdef MAC - error = mac_check_posix_sem_post(td->td_ucred, ks); + error = mac_posix_sem_check_post(td->td_ucred, ks); if (error) goto err; #endif @@ -702,7 +705,7 @@ goto err; } #ifdef MAC - error = mac_check_posix_sem_wait(td->td_ucred, ks); + error = mac_posix_sem_check_wait(td->td_ucred, ks); if (error) { DP(("kern_sem_wait mac failed\n")); goto err; @@ -765,7 +768,7 @@ return (EINVAL); } #ifdef MAC - error = mac_check_posix_sem_getvalue(td->td_ucred, ks); + error = mac_posix_sem_check_getvalue(td->td_ucred, ks); if (error) { mtx_unlock(&sem_lock); return (error); @@ -797,7 +800,7 @@ goto err; } #ifdef MAC - error = mac_check_posix_sem_destroy(td->td_ucred, ks); + error = mac_posix_sem_check_destroy(td->td_ucred, ks); if (error) goto err; #endif ==== //depot/projects/trustedbsd/mac2/sys/net/bsd_comp.c#3 (text+ko) ==== @@ -880,7 +880,7 @@ wptr = mtod(dmp, u_char *); space = M_TRAILINGSPACE(dmp) - PPP_HDRLEN + 1; #ifdef MAC - mac_copy_mbuf(cmp, dmp); + mac_mbuf_copy(cmp, dmp); #endif /* ==== //depot/projects/trustedbsd/mac2/sys/net/if_atmsubr.c#3 (text+ko) ==== @@ -133,7 +133,7 @@ u_int32_t atm_flags; #ifdef MAC - error = mac_check_ifnet_transmit(ifp, m); + error = mac_ifnet_check_transmit(ifp, m); if (error) senderr(error); #endif @@ -266,7 +266,7 @@ return; } #ifdef MAC - mac_create_mbuf_from_ifnet(ifp, m); + mac_ifnet_create_mbuf(ifp, m); #endif ifp->if_ibytes += m->m_pkthdr.len; ==== //depot/projects/trustedbsd/mac2/sys/net/if_fddisubr.c#3 (text+ko) ==== @@ -120,7 +120,7 @@ struct fddi_header *fh; #ifdef MAC - error = mac_check_ifnet_transmit(ifp, m); + error = mac_ifnet_check_transmit(ifp, m); if (error) senderr(error); #endif @@ -406,7 +406,7 @@ } #ifdef MAC - mac_create_mbuf_from_ifnet(ifp, m); + mac_ifnet_create_mbuf(ifp, m); #endif /* ==== //depot/projects/trustedbsd/mac2/sys/net/if_fwsubr.c#3 (text+ko) ==== @@ -90,7 +90,7 @@ static int next_dgl; #ifdef MAC - error = mac_check_ifnet_transmit(ifp, m); + error = mac_ifnet_check_transmit(ifp, m); if (error) goto bad; #endif @@ -558,7 +558,7 @@ * Tag the mbuf with an appropriate MAC label before any other * consumers can get to it. */ - mac_create_mbuf_from_ifnet(ifp, m); + mac_ifnet_create_mbuf(ifp, m); #endif /* ==== //depot/projects/trustedbsd/mac2/sys/net/if_iso88025subr.c#3 (text+ko) ==== @@ -243,7 +243,7 @@ struct rtentry *rt = NULL; #ifdef MAC - error = mac_check_ifnet_transmit(ifp, m); + error = mac_ifnet_check_transmit(ifp, m); if (error) senderr(error); #endif @@ -502,7 +502,7 @@ } #ifdef MAC - mac_create_mbuf_from_ifnet(ifp, m); + mac_ifnet_create_mbuf(ifp, m); #endif /* ==== //depot/projects/trustedbsd/mac2/sys/net/if_stf.c#3 (text+ko) ==== @@ -407,7 +407,7 @@ #ifdef MAC int error; - error = mac_check_ifnet_transmit(ifp, m); + error = mac_ifnet_check_transmit(ifp, m); if (error) { m_freem(m); return (error); @@ -675,7 +675,7 @@ ifp = STF2IFP(sc); #ifdef MAC - mac_create_mbuf_from_ifnet(ifp, m); + mac_ifnet_create_mbuf(ifp, m); #endif /* ==== //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_input.c#3 (text+ko) ==== @@ -411,7 +411,7 @@ #ifdef MAC SOCK_LOCK(ddp->ddp_socket); - if (mac_check_socket_deliver(ddp->ddp_socket, m) != 0) { + if (mac_socket_check_deliver(ddp->ddp_socket, m) != 0) { SOCK_UNLOCK(ddp->ddp_socket); goto out; } ==== //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_output.c#3 (text+ko) ==== @@ -53,7 +53,7 @@ #ifdef MAC SOCK_LOCK(so); - mac_create_mbuf_from_socket(so, m); + mac_socket_create_mbuf(so, m); SOCK_UNLOCK(so); #endif @@ -207,7 +207,7 @@ return (ENOBUFS); } #ifdef MAC - mac_copy_mbuf(m, m0); + mac_mbuf_copy(m, m0); #endif m0->m_next = m; /* XXX perhaps we ought to align the header? */ ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_divert.c#3 (text+ko) ==== @@ -349,7 +349,7 @@ ipstat.ips_rawout++; /* XXX */ #ifdef MAC - mac_create_mbuf_from_inpcb(inp, m); + mac_inpcb_create_mbuf(inp, m); #endif error = ip_output(m, inp->inp_options, NULL, @@ -381,7 +381,7 @@ } #ifdef MAC SOCK_LOCK(so); - mac_create_mbuf_from_socket(so, m); + mac_socket_create_mbuf(so, m); SOCK_UNLOCK(so); #endif /* Send packet to input processing */ ==== //depot/projects/trustedbsd/mac2/sys/netinet/ip_mroute.c#3 (text+ko) ==== @@ -1908,7 +1908,7 @@ if (mb_copy == NULL) return; #ifdef MAC - mac_create_mbuf_multicast_encap(m, vifp->v_ifp, mb_copy); + mac_mbuf_create_multicast_encap(m, vifp->v_ifp, mb_copy); #endif mb_copy->m_data += max_linkhdr; mb_copy->m_len = sizeof(multicast_encap_iphdr); ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_process.c#3 (text+ko) ==== @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -378,7 +379,7 @@ vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); result = vme->max_protection; - mac_check_vnode_mmap_downgrade(cred, vp, &result); + mac_vnode_check_mmap_downgrade(cred, vp, &result); VOP_UNLOCK(vp, 0, td); /* * Find out what maximum protection we may be allowing @@ -461,37 +462,37 @@ * buffer cache. */ void -mac_relabel_cred(struct ucred *cred, struct label *newlabel) +mac_cred_relabel(struct ucred *cred, struct label *newlabel) { - MAC_PERFORM(relabel_cred, cred, newlabel); + MAC_PERFORM(cred_relabel, cred, newlabel); } int -mac_check_cred_relabel(struct ucred *cred, struct label *newlabel) +mac_cred_check_relabel(struct ucred *cred, struct label *newlabel) { int error; - MAC_CHECK(check_cred_relabel, cred, newlabel); + MAC_CHECK(cred_check_relabel, cred, newlabel); return (error); } int -mac_check_cred_visible(struct ucred *u1, struct ucred *u2) +mac_cred_check_visible(struct ucred *u1, struct ucred *u2) { int error; if (!mac_enforce_process) return (0); - MAC_CHECK(check_cred_visible, u1, u2); + MAC_CHECK(cred_check_visible, u1, u2); return (error); } int -mac_check_proc_debug(struct ucred *cred, struct proc *proc) +mac_proc_check_debug(struct ucred *cred, struct proc *proc) { int error; @@ -500,13 +501,13 @@ if (!mac_enforce_process) return (0); - MAC_CHECK(check_proc_debug, cred, proc); + MAC_CHECK(proc_check_debug, cred, proc); return (error); } int -mac_check_proc_sched(struct ucred *cred, struct proc *proc) +mac_proc_check_sched(struct ucred *cred, struct proc *proc) { int error; @@ -515,13 +516,13 @@ if (!mac_enforce_process) return (0); - MAC_CHECK(check_proc_sched, cred, proc); + MAC_CHECK(proc_check_sched, cred, proc); return (error); } int -mac_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) +mac_proc_check_signal(struct ucred *cred, struct proc *proc, int signum) { int error; @@ -530,13 +531,13 @@ if (!mac_enforce_process) return (0); - MAC_CHECK(check_proc_signal, cred, proc, signum); + MAC_CHECK(proc_check_signal, cred, proc, signum); return (error); } int -mac_check_proc_setuid(struct proc *proc, struct ucred *cred, uid_t uid) +mac_proc_check_setuid(struct proc *proc, struct ucred *cred, uid_t uid) { int error; @@ -545,12 +546,12 @@ if (!mac_enforce_suid) return (0); - MAC_CHECK(check_proc_setuid, cred, uid); + MAC_CHECK(proc_check_setuid, cred, uid); return (error); } int -mac_check_proc_seteuid(struct proc *proc, struct ucred *cred, uid_t euid) +mac_proc_check_seteuid(struct proc *proc, struct ucred *cred, uid_t euid) { int error; @@ -559,12 +560,12 @@ if (!mac_enforce_suid) return (0); - MAC_CHECK(check_proc_seteuid, cred, euid); + MAC_CHECK(proc_check_seteuid, cred, euid); return (error); } int -mac_check_proc_setgid(struct proc *proc, struct ucred *cred, gid_t gid) +mac_proc_check_setgid(struct proc *proc, struct ucred *cred, gid_t gid) { int error; @@ -573,12 +574,12 @@ if (!mac_enforce_suid) return (0); - MAC_CHECK(check_proc_setgid, cred, gid); + MAC_CHECK(proc_check_setgid, cred, gid); return (error); } int -mac_check_proc_setegid(struct proc *proc, struct ucred *cred, gid_t egid) +mac_proc_check_setegid(struct proc *proc, struct ucred *cred, gid_t egid) { int error; @@ -587,12 +588,12 @@ if (!mac_enforce_suid) return (0); - MAC_CHECK(check_proc_setegid, cred, egid); + MAC_CHECK(proc_check_setegid, cred, egid); return (error); } int -mac_check_proc_setgroups(struct proc *proc, struct ucred *cred, +mac_proc_check_setgroups(struct proc *proc, struct ucred *cred, int ngroups, gid_t *gidset) { int error; @@ -602,12 +603,12 @@ if (!mac_enforce_suid) return (0); - MAC_CHECK(check_proc_setgroups, cred, ngroups, gidset); + MAC_CHECK(proc_check_setgroups, cred, ngroups, gidset); return (error); } int -mac_check_proc_setreuid(struct proc *proc, struct ucred *cred, uid_t ruid, +mac_proc_check_setreuid(struct proc *proc, struct ucred *cred, uid_t ruid, uid_t euid) { int error; @@ -617,12 +618,12 @@ if (!mac_enforce_suid) return (0); - MAC_CHECK(check_proc_setreuid, cred, ruid, euid); + MAC_CHECK(proc_check_setreuid, cred, ruid, euid); return (error); } int -mac_check_proc_setregid(struct proc *proc, struct ucred *cred, gid_t rgid, +mac_proc_check_setregid(struct proc *proc, struct ucred *cred, gid_t rgid, gid_t egid) { int error; @@ -632,12 +633,12 @@ if (!mac_enforce_suid) return (0); - MAC_CHECK(check_proc_setregid, cred, rgid, egid); + MAC_CHECK(proc_check_setregid, cred, rgid, egid); return (error); } int -mac_check_proc_setresuid(struct proc *proc, struct ucred *cred, uid_t ruid, +mac_proc_check_setresuid(struct proc *proc, struct ucred *cred, uid_t ruid, uid_t euid, uid_t suid) { int error; @@ -647,12 +648,12 @@ if (!mac_enforce_suid) return (0); - MAC_CHECK(check_proc_setresuid, cred, ruid, euid, suid); + MAC_CHECK(proc_check_setresuid, cred, ruid, euid, suid); return (error); } int -mac_check_proc_setresgid(struct proc *proc, struct ucred *cred, gid_t rgid, +mac_proc_check_setresgid(struct proc *proc, struct ucred *cred, gid_t rgid, gid_t egid, gid_t sgid) { int error; @@ -662,12 +663,12 @@ if (!mac_enforce_suid) return (0); - MAC_CHECK(check_proc_setresgid, cred, rgid, egid, sgid); + MAC_CHECK(proc_check_setresgid, cred, rgid, egid, sgid); return (error); } int -mac_check_proc_wait(struct ucred *cred, struct proc *proc) +mac_proc_check_wait(struct ucred *cred, struct proc *proc) { int error; @@ -676,7 +677,7 @@ if (!mac_enforce_process) return (0); - MAC_CHECK(check_proc_wait, cred, proc); + MAC_CHECK(proc_check_wait, cred, proc); return (error); } ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_socket.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2005 Networks Associates Technology, Inc. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -97,9 +98,9 @@ if (label == NULL) return (NULL); - MAC_CHECK(init_socket_label, label, flag); + MAC_CHECK(socket_init_label, label, flag); if (error) { - MAC_PERFORM(destroy_socket_label, label); + MAC_PERFORM(socket_destroy_label, label); mac_labelzone_free(label); return (NULL); } @@ -117,9 +118,9 @@ if (label == NULL) return (NULL); - MAC_CHECK(init_socket_peer_label, label, flag); + MAC_CHECK(socket_init_peer_label, label, flag); if (error) { - MAC_PERFORM(destroy_socket_peer_label, label); + MAC_PERFORM(socket_destroy_peer_label, label); mac_labelzone_free(label); return (NULL); } @@ -128,7 +129,7 @@ } int -mac_init_socket(struct socket *so, int flag) +mac_socket_init(struct socket *so, int flag) { so->so_label = mac_socket_label_alloc(flag); @@ -147,7 +148,7 @@ mac_socket_label_free(struct label *label) { - MAC_PERFORM(destroy_socket_label, label); + MAC_PERFORM(socket_destroy_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacsockets); } @@ -156,13 +157,13 @@ mac_socket_peer_label_free(struct label *label) { - MAC_PERFORM(destroy_socket_peer_label, label); + MAC_PERFORM(socket_destroy_peer_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacsockets); } void -mac_destroy_socket(struct socket *socket) +mac_socket_destroy(struct socket *socket) { mac_socket_label_free(socket->so_label); @@ -172,14 +173,14 @@ } void -mac_copy_socket_label(struct label *src, struct label *dest) +mac_socket_copy_label(struct label *src, struct label *dest) { - MAC_PERFORM(copy_socket_label, src, dest); + MAC_PERFORM(socket_copy_label, src, dest); } int -mac_externalize_socket_label(struct label *label, char *elements, +mac_socket_externalize_label(struct label *label, char *elements, char *outbuf, size_t outbuflen) { int error; @@ -190,7 +191,7 @@ } static int -mac_externalize_socket_peer_label(struct label *label, char *elements, +mac_socket_peer_externalize_label(struct label *label, char *elements, char *outbuf, size_t outbuflen) { int error; @@ -201,7 +202,7 @@ } int -mac_internalize_socket_label(struct label *label, char *string) +mac_socket_internalize_label(struct label *label, char *string) { int error; @@ -211,33 +212,32 @@ } void -mac_create_socket(struct ucred *cred, struct socket *socket) +mac_socket_create(struct ucred *cred, struct socket *socket) { - MAC_PERFORM(create_socket, cred, socket, socket->so_label); + MAC_PERFORM(socket_create, cred, socket, socket->so_label); } void -mac_create_socket_from_socket(struct socket *oldsocket, - struct socket *newsocket) +mac_socket_accept(struct socket *oldsocket, struct socket *newsocket) { SOCK_LOCK_ASSERT(oldsocket); - MAC_PERFORM(create_socket_from_socket, oldsocket, oldsocket->so_label, - newsocket, newsocket->so_label); + MAC_PERFORM(socket_accept, oldsocket, oldsocket->so_label, newsocket, + newsocket->so_label); } static void -mac_relabel_socket(struct ucred *cred, struct socket *socket, +mac_socket_relabel(struct ucred *cred, struct socket *socket, struct label *newlabel) { SOCK_LOCK_ASSERT(socket); - MAC_PERFORM(relabel_socket, cred, socket, socket->so_label, newlabel); + MAC_PERFORM(socket_relabel, cred, socket, socket->so_label, newlabel); } void -mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) +mac_socket_set_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) { struct label *label; @@ -245,12 +245,12 @@ label = mac_mbuf_to_label(mbuf); - MAC_PERFORM(set_socket_peer_from_mbuf, mbuf, label, socket, + MAC_PERFORM(socket_set_peer_from_mbuf, mbuf, label, socket, socket->so_peerlabel); } void -mac_set_socket_peer_from_socket(struct socket *oldsocket, +mac_socket_set_peer_from_socket(struct socket *oldsocket, struct socket *newsocket) { @@ -260,24 +260,24 @@ * called in both directions, so we can't assert the lock * here currently. */ - MAC_PERFORM(set_socket_peer_from_socket, oldsocket, + MAC_PERFORM(socket_set_peer_from_socket, oldsocket, oldsocket->so_label, newsocket, newsocket->so_peerlabel); } void -mac_create_mbuf_from_socket(struct socket *socket, struct mbuf *mbuf) +mac_socket_create_mbuf(struct socket *socket, struct mbuf *mbuf) { struct label *label; label = mac_mbuf_to_label(mbuf); SOCK_LOCK_ASSERT(socket); - MAC_PERFORM(create_mbuf_from_socket, socket, socket->so_label, mbuf, + MAC_PERFORM(socket_create_mbuf, socket, socket->so_label, mbuf, label); } int -mac_check_socket_accept(struct ucred *cred, struct socket *socket) +mac_socket_check_accept(struct ucred *cred, struct socket *socket) { int error; @@ -286,13 +286,13 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_accept, cred, socket, socket->so_label); + MAC_CHECK(socket_check_accept, cred, socket, socket->so_label); return (error); } int -mac_check_socket_bind(struct ucred *ucred, struct socket *socket, +mac_socket_check_bind(struct ucred *ucred, struct socket *socket, struct sockaddr *sockaddr) { int error; @@ -302,14 +302,14 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_bind, ucred, socket, socket->so_label, + MAC_CHECK(socket_check_bind, ucred, socket, socket->so_label, sockaddr); return (error); } int -mac_check_socket_connect(struct ucred *cred, struct socket *socket, +mac_socket_check_connect(struct ucred *cred, struct socket *socket, struct sockaddr *sockaddr) { int error; @@ -319,14 +319,14 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_connect, cred, socket, socket->so_label, + MAC_CHECK(socket_check_connect, cred, socket, socket->so_label, sockaddr); return (error); } int -mac_check_socket_create(struct ucred *cred, int domain, int type, +mac_socket_check_create(struct ucred *cred, int domain, int type, int protocol) { int error; @@ -334,13 +334,13 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_create, cred, domain, type, protocol); + MAC_CHECK(socket_check_create, cred, domain, type, protocol); return (error); } int -mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf) +mac_socket_check_deliver(struct socket *socket, struct mbuf *mbuf) { struct label *label; int error; @@ -352,14 +352,14 @@ label = mac_mbuf_to_label(mbuf); - MAC_CHECK(check_socket_deliver, socket, socket->so_label, mbuf, + MAC_CHECK(socket_check_deliver, socket, socket->so_label, mbuf, label); return (error); } int -mac_check_socket_listen(struct ucred *cred, struct socket *socket) +mac_socket_check_listen(struct ucred *cred, struct socket *socket) { int error; @@ -368,12 +368,12 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_listen, cred, socket, socket->so_label); + MAC_CHECK(socket_check_listen, cred, socket, socket->so_label); return (error); } int -mac_check_socket_poll(struct ucred *cred, struct socket *so) +mac_socket_check_poll(struct ucred *cred, struct socket *so) { int error; @@ -382,12 +382,12 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_poll, cred, so, so->so_label); + MAC_CHECK(socket_check_poll, cred, so, so->so_label); return (error); } int -mac_check_socket_receive(struct ucred *cred, struct socket *so) +mac_socket_check_receive(struct ucred *cred, struct socket *so) { int error; @@ -396,27 +396,27 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_receive, cred, so, so->so_label); + MAC_CHECK(socket_check_receive, cred, so, so->so_label); return (error); } static int -mac_check_socket_relabel(struct ucred *cred, struct socket *socket, +mac_socket_check_relabel(struct ucred *cred, struct socket *socket, struct label *newlabel) { int error; SOCK_LOCK_ASSERT(socket); - MAC_CHECK(check_socket_relabel, cred, socket, socket->so_label, + MAC_CHECK(socket_check_relabel, cred, socket, socket->so_label, newlabel); return (error); } int -mac_check_socket_send(struct ucred *cred, struct socket *so) +mac_socket_check_send(struct ucred *cred, struct socket *so) { int error; @@ -425,13 +425,13 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_send, cred, so, so->so_label); + MAC_CHECK(socket_check_send, cred, so, so->so_label); return (error); } int -mac_check_socket_stat(struct ucred *cred, struct socket *so) +mac_socket_check_stat(struct ucred *cred, struct socket *so) { int error; @@ -440,13 +440,13 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_stat, cred, so, so->so_label); + MAC_CHECK(socket_check_stat, cred, so, so->so_label); return (error); } int -mac_check_socket_visible(struct ucred *cred, struct socket *socket) +mac_socket_check_visible(struct ucred *cred, struct socket *socket) { int error; @@ -455,7 +455,7 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_visible, cred, socket, socket->so_label); + MAC_CHECK(socket_check_visible, cred, socket, socket->so_label); return (error); } @@ -476,13 +476,13 @@ * before refreshing, holding both locks. */ SOCK_LOCK(so); - error = mac_check_socket_relabel(cred, so, label); + error = mac_socket_check_relabel(cred, so, label); if (error) { SOCK_UNLOCK(so); return (error); } - mac_relabel_socket(cred, so, label); + mac_socket_relabel(cred, so, label); SOCK_UNLOCK(so); /* * If the protocol has expressed interest in socket layer changes, @@ -497,7 +497,8 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 10:20:09 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA5B516A4E0 for ; Sat, 8 Jul 2006 10:20:09 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FFFF43D5C for ; Sat, 8 Jul 2006 10:20:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8D9C046D16 for ; Sat, 8 Jul 2006 06:20:02 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 695FB5CAE3; Sat, 8 Jul 2006 10:19:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6031616A4E0; Sat, 8 Jul 2006 10:19:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31E9916A4DA for ; Sat, 8 Jul 2006 10:19:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D98B343D46 for ; Sat, 8 Jul 2006 10:19: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.6/8.13.6) with ESMTP id k68AJgrA088774 for ; Sat, 8 Jul 2006 10:19:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68AJg0W088771 for perforce@freebsd.org; Sat, 8 Jul 2006 10:19:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 10:19:42 GMT Message-Id: <200607081019.k68AJg0W088771@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 100973 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 10:20:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=100973 Change 100973 by rwatson@rwatson_zoo on 2006/07/08 10:18:56 Add notes file on changes made in mac2 branch. Affected files ... .. //depot/projects/trustedbsd/mac2/mac2_notes.txt#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 10:26:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2296516A561 for ; Sat, 8 Jul 2006 10:26:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F2B243D49 for ; Sat, 8 Jul 2006 10:26:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C1ADD46D03 for ; Sat, 8 Jul 2006 06:26:53 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A583C5594D; Sat, 8 Jul 2006 10:26:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CDF216A4DD; Sat, 8 Jul 2006 10:26:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6316E16A4DE for ; Sat, 8 Jul 2006 10:26:52 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D87743D49 for ; Sat, 8 Jul 2006 10:26:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68AQpPJ094030 for ; Sat, 8 Jul 2006 10:26:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68AQpvu094024 for perforce@freebsd.org; Sat, 8 Jul 2006 10:26:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 10:26:51 GMT Message-Id: <200607081026.k68AQpvu094024@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 100974 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 10:26:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=100974 Change 100974 by rwatson@rwatson_zoo on 2006/07/08 10:26:20 Notes on mac2 branch. Affected files ... .. //depot/projects/trustedbsd/mac2/mac2_notes.txt#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/mac2_notes.txt#2 (text+ko) ==== @@ -1,1 +1,58 @@ Notes file for prototype changes made in the MAC2 branch. + +- Renaming of pretty much all entry points. Adopt a new naming scheme + based on: + + mpo__() + mpo__check_() + + Likewise for mac_*. This appears to shorten quite a few names + (removing '_from_', etc), and make things much more legible and + consistent. + +- Add a new subsystem class netinet to hold netinet-related methods. + +- Resort entry points in mac_framework.h, mac_policy.h by object rather + than method. This significantly improves readability. + +- Split mac.h into mac.h and mac_framework.h, breaking out user and kernel + APIs into separate kernel include files. + +Planned changes: + +- Accessor methods for slot data based on functions, in order to avoid + encoding the ABI of the slot/label mechanism into modules. Proposed + methods: + + mac__getlabel(mpc, object, &valuep); + mac__setlabel(mpc, object, value); + + These will get and set the slot field, which will be of type uintptr_t. + Locking will be unchanged. Policies will likely wrap these in their + own macro or inline to pass mpc implicitly in common use. + +- Remove label arguments from policy entry points where an accessor method + can be used. + +Already performed and merged changes: + +- Adopt SEDarwin MAC Framework change to provide mpo_foo_t prototypes for + mac_policy_ops entries. This has several advantages: + + Provide a more clear style and structure for inline documentation. + + Allow internal prototyping in policies so they can be broken into + multiple C files more easily. + +Future directions: + +- Break policy modules into multiple files by object/subsystem class, + with policy_internal.h using new mpo prototypes. + +- Explore and possibly adopt SEDarwin MAC Framework changes to allow + specific label registration for policy modules for FreeBSD. + +- Explore and possibly adopt fine-grained label registration so that slots + are only used for objects requested by the policy. I.e., policies can + request only a cred label slot, etc. This could then be used to key + memory allocation overhead on more objects. From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 11:16:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA7F816A55D for ; Sat, 8 Jul 2006 11:16:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26DFF43D46 for ; Sat, 8 Jul 2006 11:16:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A405546D31 for ; Sat, 8 Jul 2006 07:16:56 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1EEE85685E; Sat, 8 Jul 2006 11:16:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 173F316A4E2; Sat, 8 Jul 2006 11:16:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDF9B16A4DD for ; Sat, 8 Jul 2006 11:16:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9401D43D49 for ; Sat, 8 Jul 2006 11:16:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68BGt6M026207 for ; Sat, 8 Jul 2006 11:16:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68BGtaT026193 for perforce@freebsd.org; Sat, 8 Jul 2006 11:16:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 11:16:55 GMT Message-Id: <200607081116.k68BGtaT026193@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 100978 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 11:16:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=100978 Change 100978 by rwatson@rwatson_zoo on 2006/07/08 11:15:56 More notes. Affected files ... .. //depot/projects/trustedbsd/mac2/mac2_notes.txt#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/mac2_notes.txt#3 (text+ko) ==== @@ -10,7 +10,8 @@ (removing '_from_', etc), and make things much more legible and consistent. -- Add a new subsystem class netinet to hold netinet-related methods. +- Add a new subsystem class _netinet_ to hold netinet-related methods. + Added a pseudo-class, _policy_ for policy-related events (init, destroy). - Resort entry points in mac_framework.h, mac_policy.h by object rather than method. This significantly improves readability. @@ -18,6 +19,11 @@ - Split mac.h into mac.h and mac_framework.h, breaking out user and kernel APIs into separate kernel include files. +- Remove mount_fs label, which has generally gone unused. + +- Rename all devfs entry points to be mac_devfs_foo() rather than having + some be mac_devfsdirent_foo(). + Planned changes: - Accessor methods for slot data based on functions, in order to avoid @@ -56,3 +62,7 @@ are only used for objects requested by the policy. I.e., policies can request only a cred label slot, etc. This could then be used to key memory allocation overhead on more objects. + +- Move from just init/destroy to also attach/detach methods for the policy, + so that memory allocation can be performed without the mac policy lock + held. From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 12:10:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9826A16A567 for ; Sat, 8 Jul 2006 12:10:37 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E2FF43D53 for ; Sat, 8 Jul 2006 12:10:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8782646CFF for ; Sat, 8 Jul 2006 08:10:35 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id EBDC35577F; Sat, 8 Jul 2006 12:10:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E4ABC16A4DF; Sat, 8 Jul 2006 12:10:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EFDE16A4DE for ; Sat, 8 Jul 2006 12:10:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5013743D46 for ; Sat, 8 Jul 2006 12:10:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68CAYGg057216 for ; Sat, 8 Jul 2006 12:10:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68CAXTq057210 for perforce@freebsd.org; Sat, 8 Jul 2006 12:10:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 12:10:33 GMT Message-Id: <200607081210.k68CAXTq057210@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 100982 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 12:10:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=100982 Change 100982 by rwatson@rwatson_zoo on 2006/07/08 12:09:59 More use of mount label instead of fslabel. Further rename socket_peer label calls to be more consistent. More comments on renaming. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#22 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#22 (text+ko) ==== @@ -149,7 +149,7 @@ typedef void (*mpo_devfs_init_label_t)(struct label *label); typedef void (*mpo_devfs_destroy_label_t)(struct label *label); typedef void (*mpo_devfs_vnode_associate_t)(struct mount *mp, - struct label *fslabel, struct devfs_dirent *de, + struct label *mountlabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel); typedef void (*mpo_devfs_create_device_t)(struct ucred *cred, @@ -463,10 +463,10 @@ * Object: struct socket (Socket) */ typedef int (*mpo_socket_init_label_t)(struct label *label, int flag); -typedef int (*mpo_socket_init_peer_label_t)(struct label *label, +typedef int (*mpo_socket_peer_init_label_t)(struct label *label, int flag); typedef void (*mpo_socket_destroy_label_t)(struct label *label); -typedef void (*mpo_socket_destroy_peer_label_t)(struct label *label); +typedef void (*mpo_socket_peer_destroy_label_t)(struct label *label); typedef void (*mpo_socket_copy_label_t)(struct label *src, struct label *dest); typedef int (*mpo_socket_externalize_label_t)(struct label *label, @@ -543,13 +543,13 @@ typedef void (*mpo_vnode_init_label_t)(struct label *label); typedef void (*mpo_vnode_destroy_label_t)(struct label *label); typedef int (*mpo_vnode_associate_extattr_t)(struct mount *mp, - struct label *fslabel, struct vnode *vp, + struct label *mountlabel, struct vnode *vp, struct label *vlabel); typedef void (*mpo_vnode_associate_singlelabel_t)(struct mount *mp, - struct label *fslabel, struct vnode *vp, + struct label *mountlabel, struct vnode *vp, struct label *vlabel); typedef int (*mpo_vnode_create_extattr_t)(struct ucred *cred, - struct mount *mp, struct label *fslabel, + struct mount *mp, struct label *mountlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp); @@ -697,6 +697,9 @@ /* * XXXRW: Names here still inconsistent. + * + * Perhaps mpo_ifnet_receive(), mpo_ifnet_receive_encap(), and + * mpo_ifnet_transmit(). */ mpo_ifnet_init_label_t mpo_ifnet_init_label; mpo_ifnet_destroy_label_t mpo_ifnet_destroy_label; @@ -838,9 +841,9 @@ * be best if the "peer" label were at the protocol layer. */ mpo_socket_init_label_t mpo_socket_init_label; - mpo_socket_init_peer_label_t mpo_socket_init_peer_label; + mpo_socket_peer_init_label_t mpo_socket_peer_init_label; mpo_socket_destroy_label_t mpo_socket_destroy_label; - mpo_socket_destroy_peer_label_t mpo_socket_destroy_peer_label; + mpo_socket_peer_destroy_label_t mpo_socket_peer_destroy_label; mpo_socket_copy_label_t mpo_socket_copy_label; mpo_socket_externalize_label_t mpo_socket_externalize_label; mpo_socket_peer_externalize_label_t mpo_socket_peer_externalize_label; From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 12:23:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E0E6616A4DE for ; Sat, 8 Jul 2006 12:23:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B4BE43D53 for ; Sat, 8 Jul 2006 12:23:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2ED7746C1C for ; Sat, 8 Jul 2006 08:23:56 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 75C1255B50; Sat, 8 Jul 2006 12:23:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EEE616A4E0; Sat, 8 Jul 2006 12:23:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3082D16A4DA for ; Sat, 8 Jul 2006 12:23:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB5D143D4C for ; Sat, 8 Jul 2006 12:23: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.6/8.13.6) with ESMTP id k68CNr2o067937 for ; Sat, 8 Jul 2006 12:23:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68CNpqs067907 for perforce@freebsd.org; Sat, 8 Jul 2006 12:23:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 12:23:51 GMT Message-Id: <200607081223.k68CNpqs067907@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 100984 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 12:23:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=100984 Change 100984 by rwatson@rwatson_zoo on 2006/07/08 12:22:59 Further renaming. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_alq.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/link_elf_obj.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#4 edit .. //depot/projects/trustedbsd/mac2/sys/netatalk/aarp.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/if_ether.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/igmp.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#4 edit .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.c#4 edit .. //depot/projects/trustedbsd/mac2/sys/netinet6/nd6.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_net.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_socket.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac_portacl/mac_portacl.c#2 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#14 edit .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#23 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#3 (text+ko) ==== @@ -176,7 +176,7 @@ #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_send(td->td_ucred, so); + error = mac_socket_check_send(td->td_ucred, so); SOCK_UNLOCK(so); if (error) goto done1; @@ -276,7 +276,7 @@ #ifdef MAC SOCK_LOCK(so); - error = mac_check_socket_receive(td->td_ucred, so); + error = mac_socket_check_receive(td->td_ucred, so); SOCK_UNLOCK(so); if (error) goto done1; ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_alq.c#3 (text+ko) ==== @@ -299,7 +299,7 @@ * XXX: VOP_WRITE error checks are ignored. */ #ifdef MAC - if (mac_check_vnode_write(alq->aq_cred, NOCRED, vp) == 0) + if (mac_vnode_check_write(alq->aq_cred, NOCRED, vp) == 0) #endif VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, alq->aq_cred); VOP_UNLOCK(vp, 0, td); ==== //depot/projects/trustedbsd/mac2/sys/kern/link_elf_obj.c#3 (text+ko) ==== @@ -409,7 +409,7 @@ vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); #ifdef MAC - error = mac_check_kld_load(td->td_ucred, nd.ni_vp); + error = mac_kld_check_load(td->td_ucred, nd.ni_vp); if (error) { goto out; } ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#4 (text+ko) ==== @@ -951,8 +951,8 @@ unp3->unp_flags |= UNP_WANTCRED; #ifdef MAC SOCK_LOCK(so); - mac_socket_set_peer_from_socket(so, so3); - mac_socket_set_peer_from_socket(so3, so); + mac_socket_peer_set_from_socket(so, so3); + mac_socket_peer_set_from_socket(so3, so); SOCK_UNLOCK(so); #endif ==== //depot/projects/trustedbsd/mac2/sys/netatalk/aarp.c#3 (text+ko) ==== @@ -183,7 +183,7 @@ return; } #ifdef MAC - mac_create_mbuf_linklayer(ifp, m); + mac_mbuf_create_linklayer(ifp, m); #endif m->m_len = sizeof(*ea); m->m_pkthdr.len = sizeof(*ea); @@ -616,7 +616,7 @@ return; } #ifdef MAC - mac_create_mbuf_linklayer(ifp, m); + mac_mbuf_create_linklayer(ifp, m); #endif m->m_len = sizeof(*ea); m->m_pkthdr.len = sizeof(*ea); ==== //depot/projects/trustedbsd/mac2/sys/netinet/if_ether.c#3 (text+ko) ==== @@ -350,7 +350,7 @@ ah = mtod(m, struct arphdr *); bzero((caddr_t)ah, m->m_len); #ifdef MAC - mac_create_mbuf_linklayer(ifp, m); + mac_mbuf_create_linklayer(ifp, m); #endif ah->ar_pro = htons(ETHERTYPE_IP); ah->ar_hln = ifp->if_addrlen; /* hardware address length */ ==== //depot/projects/trustedbsd/mac2/sys/netinet/igmp.c#3 (text+ko) ==== @@ -469,7 +469,7 @@ m->m_pkthdr.rcvif = loif; #ifdef MAC - mac_create_mbuf_linklayer(inm->inm_ifp, m); + mac_mbuf_create_linklayer(inm->inm_ifp, m); #endif m->m_pkthdr.len = sizeof(struct ip) + IGMP_MINLEN; MH_ALIGN(m, IGMP_MINLEN + sizeof(struct ip)); ==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#4 (text+ko) ==== @@ -1403,7 +1403,7 @@ soisconnected(so); #ifdef MAC SOCK_LOCK(so); - mac_socket_set_peer_from_mbuf(m, so); + mac_socket_peer_set_from_mbuf(m, so); SOCK_UNLOCK(so); #endif /* Do window scaling on this connection? */ ==== //depot/projects/trustedbsd/mac2/sys/netinet/tcp_syncache.c#4 (text+ko) ==== @@ -562,7 +562,7 @@ } #ifdef MAC SOCK_LOCK(so); - mac_socket_set_peer_from_mbuf(m, so); + mac_socket_peer_set_from_mbuf(m, so); SOCK_UNLOCK(so); #endif ==== //depot/projects/trustedbsd/mac2/sys/netinet6/nd6.c#3 (text+ko) ==== @@ -2129,7 +2129,7 @@ #endif #ifdef MAC - mac_create_mbuf_linklayer(ifp, m); + mac_mbuf_create_linklayer(ifp, m); #endif if ((ifp->if_flags & IFF_LOOPBACK) != 0) { return ((*ifp->if_output)(origifp, m, (struct sockaddr *)dst, ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_net.c#3 (text+ko) ==== @@ -326,27 +326,27 @@ } void -mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *mbuf) +mac_ifnet_create_mbuf(struct ifnet *ifnet, struct mbuf *mbuf) { struct label *label; label = mac_mbuf_to_label(mbuf); MAC_IFNET_LOCK(ifnet); - MAC_PERFORM(create_mbuf_linklayer, ifnet, ifnet->if_label, mbuf, - label); + MAC_PERFORM(ifnet_create_mbuf, ifnet, ifnet->if_label, mbuf, label); MAC_IFNET_UNLOCK(ifnet); } void -mac_ifnet_create_mbuf(struct ifnet *ifnet, struct mbuf *mbuf) +mac_mbuf_create_linklayer(struct ifnet *ifnet, struct mbuf *mbuf) { struct label *label; label = mac_mbuf_to_label(mbuf); MAC_IFNET_LOCK(ifnet); - MAC_PERFORM(ifnet_create_mbuf, ifnet, ifnet->if_label, mbuf, label); + MAC_PERFORM(mbuf_create_linklayer, ifnet, ifnet->if_label, mbuf, + label); MAC_IFNET_UNLOCK(ifnet); } ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_socket.c#3 (text+ko) ==== @@ -118,9 +118,9 @@ if (label == NULL) return (NULL); - MAC_CHECK(socket_init_peer_label, label, flag); + MAC_CHECK(socket_peer_init_label, label, flag); if (error) { - MAC_PERFORM(socket_destroy_peer_label, label); + MAC_PERFORM(socket_peer_destroy_label, label); mac_labelzone_free(label); return (NULL); } @@ -157,7 +157,7 @@ mac_socket_peer_label_free(struct label *label) { - MAC_PERFORM(socket_destroy_peer_label, label); + MAC_PERFORM(socket_peer_destroy_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacsockets); } @@ -237,7 +237,7 @@ } void -mac_socket_set_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) +mac_socket_peer_set_from_mbuf(struct mbuf *mbuf, struct socket *socket) { struct label *label; @@ -245,12 +245,12 @@ label = mac_mbuf_to_label(mbuf); - MAC_PERFORM(socket_set_peer_from_mbuf, mbuf, label, socket, + MAC_PERFORM(socket_peer_set_from_mbuf, mbuf, label, socket, socket->so_peerlabel); } void -mac_socket_set_peer_from_socket(struct socket *oldsocket, +mac_socket_peer_set_from_socket(struct socket *oldsocket, struct socket *newsocket) { @@ -260,7 +260,7 @@ * called in both directions, so we can't assert the lock * here currently. */ - MAC_PERFORM(socket_set_peer_from_socket, oldsocket, + MAC_PERFORM(socket_peer_set_from_socket, oldsocket, oldsocket->so_label, newsocket, newsocket->so_peerlabel); } ==== //depot/projects/trustedbsd/mac2/sys/security/mac_portacl/mac_portacl.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2003-2004 Networks Associates Technology, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by Network @@ -7,6 +8,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -162,7 +166,7 @@ * and access via sysctl. */ static void -destroy(struct mac_policy_conf *mpc) +policy_destroy(struct mac_policy_conf *mpc) { mtx_destroy(&rule_mtx); @@ -170,7 +174,7 @@ } static void -init(struct mac_policy_conf *mpc) +policy_init(struct mac_policy_conf *mpc) { mtx_init(&rule_mtx, "rule_mtx", NULL, MTX_DEF); @@ -438,7 +442,7 @@ * the source port is left up to the IP stack to determine automatically. */ static int -check_socket_bind(struct ucred *cred, struct socket *so, +socket_check_bind(struct ucred *cred, struct socket *so, struct label *socketlabel, struct sockaddr *sockaddr) { struct sockaddr_in *sin; @@ -489,9 +493,9 @@ static struct mac_policy_ops mac_portacl_ops = { - .mpo_destroy = destroy, - .mpo_init = init, - .mpo_check_socket_bind = check_socket_bind, + .mpo_policy_destroy = policy_destroy, + .mpo_policy_init = policy_init, + .mpo_socket_check_bind = socket_check_bind, }; MAC_POLICY_SET(&mac_portacl_ops, trustedbsd_mac_portacl, ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#14 (text+ko) ==== @@ -118,8 +118,8 @@ void mac_ifnet_init(struct ifnet *); void mac_ifnet_destroy(struct ifnet *); void mac_ifnet_create(struct ifnet *ifp); -void mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *m); void mac_ifnet_create_mbuf(struct ifnet *ifnet, struct mbuf *m); +void mac_mbuf_create_linklayer(struct ifnet *ifnet, struct mbuf *m); void mac_mbuf_create_multicast_encap(struct mbuf *oldmbuf, struct ifnet *ifnet, struct mbuf *newmbuf); int mac_ifnet_check_transmit(struct ifnet *ifnet, struct mbuf *m); @@ -226,9 +226,9 @@ void mac_socket_create(struct ucred *cred, struct socket *socket); void mac_socket_accept(struct socket *oldsocket, struct socket *newsocket); -void mac_socket_set_peer_from_mbuf(struct mbuf *mbuf, +void mac_socket_peer_set_from_mbuf(struct mbuf *mbuf, struct socket *socket); -void mac_socket_set_peer_from_socket(struct socket *oldsocket, +void mac_socket_peer_set_from_socket(struct socket *oldsocket, struct socket *newsocket); int mac_socket_check_accept(struct ucred *cred, struct socket *so); int mac_socket_check_bind(struct ucred *cred, struct socket *so, ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#23 (text+ko) ==== @@ -198,10 +198,10 @@ char *element_name, char *element_data, int *claimed); typedef void (*mpo_ifnet_create_t)(struct ifnet *ifnet, struct label *ifnetlabel); -typedef void (*mpo_create_mbuf_linklayer_t)(struct ifnet *ifnet, +typedef void (*mpo_ifnet_create_mbuf_t)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel); -typedef void (*mpo_ifnet_create_mbuf_t)(struct ifnet *ifnet, +typedef void (*mpo_mbuf_create_linklayer_t)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel); typedef void (*mpo_mbuf_create_multicast_encap_t)(struct mbuf *oldmbuf, @@ -482,13 +482,13 @@ struct label *newsocketlabel); typedef void (*mpo_socket_relabel_t)(struct ucred *cred, struct socket *so, struct label *oldlabel, struct label *newlabel); -typedef void (*mpo_socket_set_peer_from_socket_t)(struct socket *oldsocket, +typedef void (*mpo_socket_peer_set_from_socket_t)(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketpeerlabel); typedef void (*mpo_socket_create_mbuf_t)(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel); -typedef void (*mpo_socket_set_peer_from_mbuf_t)(struct mbuf *mbuf, +typedef void (*mpo_socket_peer_set_from_mbuf_t)(struct mbuf *mbuf, struct label *mbuflabel, struct socket *so, struct label *socketpeerlabel); typedef int (*mpo_socket_check_accept_t)(struct ucred *cred, @@ -707,8 +707,8 @@ mpo_ifnet_externalize_label_t mpo_ifnet_externalize_label; mpo_ifnet_internalize_label_t mpo_ifnet_internalize_label; mpo_ifnet_create_t mpo_ifnet_create; - mpo_create_mbuf_linklayer_t mpo_create_mbuf_linklayer; mpo_ifnet_create_mbuf_t mpo_ifnet_create_mbuf; + mpo_mbuf_create_linklayer_t mpo_mbuf_create_linklayer; mpo_mbuf_create_multicast_encap_t mpo_mbuf_create_multicast_encap; mpo_ifnet_relabel_t mpo_ifnet_relabel; mpo_ifnet_check_relabel_t mpo_ifnet_check_relabel; @@ -851,9 +851,9 @@ mpo_socket_create_t mpo_socket_create; mpo_socket_accept_t mpo_socket_accept; mpo_socket_relabel_t mpo_socket_relabel; - mpo_socket_set_peer_from_socket_t mpo_socket_set_peer_from_socket; + mpo_socket_peer_set_from_socket_t mpo_socket_peer_set_from_socket; mpo_socket_create_mbuf_t mpo_socket_create_mbuf; - mpo_socket_set_peer_from_mbuf_t mpo_socket_set_peer_from_mbuf; + mpo_socket_peer_set_from_mbuf_t mpo_socket_peer_set_from_mbuf; mpo_socket_check_accept_t mpo_socket_check_accept; mpo_socket_check_bind_t mpo_socket_check_bind; mpo_socket_check_connect_t mpo_socket_check_connect; From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 12:26:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF62816A4DF for ; Sat, 8 Jul 2006 12:26:27 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C848843D69 for ; Sat, 8 Jul 2006 12:26:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7027146CFF for ; Sat, 8 Jul 2006 08:26:13 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A97E757D76; Sat, 8 Jul 2006 12:26:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A1B2D16A4E2; Sat, 8 Jul 2006 12:26:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 78CF916A4DF for ; Sat, 8 Jul 2006 12:26:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D01F43D5C for ; Sat, 8 Jul 2006 12:25:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68CPvI2069423 for ; Sat, 8 Jul 2006 12:25:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68CPuWi069413 for perforce@freebsd.org; Sat, 8 Jul 2006 12:25:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 12:25:56 GMT Message-Id: <200607081225.k68CPuWi069413@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 100985 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 12:26:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=100985 Change 100985 by rwatson@rwatson_zoo on 2006/07/08 12:25:00 Rename. Drop fslabel. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_biba/mac_biba.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_biba/mac_biba.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 McAfee, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -10,6 +11,9 @@ * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -501,7 +505,7 @@ * Policy module operations. */ static void -mac_biba_init(struct mac_policy_conf *conf) +mac_biba_policy_init(struct mac_policy_conf *conf) { zone_biba = uma_zcreate("mac_biba", sizeof(struct mac_biba), NULL, @@ -786,7 +790,7 @@ * a lot like file system objects. */ static void -mac_biba_create_devfs_device(struct ucred *cred, struct mount *mp, +mac_biba_devfs_create_device(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_biba *mac_biba; @@ -808,7 +812,7 @@ } static void -mac_biba_create_devfs_directory(struct mount *mp, char *dirname, +mac_biba_devfs_create_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_biba *mac_biba; @@ -818,7 +822,7 @@ } static void -mac_biba_create_devfs_symlink(struct ucred *cred, struct mount *mp, +mac_biba_devfs_create_symlink(struct ucred *cred, struct mount *mp, struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) { @@ -831,20 +835,18 @@ } static void -mac_biba_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) +mac_biba_mount_create(struct ucred *cred, struct mount *mp, + struct label *mntlabel) { struct mac_biba *source, *dest; source = SLOT(cred->cr_label); dest = SLOT(mntlabel); mac_biba_copy_effective(source, dest); - dest = SLOT(fslabel); - mac_biba_copy_effective(source, dest); } static void -mac_biba_relabel_vnode(struct ucred *cred, struct vnode *vp, +mac_biba_vnode_relabel(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label) { struct mac_biba *source, *dest; @@ -856,7 +858,7 @@ } static void -mac_biba_update_devfsdirent(struct mount *mp, +mac_biba_devfs_update(struct mount *mp, struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { @@ -869,7 +871,7 @@ } static void -mac_biba_associate_vnode_devfs(struct mount *mp, struct label *fslabel, +mac_biba_devfs_vnode_associate(struct mount *mp, struct label *mountlabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel) { @@ -882,13 +884,13 @@ } static int -mac_biba_associate_vnode_extattr(struct mount *mp, struct label *fslabel, +mac_biba_vnode_associate_extattr(struct mount *mp, struct label *mountlabel, struct vnode *vp, struct label *vlabel) { struct mac_biba temp, *source, *dest; int buflen, error; - source = SLOT(fslabel); + source = SLOT(mountlabel); dest = SLOT(vlabel); buflen = sizeof(temp); @@ -897,7 +899,7 @@ error = vn_extattr_get(vp, IO_NODELOCKED, MAC_BIBA_EXTATTR_NAMESPACE, MAC_BIBA_EXTATTR_NAME, &buflen, (char *) &temp, curthread); if (error == ENOATTR || error == EOPNOTSUPP) { - /* Fall back to the fslabel. */ + /* Fall back to the mountlabel. */ mac_biba_copy_effective(source, dest); return (0); } else if (error) @@ -922,20 +924,20 @@ } static void -mac_biba_associate_vnode_singlelabel(struct mount *mp, - struct label *fslabel, struct vnode *vp, struct label *vlabel) +mac_biba_vnode_associate_singlelabel(struct mount *mp, + struct label *mountlabel, struct vnode *vp, struct label *vlabel) { struct mac_biba *source, *dest; - source = SLOT(fslabel); + source = SLOT(mountlabel); dest = SLOT(vlabel); mac_biba_copy_effective(source, dest); } static int -mac_biba_create_vnode_extattr(struct ucred *cred, struct mount *mp, - struct label *fslabel, struct vnode *dvp, struct label *dlabel, +mac_biba_vnode_create_extattr(struct ucred *cred, struct mount *mp, + struct label *mountlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp) { struct mac_biba *source, *dest, temp; @@ -957,7 +959,7 @@ } static int -mac_biba_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, +mac_biba_vnode_setlabel_extattr(struct ucred *cred, struct vnode *vp, struct label *vlabel, struct label *intlabel) { struct mac_biba *source, temp; @@ -982,7 +984,7 @@ * Labeling event operations: IPC object. */ static void -mac_biba_create_inpcb_from_socket(struct socket *so, struct label *solabel, +mac_biba_inpcb_create(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel) { struct mac_biba *source, *dest; @@ -994,7 +996,7 @@ } static void -mac_biba_create_mbuf_from_socket(struct socket *so, struct label *socketlabel, +mac_biba_socket_create_mbuf(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_biba *source, *dest; @@ -1006,7 +1008,7 @@ } static void -mac_biba_create_socket(struct ucred *cred, struct socket *socket, +mac_biba_socket_create(struct ucred *cred, struct socket *socket, struct label *socketlabel) { struct mac_biba *source, *dest; @@ -1018,7 +1020,7 @@ } static void -mac_biba_create_pipe(struct ucred *cred, struct pipepair *pp, +mac_biba_pipe_create(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_biba *source, *dest; @@ -1030,7 +1032,7 @@ } static void -mac_biba_create_posix_sem(struct ucred *cred, struct ksem *ksemptr, +mac_biba_posix_sem_create(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { struct mac_biba *source, *dest; @@ -1042,9 +1044,8 @@ } static void -mac_biba_create_socket_from_socket(struct socket *oldsocket, - struct label *oldsocketlabel, struct socket *newsocket, - struct label *newsocketlabel) +mac_biba_socket_accept(struct socket *oldsocket, struct label *oldsocketlabel, + struct socket *newsocket, struct label *newsocketlabel) { struct mac_biba *source, *dest; @@ -1055,7 +1056,7 @@ } static void -mac_biba_relabel_socket(struct ucred *cred, struct socket *socket, +mac_biba_socket_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { struct mac_biba *source, *dest; @@ -1067,7 +1068,7 @@ } static void -mac_biba_relabel_pipe(struct ucred *cred, struct pipepair *pp, +mac_biba_pipe_relabel(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel) { struct mac_biba *source, *dest; @@ -1079,7 +1080,7 @@ } static void -mac_biba_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, +mac_biba_socket_peer_set_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, struct socket *socket, struct label *socketpeerlabel) { struct mac_biba *source, *dest; @@ -1095,7 +1096,7 @@ */ static void -mac_biba_create_sysv_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_biba_sysvmsg_create(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel) { struct mac_biba *source, *dest; @@ -1108,8 +1109,8 @@ } static void -mac_biba_create_sysv_msgqueue(struct ucred *cred, - struct msqid_kernel *msqkptr, struct label *msqlabel) +mac_biba_sysvmsq_create(struct ucred *cred, struct msqid_kernel *msqkptr, + struct label *msqlabel) { struct mac_biba *source, *dest; @@ -1120,7 +1121,7 @@ } static void -mac_biba_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr, +mac_biba_sysvsem_create(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel) { struct mac_biba *source, *dest; @@ -1132,7 +1133,7 @@ } static void -mac_biba_create_sysv_shm(struct ucred *cred, struct shmid_kernel *shmsegptr, +mac_biba_sysvshm_create(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmlabel) { struct mac_biba *source, *dest; @@ -1147,7 +1148,7 @@ * Labeling event operations: network objects. */ static void -mac_biba_set_socket_peer_from_socket(struct socket *oldsocket, +mac_biba_socket_peer_set_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketpeerlabel) { @@ -1160,7 +1161,7 @@ } static void -mac_biba_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d, +mac_biba_bpfdesc_create(struct ucred *cred, struct bpf_d *bpf_d, struct label *bpflabel) { struct mac_biba *source, *dest; @@ -1172,7 +1173,7 @@ } static void -mac_biba_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) +mac_biba_ifnet_create(struct ifnet *ifnet, struct label *ifnetlabel) { char tifname[IFNAMSIZ], *p, *q; char tiflist[sizeof(trusted_interfaces)]; @@ -1229,7 +1230,7 @@ } static void -mac_biba_create_ipq(struct mbuf *fragment, struct label *fragmentlabel, +mac_biba_ipq_create(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { struct mac_biba *source, *dest; @@ -1241,7 +1242,7 @@ } static void -mac_biba_create_datagram_from_ipq(struct ipq *ipq, struct label *ipqlabel, +mac_biba_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel, struct mbuf *datagram, struct label *datagramlabel) { struct mac_biba *source, *dest; @@ -1254,7 +1255,7 @@ } static void -mac_biba_create_fragment(struct mbuf *datagram, struct label *datagramlabel, +mac_biba_netinet_fragment(struct mbuf *datagram, struct label *datagramlabel, struct mbuf *fragment, struct label *fragmentlabel) { struct mac_biba *source, *dest; @@ -1266,7 +1267,7 @@ } static void -mac_biba_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel, +mac_biba_inpcb_create_mbuf(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel) { struct mac_biba *source, *dest; @@ -1278,7 +1279,7 @@ } static void -mac_biba_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, +mac_biba_mbuf_create_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { struct mac_biba *dest; @@ -1289,7 +1290,7 @@ } static void -mac_biba_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct label *bpflabel, +mac_biba_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct label *bpflabel, struct mbuf *mbuf, struct label *mbuflabel) { struct mac_biba *source, *dest; @@ -1301,7 +1302,7 @@ } static void -mac_biba_create_mbuf_from_ifnet(struct ifnet *ifnet, struct label *ifnetlabel, +mac_biba_ifnet_create_mbuf(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_biba *source, *dest; @@ -1313,7 +1314,7 @@ } static void -mac_biba_create_mbuf_multicast_encap(struct mbuf *oldmbuf, +mac_biba_mbuf_create_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -1326,8 +1327,9 @@ } static void -mac_biba_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, - struct mbuf *newmbuf, struct label *newmbuflabel) +mac_biba_mbuf_create_netlayer(struct mbuf *oldmbuf, + struct label *oldmbuflabel, struct mbuf *newmbuf, + struct label *newmbuflabel) { struct mac_biba *source, *dest; @@ -1338,7 +1340,7 @@ } static int -mac_biba_fragment_match(struct mbuf *fragment, struct label *fragmentlabel, +mac_biba_ipq_match(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { struct mac_biba *a, *b; @@ -1350,7 +1352,7 @@ } static void -mac_biba_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, +mac_biba_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) { struct mac_biba *source, *dest; @@ -1362,7 +1364,7 @@ } static void -mac_biba_update_ipq(struct mbuf *fragment, struct label *fragmentlabel, +mac_biba_ipq_update(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { @@ -1385,7 +1387,7 @@ * Labeling event operations: processes. */ static void -mac_biba_create_proc0(struct ucred *cred) +mac_biba_proc_create_swapper(struct ucred *cred) { struct mac_biba *dest; @@ -1397,7 +1399,7 @@ } static void -mac_biba_create_proc1(struct ucred *cred) +mac_biba_proc_create_init(struct ucred *cred) { struct mac_biba *dest; @@ -1409,7 +1411,7 @@ } static void -mac_biba_relabel_cred(struct ucred *cred, struct label *newlabel) +mac_biba_cred_relabel(struct ucred *cred, struct label *newlabel) { struct mac_biba *source, *dest; @@ -1423,28 +1425,28 @@ * Label cleanup/flush operations */ static void -mac_biba_cleanup_sysv_msgmsg(struct label *msglabel) +mac_biba_sysvmsg_cleanup(struct label *msglabel) { bzero(SLOT(msglabel), sizeof(struct mac_biba)); } static void -mac_biba_cleanup_sysv_msgqueue(struct label *msqlabel) +mac_biba_sysvmsq_cleanup(struct label *msqlabel) { bzero(SLOT(msqlabel), sizeof(struct mac_biba)); } static void -mac_biba_cleanup_sysv_sem(struct label *semalabel) +mac_biba_sysvsem_cleanup(struct label *semalabel) { bzero(SLOT(semalabel), sizeof(struct mac_biba)); } static void -mac_biba_cleanup_sysv_shm(struct label *shmlabel) +mac_biba_sysvshm_cleanup(struct label *shmlabel) { bzero(SLOT(shmlabel), sizeof(struct mac_biba)); } @@ -1453,7 +1455,7 @@ * Access control checks. */ static int -mac_biba_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, +mac_biba_bpfdesc_check_receive(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel) { struct mac_biba *a, *b; @@ -1470,7 +1472,7 @@ } static int -mac_biba_check_cred_relabel(struct ucred *cred, struct label *newlabel) +mac_biba_cred_check_relabel(struct ucred *cred, struct label *newlabel) { struct mac_biba *subj, *new; int error; @@ -1532,7 +1534,7 @@ } static int -mac_biba_check_cred_visible(struct ucred *u1, struct ucred *u2) +mac_biba_cred_check_visible(struct ucred *u1, struct ucred *u2) { struct mac_biba *subj, *obj; @@ -1550,7 +1552,7 @@ } static int -mac_biba_check_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, +mac_biba_ifnet_check_relabel(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) { struct mac_biba *subj, *new; @@ -1578,7 +1580,7 @@ } static int -mac_biba_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, +mac_biba_ifnet_check_transmit(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_biba *p, *i; @@ -1593,7 +1595,7 @@ } static int -mac_biba_check_inpcb_deliver(struct inpcb *inp, struct label *inplabel, +mac_biba_inpcb_check_deliver(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel) { struct mac_biba *p, *i; @@ -1608,7 +1610,7 @@ } static int -mac_biba_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr, +mac_biba_sysvmsq_check_msgrcv(struct ucred *cred, struct msg *msgptr, struct label *msglabel) { struct mac_biba *subj, *obj; @@ -1626,7 +1628,7 @@ } static int -mac_biba_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr, +mac_biba_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr, struct label *msglabel) { struct mac_biba *subj, *obj; @@ -1644,8 +1646,8 @@ } static int -mac_biba_check_sysv_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, - struct label *msqklabel) +mac_biba_sysvmsq_check_msqget(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqklabel) { struct mac_biba *subj, *obj; @@ -1662,8 +1664,8 @@ } static int -mac_biba_check_sysv_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr, - struct label *msqklabel) +mac_biba_sysvmsq_check_msqsnd(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqklabel) { struct mac_biba *subj, *obj; @@ -1680,8 +1682,8 @@ } static int -mac_biba_check_sysv_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr, - struct label *msqklabel) +mac_biba_sysvmsq_check_msqrcv(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqklabel) { struct mac_biba *subj, *obj; @@ -1699,8 +1701,8 @@ static int -mac_biba_check_sysv_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, - struct label *msqklabel, int cmd) +mac_biba_sysvmsq_check_msqctl(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd) { struct mac_biba *subj, *obj; @@ -1730,8 +1732,8 @@ } static int -mac_biba_check_sysv_semctl(struct ucred *cred, struct semid_kernel *semakptr, - struct label *semaklabel, int cmd) +mac_biba_sysvsem_check_semctl(struct ucred *cred, + struct semid_kernel *semakptr, struct label *semaklabel, int cmd) { struct mac_biba *subj, *obj; @@ -1769,8 +1771,8 @@ static int -mac_biba_check_sysv_semget(struct ucred *cred, struct semid_kernel *semakptr, - struct label *semaklabel) +mac_biba_sysvsem_check_semget(struct ucred *cred, + struct semid_kernel *semakptr, struct label *semaklabel) { struct mac_biba *subj, *obj; @@ -1788,8 +1790,9 @@ static int -mac_biba_check_sysv_semop(struct ucred *cred, struct semid_kernel *semakptr, - struct label *semaklabel, size_t accesstype) +mac_biba_sysvsem_check_semop(struct ucred *cred, + struct semid_kernel *semakptr, struct label *semaklabel, + size_t accesstype) { struct mac_biba *subj, *obj; @@ -1811,8 +1814,8 @@ } static int -mac_biba_check_sysv_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, - struct label *shmseglabel, int shmflg) +mac_biba_sysvshm_check_shmat(struct ucred *cred, + struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) { struct mac_biba *subj, *obj; @@ -1833,8 +1836,8 @@ } static int -mac_biba_check_sysv_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, - struct label *shmseglabel, int cmd) +mac_biba_sysvshm_check_shmctl(struct ucred *cred, + struct shmid_kernel *shmsegptr, struct label *shmseglabel, int cmd) { struct mac_biba *subj, *obj; @@ -1865,8 +1868,8 @@ } static int -mac_biba_check_sysv_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, - struct label *shmseglabel, int shmflg) +mac_biba_sysvshm_check_shmget(struct ucred *cred, + struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) { struct mac_biba *subj, *obj; @@ -1883,7 +1886,7 @@ } static int -mac_biba_check_kld_load(struct ucred *cred, struct vnode *vp, +mac_biba_kld_check_load(struct ucred *cred, struct vnode *vp, struct label *label) { struct mac_biba *subj, *obj; @@ -1907,7 +1910,7 @@ static int -mac_biba_check_kld_unload(struct ucred *cred) +mac_biba_kld_check_unload(struct ucred *cred) { struct mac_biba *subj; @@ -1920,7 +1923,7 @@ } static int -mac_biba_check_mount_stat(struct ucred *cred, struct mount *mp, +mac_biba_mount_check_stat(struct ucred *cred, struct mount *mp, struct label *mntlabel) { struct mac_biba *subj, *obj; @@ -1938,7 +1941,7 @@ } static int -mac_biba_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp, +mac_biba_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) { @@ -1951,7 +1954,7 @@ } static int -mac_biba_check_pipe_poll(struct ucred *cred, struct pipepair *pp, +mac_biba_pipe_check_poll(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_biba *subj, *obj; @@ -1969,7 +1972,7 @@ } static int -mac_biba_check_pipe_read(struct ucred *cred, struct pipepair *pp, +mac_biba_pipe_check_read(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_biba *subj, *obj; @@ -1987,7 +1990,7 @@ } static int -mac_biba_check_pipe_relabel(struct ucred *cred, struct pipepair *pp, +mac_biba_pipe_check_relabel(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel) { struct mac_biba *subj, *obj, *new; @@ -2038,7 +2041,7 @@ } static int -mac_biba_check_pipe_stat(struct ucred *cred, struct pipepair *pp, +mac_biba_pipe_check_stat(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_biba *subj, *obj; @@ -2056,7 +2059,7 @@ } static int -mac_biba_check_pipe_write(struct ucred *cred, struct pipepair *pp, +mac_biba_pipe_check_write(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_biba *subj, *obj; @@ -2074,7 +2077,7 @@ } static int -mac_biba_check_posix_sem_write(struct ucred *cred, struct ksem *ksemptr, +mac_biba_posix_sem_check_write(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { struct mac_biba *subj, *obj; @@ -2092,7 +2095,7 @@ } static int -mac_biba_check_posix_sem_rdonly(struct ucred *cred, struct ksem *ksemptr, +mac_biba_posix_sem_check_rdonly(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { struct mac_biba *subj, *obj; @@ -2110,7 +2113,7 @@ } static int -mac_biba_check_proc_debug(struct ucred *cred, struct proc *proc) +mac_biba_proc_check_debug(struct ucred *cred, struct proc *proc) { struct mac_biba *subj, *obj; @@ -2130,7 +2133,7 @@ } static int -mac_biba_check_proc_sched(struct ucred *cred, struct proc *proc) +mac_biba_proc_check_sched(struct ucred *cred, struct proc *proc) { struct mac_biba *subj, *obj; @@ -2150,7 +2153,7 @@ } static int -mac_biba_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) +mac_biba_proc_check_signal(struct ucred *cred, struct proc *proc, int signum) { struct mac_biba *subj, *obj; @@ -2170,7 +2173,7 @@ } static int -mac_biba_check_socket_deliver(struct socket *so, struct label *socketlabel, +mac_biba_socket_check_deliver(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_biba *p, *s; @@ -2185,7 +2188,7 @@ } static int -mac_biba_check_socket_relabel(struct ucred *cred, struct socket *so, +mac_biba_socket_check_relabel(struct ucred *cred, struct socket *so, struct label *socketlabel, struct label *newlabel) { struct mac_biba *subj, *obj, *new; @@ -2236,7 +2239,7 @@ } static int -mac_biba_check_socket_visible(struct ucred *cred, struct socket *socket, +mac_biba_socket_check_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { struct mac_biba *subj, *obj; @@ -2254,7 +2257,7 @@ } static int -mac_biba_check_sysarch_ioperm(struct ucred *cred) +mac_biba_system_check_ioperm(struct ucred *cred) { struct mac_biba *subj; int error; @@ -2272,7 +2275,7 @@ } static int -mac_biba_check_system_acct(struct ucred *cred, struct vnode *vp, +mac_biba_system_check_acct(struct ucred *cred, struct vnode *vp, struct label *label) { struct mac_biba *subj, *obj; @@ -2298,7 +2301,7 @@ } static int -mac_biba_check_system_settime(struct ucred *cred) +mac_biba_system_check_settime(struct ucred *cred) { struct mac_biba *subj; int error; @@ -2316,7 +2319,7 @@ } static int -mac_biba_check_system_swapon(struct ucred *cred, struct vnode *vp, +mac_biba_system_check_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { struct mac_biba *subj, *obj; @@ -2339,7 +2342,7 @@ } static int -mac_biba_check_system_swapoff(struct ucred *cred, struct vnode *vp, +mac_biba_system_check_swapoff(struct ucred *cred, struct vnode *vp, struct label *label) { struct mac_biba *subj, *obj; @@ -2359,7 +2362,7 @@ } static int -mac_biba_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, +mac_biba_system_check_sysctl(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req) { struct mac_biba *subj; @@ -2387,7 +2390,7 @@ } static int -mac_biba_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, +mac_biba_vnode_check_chdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { struct mac_biba *subj, *obj; @@ -2405,7 +2408,7 @@ } static int -mac_biba_check_vnode_chroot(struct ucred *cred, struct vnode *dvp, +mac_biba_vnode_check_chroot(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { struct mac_biba *subj, *obj; @@ -2423,7 +2426,7 @@ } static int -mac_biba_check_vnode_create(struct ucred *cred, struct vnode *dvp, +mac_biba_vnode_check_create(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp, struct vattr *vap) { struct mac_biba *subj, *obj; @@ -2441,31 +2444,7 @@ } static int -mac_biba_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label, - struct componentname *cnp) -{ - struct mac_biba *subj, *obj; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(cred->cr_label); - obj = SLOT(dlabel); - - if (!mac_biba_dominate_effective(subj, obj)) - return (EACCES); - - obj = SLOT(label); - - if (!mac_biba_dominate_effective(subj, obj)) - return (EACCES); - - return (0); -} - -static int -mac_biba_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, +mac_biba_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { struct mac_biba *subj, *obj; @@ -2483,7 +2462,7 @@ } static int -mac_biba_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, +mac_biba_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name) { struct mac_biba *subj, *obj; @@ -2501,7 +2480,7 @@ } static int -mac_biba_check_vnode_exec(struct ucred *cred, struct vnode *vp, +mac_biba_vnode_check_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel) { @@ -2533,7 +2512,7 @@ } static int -mac_biba_check_vnode_getacl(struct ucred *cred, struct vnode *vp, +mac_biba_vnode_check_getacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { struct mac_biba *subj, *obj; @@ -2551,7 +2530,7 @@ } static int -mac_biba_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, +mac_biba_vnode_check_getextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { struct mac_biba *subj, *obj; @@ -2569,7 +2548,7 @@ } static int -mac_biba_check_vnode_link(struct ucred *cred, struct vnode *dvp, +mac_biba_vnode_check_link(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { @@ -2593,7 +2572,7 @@ } static int -mac_biba_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, +mac_biba_vnode_check_listextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace) { struct mac_biba *subj, *obj; @@ -2611,7 +2590,7 @@ } static int -mac_biba_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, +mac_biba_vnode_check_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 12:29:03 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A88D516A4DA for ; Sat, 8 Jul 2006 12:29:03 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 132EA43D49 for ; Sat, 8 Jul 2006 12:29:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A022446B29 for ; Sat, 8 Jul 2006 08:29:02 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id F170A560BC; Sat, 8 Jul 2006 12:29:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EA1AD16A4E0; Sat, 8 Jul 2006 12:29:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C16F816A4DA for ; Sat, 8 Jul 2006 12:29:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7489C43D49 for ; Sat, 8 Jul 2006 12:29:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68CT1dk071711 for ; Sat, 8 Jul 2006 12:29:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68CT1mF071702 for perforce@freebsd.org; Sat, 8 Jul 2006 12:29:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 12:29:01 GMT Message-Id: <200607081229.k68CT1mF071702@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 100986 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 12:29:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=100986 Change 100986 by rwatson@rwatson_zoo on 2006/07/08 12:28:18 Remove mac_ifoff and mac_partition from the mac2 branch, they will be maintained elsewhere. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_ifoff/mac_ifoff.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/security/mac_partition/mac_partition.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/security/mac_partition/mac_partition.h#2 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 12:30:06 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CA04E16A55A for ; Sat, 8 Jul 2006 12:30:06 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E939743D45 for ; Sat, 8 Jul 2006 12:30:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4EA8146B29 for ; Sat, 8 Jul 2006 08:30:05 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B62E05614A; Sat, 8 Jul 2006 12:30:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AF1A516A4E0; Sat, 8 Jul 2006 12:30:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66ACD16A4DA for ; Sat, 8 Jul 2006 12:30:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1022943D49 for ; Sat, 8 Jul 2006 12:30:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68CU349073624 for ; Sat, 8 Jul 2006 12:30:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68CU3o7073609 for perforce@freebsd.org; Sat, 8 Jul 2006 12:30:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 12:30:03 GMT Message-Id: <200607081230.k68CU3o7073609@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 100987 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 12:30:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=100987 Change 100987 by rwatson@rwatson_zoo on 2006/07/08 12:29:59 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2002 Networks Associates Technology, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -10,6 +11,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -134,14 +138,14 @@ } static int -mac_seeotheruids_check_cred_visible(struct ucred *u1, struct ucred *u2) +mac_seeotheruids_cred_check_visible(struct ucred *u1, struct ucred *u2) { return (mac_seeotheruids_check(u1, u2)); } static int -mac_seeotheruids_check_proc_signal(struct ucred *cred, struct proc *proc, +mac_seeotheruids_proc_check_signal(struct ucred *cred, struct proc *proc, int signum) { @@ -149,21 +153,21 @@ } static int -mac_seeotheruids_check_proc_sched(struct ucred *cred, struct proc *proc) +mac_seeotheruids_proc_check_sched(struct ucred *cred, struct proc *proc) { return (mac_seeotheruids_check(cred, proc->p_ucred)); } static int -mac_seeotheruids_check_proc_debug(struct ucred *cred, struct proc *proc) +mac_seeotheruids_proc_check_debug(struct ucred *cred, struct proc *proc) { return (mac_seeotheruids_check(cred, proc->p_ucred)); } static int -mac_seeotheruids_check_socket_visible(struct ucred *cred, struct socket *socket, +mac_seeotheruids_socket_check_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -172,11 +176,11 @@ static struct mac_policy_ops mac_seeotheruids_ops = { - .mpo_check_cred_visible = mac_seeotheruids_check_cred_visible, - .mpo_check_proc_debug = mac_seeotheruids_check_proc_debug, - .mpo_check_proc_sched = mac_seeotheruids_check_proc_sched, - .mpo_check_proc_signal = mac_seeotheruids_check_proc_signal, - .mpo_check_socket_visible = mac_seeotheruids_check_socket_visible, + .mpo_cred_check_visible = mac_seeotheruids_cred_check_visible, + .mpo_proc_check_debug = mac_seeotheruids_proc_check_debug, + .mpo_proc_check_sched = mac_seeotheruids_proc_check_sched, + .mpo_proc_check_signal = mac_seeotheruids_proc_check_signal, + .mpo_socket_check_visible = mac_seeotheruids_socket_check_visible, }; MAC_POLICY_SET(&mac_seeotheruids_ops, mac_seeotheruids, From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:01:13 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 45E5B16A4DD for ; Sat, 8 Jul 2006 13:01:13 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1880943D68 for ; Sat, 8 Jul 2006 13:00:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id AEB4F46D33 for ; Sat, 8 Jul 2006 09:00:58 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 828C55698E; Sat, 8 Jul 2006 13:00:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BC7616A4E5; Sat, 8 Jul 2006 13:00:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CF2016A4E1 for ; Sat, 8 Jul 2006 13:00:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B27A343D46 for ; Sat, 8 Jul 2006 13:00: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.6/8.13.6) with ESMTP id k68D0guW003070 for ; Sat, 8 Jul 2006 13:00:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68D0g84003061 for perforce@freebsd.org; Sat, 8 Jul 2006 13:00:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:00:42 GMT Message-Id: <200607081300.k68D0g84003061@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 100989 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:01:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=100989 Change 100989 by rwatson@rwatson_zoo on 2006/07/08 13:00:04 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_mls/mac_mls.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_mls/mac_mls.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 McAfee, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -10,6 +11,9 @@ * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -461,7 +465,7 @@ * Policy module operations. */ static void -mac_mls_init(struct mac_policy_conf *conf) +mac_mls_policy_init(struct mac_policy_conf *conf) { zone_mls = uma_zcreate("mac_mls", sizeof(struct mac_mls), NULL, @@ -747,7 +751,7 @@ * a lot like file system objects. */ static void -mac_mls_create_devfs_device(struct ucred *cred, struct mount *mp, +mac_mls_devfs_create_device(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_mls *mac_mls; @@ -772,7 +776,7 @@ } static void -mac_mls_create_devfs_directory(struct mount *mp, char *dirname, +mac_mls_devfs_create_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_mls *mac_mls; @@ -782,7 +786,7 @@ } static void -mac_mls_create_devfs_symlink(struct ucred *cred, struct mount *mp, +mac_mls_devfs_create_symlink(struct ucred *cred, struct mount *mp, struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) { @@ -795,20 +799,18 @@ } static void -mac_mls_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) +mac_mls_mount_create(struct ucred *cred, struct mount *mp, + struct label *mntlabel) { struct mac_mls *source, *dest; source = SLOT(cred->cr_label); dest = SLOT(mntlabel); mac_mls_copy_effective(source, dest); - dest = SLOT(fslabel); - mac_mls_copy_effective(source, dest); } static void -mac_mls_relabel_vnode(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_relabel(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label) { struct mac_mls *source, *dest; @@ -820,7 +822,7 @@ } static void -mac_mls_update_devfsdirent(struct mount *mp, +mac_mls_devfs_update(struct mount *mp, struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { @@ -833,7 +835,7 @@ } static void -mac_mls_associate_vnode_devfs(struct mount *mp, struct label *fslabel, +mac_mls_devfs_vnode_associate(struct mount *mp, struct label *mntlabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel) { @@ -846,13 +848,13 @@ } static int -mac_mls_associate_vnode_extattr(struct mount *mp, struct label *fslabel, +mac_mls_vnode_associate_extattr(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { struct mac_mls temp, *source, *dest; int buflen, error; - source = SLOT(fslabel); + source = SLOT(mntlabel); dest = SLOT(vlabel); buflen = sizeof(temp); @@ -861,19 +863,19 @@ error = vn_extattr_get(vp, IO_NODELOCKED, MAC_MLS_EXTATTR_NAMESPACE, MAC_MLS_EXTATTR_NAME, &buflen, (char *) &temp, curthread); if (error == ENOATTR || error == EOPNOTSUPP) { - /* Fall back to the fslabel. */ + /* Fall back to the mntlabel. */ mac_mls_copy_effective(source, dest); return (0); } else if (error) return (error); if (buflen != sizeof(temp)) { - printf("mac_mls_associate_vnode_extattr: bad size %d\n", + printf("mac_mls_vnode_associate_extattr: bad size %d\n", buflen); return (EPERM); } if (mac_mls_valid(&temp) != 0) { - printf("mac_mls_associate_vnode_extattr: invalid\n"); + printf("mac_mls_vnode_associate_extattr: invalid\n"); return (EPERM); } if ((temp.mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAG_EFFECTIVE) { @@ -886,20 +888,20 @@ } static void -mac_mls_associate_vnode_singlelabel(struct mount *mp, - struct label *fslabel, struct vnode *vp, struct label *vlabel) +mac_mls_vnode_associate_singlelabel(struct mount *mp, + struct label *mntlabel, struct vnode *vp, struct label *vlabel) { struct mac_mls *source, *dest; - source = SLOT(fslabel); + source = SLOT(mntlabel); dest = SLOT(vlabel); mac_mls_copy_effective(source, dest); } static int -mac_mls_create_vnode_extattr(struct ucred *cred, struct mount *mp, - struct label *fslabel, struct vnode *dvp, struct label *dlabel, +mac_mls_vnode_create_extattr(struct ucred *cred, struct mount *mp, + struct label *mntlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp) { struct mac_mls *source, *dest, temp; @@ -921,7 +923,7 @@ } static int -mac_mls_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_setlabel_extattr(struct ucred *cred, struct vnode *vp, struct label *vlabel, struct label *intlabel) { struct mac_mls *source, temp; @@ -946,7 +948,7 @@ * Labeling event operations: IPC object. */ static void -mac_mls_create_inpcb_from_socket(struct socket *so, struct label *solabel, +mac_mls_inpcb_create(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel) { struct mac_mls *source, *dest; @@ -958,7 +960,7 @@ } static void -mac_mls_create_mbuf_from_socket(struct socket *so, struct label *socketlabel, +mac_mls_socket_create_mbuf(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_mls *source, *dest; @@ -970,7 +972,7 @@ } static void -mac_mls_create_socket(struct ucred *cred, struct socket *socket, +mac_mls_socket_create(struct ucred *cred, struct socket *socket, struct label *socketlabel) { struct mac_mls *source, *dest; @@ -982,7 +984,7 @@ } static void -mac_mls_create_pipe(struct ucred *cred, struct pipepair *pp, +mac_mls_pipe_create(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_mls *source, *dest; @@ -994,7 +996,7 @@ } static void -mac_mls_create_posix_sem(struct ucred *cred, struct ksem *ksemptr, +mac_mls_posix_sem_create(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { struct mac_mls *source, *dest; @@ -1006,7 +1008,7 @@ } static void -mac_mls_create_socket_from_socket(struct socket *oldsocket, +mac_mls_socket_accept(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) { @@ -1019,7 +1021,7 @@ } static void -mac_mls_relabel_socket(struct ucred *cred, struct socket *socket, +mac_mls_socket_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { struct mac_mls *source, *dest; @@ -1031,7 +1033,7 @@ } static void -mac_mls_relabel_pipe(struct ucred *cred, struct pipepair *pp, +mac_mls_pipe_relabel(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel) { struct mac_mls *source, *dest; @@ -1043,7 +1045,7 @@ } static void -mac_mls_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, +mac_mls_socket_peer_set_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, struct socket *socket, struct label *socketpeerlabel) { struct mac_mls *source, *dest; @@ -1059,7 +1061,7 @@ */ static void -mac_mls_create_sysv_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_mls_sysvmsg_create(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel) { struct mac_mls *source, *dest; @@ -1072,7 +1074,7 @@ } static void -mac_mls_create_sysv_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_mls_sysvmsq_create(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel) { struct mac_mls *source, *dest; @@ -1084,7 +1086,7 @@ } static void -mac_mls_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr, +mac_mls_sysvsem_create(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel) { struct mac_mls *source, *dest; @@ -1096,7 +1098,7 @@ } static void -mac_mls_create_sysv_shm(struct ucred *cred, struct shmid_kernel *shmsegptr, +mac_mls_sysvshm_create(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmlabel) { struct mac_mls *source, *dest; @@ -1111,7 +1113,7 @@ * Labeling event operations: network objects. */ static void -mac_mls_set_socket_peer_from_socket(struct socket *oldsocket, +mac_mls_socket_peer_set_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketpeerlabel) { @@ -1124,7 +1126,7 @@ } static void -mac_mls_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d, +mac_mls_bpfdesc_create(struct ucred *cred, struct bpf_d *bpf_d, struct label *bpflabel) { struct mac_mls *source, *dest; @@ -1136,7 +1138,7 @@ } static void -mac_mls_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) +mac_mls_ifnet_create(struct ifnet *ifnet, struct label *ifnetlabel) { struct mac_mls *dest; int type; @@ -1153,7 +1155,7 @@ } static void -mac_mls_create_ipq(struct mbuf *fragment, struct label *fragmentlabel, +mac_mls_ipq_create(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { struct mac_mls *source, *dest; @@ -1165,7 +1167,7 @@ } static void -mac_mls_create_datagram_from_ipq(struct ipq *ipq, struct label *ipqlabel, +mac_mls_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel, struct mbuf *datagram, struct label *datagramlabel) { struct mac_mls *source, *dest; @@ -1178,7 +1180,7 @@ } static void -mac_mls_create_fragment(struct mbuf *datagram, struct label *datagramlabel, +mac_mls_netinet_fragment(struct mbuf *datagram, struct label *datagramlabel, struct mbuf *fragment, struct label *fragmentlabel) { struct mac_mls *source, *dest; @@ -1190,7 +1192,7 @@ } static void -mac_mls_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel, +mac_mls_inpcb_create_mbuf(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel) { struct mac_mls *source, *dest; @@ -1202,7 +1204,7 @@ } static void -mac_mls_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, +mac_mls_mbuf_create_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { struct mac_mls *dest; @@ -1213,7 +1215,7 @@ } static void -mac_mls_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct label *bpflabel, +mac_mls_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct label *bpflabel, struct mbuf *mbuf, struct label *mbuflabel) { struct mac_mls *source, *dest; @@ -1225,7 +1227,7 @@ } static void -mac_mls_create_mbuf_from_ifnet(struct ifnet *ifnet, struct label *ifnetlabel, +mac_mls_ifnet_create_mbuf(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_mls *source, *dest; @@ -1237,7 +1239,7 @@ } static void -mac_mls_create_mbuf_multicast_encap(struct mbuf *oldmbuf, +mac_mls_mbuf_create_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -1250,7 +1252,7 @@ } static void -mac_mls_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, +mac_mls_mbuf_create_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) { struct mac_mls *source, *dest; @@ -1262,7 +1264,7 @@ } static int -mac_mls_fragment_match(struct mbuf *fragment, struct label *fragmentlabel, +mac_mls_ipq_match(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { struct mac_mls *a, *b; @@ -1274,7 +1276,7 @@ } static void -mac_mls_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, +mac_mls_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) { struct mac_mls *source, *dest; @@ -1286,7 +1288,7 @@ } static void -mac_mls_update_ipq(struct mbuf *fragment, struct label *fragmentlabel, +mac_mls_ipq_update(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { @@ -1309,7 +1311,7 @@ * Labeling event operations: processes. */ static void -mac_mls_create_proc0(struct ucred *cred) +mac_mls_proc_create_swapper(struct ucred *cred) { struct mac_mls *dest; @@ -1321,7 +1323,7 @@ } static void -mac_mls_create_proc1(struct ucred *cred) +mac_mls_proc_create_init(struct ucred *cred) { struct mac_mls *dest; @@ -1333,7 +1335,7 @@ } static void -mac_mls_relabel_cred(struct ucred *cred, struct label *newlabel) +mac_mls_cred_relabel(struct ucred *cred, struct label *newlabel) { struct mac_mls *source, *dest; @@ -1347,28 +1349,28 @@ * Label cleanup/flush operations. */ static void -mac_mls_cleanup_sysv_msgmsg(struct label *msglabel) +mac_mls_sysvmsg_cleanup(struct label *msglabel) { bzero(SLOT(msglabel), sizeof(struct mac_mls)); } static void -mac_mls_cleanup_sysv_msgqueue(struct label *msqlabel) +mac_mls_sysvmsq_cleanup(struct label *msqlabel) { bzero(SLOT(msqlabel), sizeof(struct mac_mls)); } static void -mac_mls_cleanup_sysv_sem(struct label *semalabel) +mac_mls_sysvsem_cleanup(struct label *semalabel) { bzero(SLOT(semalabel), sizeof(struct mac_mls)); } static void -mac_mls_cleanup_sysv_shm(struct label *shmlabel) +mac_mls_sysvshm_cleanup(struct label *shmlabel) { bzero(SLOT(shmlabel), sizeof(struct mac_mls)); @@ -1378,7 +1380,7 @@ * Access control checks. */ static int -mac_mls_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, +mac_mls_bpfdesc_check_receive(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel) { struct mac_mls *a, *b; @@ -1395,7 +1397,7 @@ } static int -mac_mls_check_cred_relabel(struct ucred *cred, struct label *newlabel) +mac_mls_cred_check_relabel(struct ucred *cred, struct label *newlabel) { struct mac_mls *subj, *new; int error; @@ -1457,7 +1459,7 @@ } static int -mac_mls_check_cred_visible(struct ucred *u1, struct ucred *u2) +mac_mls_cred_check_visible(struct ucred *u1, struct ucred *u2) { struct mac_mls *subj, *obj; @@ -1475,7 +1477,7 @@ } static int -mac_mls_check_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, +mac_mls_ifnet_check_relabel(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) { struct mac_mls *subj, *new; @@ -1501,7 +1503,7 @@ } static int -mac_mls_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, +mac_mls_ifnet_check_transmit(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_mls *p, *i; @@ -1516,7 +1518,7 @@ } static int -mac_mls_check_inpcb_deliver(struct inpcb *inp, struct label *inplabel, +mac_mls_inpcb_check_deliver(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel) { struct mac_mls *p, *i; @@ -1531,7 +1533,7 @@ } static int -mac_mls_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr, +mac_mls_sysvmsq_check_msgrcv(struct ucred *cred, struct msg *msgptr, struct label *msglabel) { struct mac_mls *subj, *obj; @@ -1549,7 +1551,7 @@ } static int -mac_mls_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr, +mac_mls_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr, struct label *msglabel) { struct mac_mls *subj, *obj; @@ -1567,7 +1569,7 @@ } static int -mac_mls_check_sysv_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_mls_sysvmsq_check_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) { struct mac_mls *subj, *obj; @@ -1585,7 +1587,7 @@ } static int -mac_mls_check_sysv_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_mls_sysvmsq_check_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) { struct mac_mls *subj, *obj; @@ -1603,7 +1605,7 @@ } static int -mac_mls_check_sysv_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_mls_sysvmsq_check_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) { struct mac_mls *subj, *obj; @@ -1621,7 +1623,7 @@ } static int -mac_mls_check_sysv_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_mls_sysvmsq_check_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd) { struct mac_mls *subj, *obj; @@ -1652,7 +1654,7 @@ } static int -mac_mls_check_sysv_semctl(struct ucred *cred, struct semid_kernel *semakptr, +mac_mls_sysvsem_check_semctl(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, int cmd) { struct mac_mls *subj, *obj; @@ -1690,7 +1692,7 @@ } static int -mac_mls_check_sysv_semget(struct ucred *cred, struct semid_kernel *semakptr, +mac_mls_sysvsem_check_semget(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel) { struct mac_mls *subj, *obj; @@ -1708,7 +1710,7 @@ } static int -mac_mls_check_sysv_semop(struct ucred *cred, struct semid_kernel *semakptr, +mac_mls_sysvsem_check_semop(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, size_t accesstype) { struct mac_mls *subj, *obj; @@ -1731,7 +1733,7 @@ } static int -mac_mls_check_sysv_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, +mac_mls_sysvshm_check_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) { struct mac_mls *subj, *obj; @@ -1752,7 +1754,7 @@ } static int -mac_mls_check_sysv_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, +mac_mls_sysvshm_check_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int cmd) { struct mac_mls *subj, *obj; @@ -1784,7 +1786,7 @@ } static int -mac_mls_check_sysv_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, +mac_mls_sysvshm_check_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) { struct mac_mls *subj, *obj; @@ -1802,7 +1804,7 @@ } static int -mac_mls_check_mount_stat(struct ucred *cred, struct mount *mp, +mac_mls_mount_check_stat(struct ucred *cred, struct mount *mp, struct label *mntlabel) { struct mac_mls *subj, *obj; @@ -1820,7 +1822,7 @@ } static int -mac_mls_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp, +mac_mls_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) { @@ -1833,7 +1835,7 @@ } static int -mac_mls_check_pipe_poll(struct ucred *cred, struct pipepair *pp, +mac_mls_pipe_check_poll(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_mls *subj, *obj; @@ -1851,7 +1853,7 @@ } static int -mac_mls_check_pipe_read(struct ucred *cred, struct pipepair *pp, +mac_mls_pipe_check_read(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_mls *subj, *obj; @@ -1869,7 +1871,7 @@ } static int -mac_mls_check_pipe_relabel(struct ucred *cred, struct pipepair *pp, +mac_mls_pipe_check_relabel(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel) { struct mac_mls *subj, *obj, *new; @@ -1920,7 +1922,7 @@ } static int -mac_mls_check_pipe_stat(struct ucred *cred, struct pipepair *pp, +mac_mls_pipe_check_stat(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_mls *subj, *obj; @@ -1938,7 +1940,7 @@ } static int -mac_mls_check_pipe_write(struct ucred *cred, struct pipepair *pp, +mac_mls_pipe_check_write(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_mls *subj, *obj; @@ -1956,7 +1958,7 @@ } static int -mac_mls_check_posix_sem_write(struct ucred *cred, struct ksem *ksemptr, +mac_mls_posix_sem_check_write(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { struct mac_mls *subj, *obj; @@ -1974,7 +1976,7 @@ } static int -mac_mls_check_posix_sem_rdonly(struct ucred *cred, struct ksem *ksemptr, +mac_mls_posix_sem_check_rdonly(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { struct mac_mls *subj, *obj; @@ -1992,7 +1994,7 @@ } static int -mac_mls_check_proc_debug(struct ucred *cred, struct proc *proc) +mac_mls_proc_check_debug(struct ucred *cred, struct proc *proc) { struct mac_mls *subj, *obj; @@ -2012,7 +2014,7 @@ } static int -mac_mls_check_proc_sched(struct ucred *cred, struct proc *proc) +mac_mls_proc_check_sched(struct ucred *cred, struct proc *proc) { struct mac_mls *subj, *obj; @@ -2032,7 +2034,7 @@ } static int -mac_mls_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) +mac_mls_proc_check_signal(struct ucred *cred, struct proc *proc, int signum) { struct mac_mls *subj, *obj; @@ -2052,7 +2054,7 @@ } static int -mac_mls_check_socket_deliver(struct socket *so, struct label *socketlabel, +mac_mls_socket_check_deliver(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_mls *p, *s; @@ -2067,7 +2069,7 @@ } static int -mac_mls_check_socket_relabel(struct ucred *cred, struct socket *socket, +mac_mls_socket_check_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { struct mac_mls *subj, *obj, *new; @@ -2118,7 +2120,7 @@ } static int -mac_mls_check_socket_visible(struct ucred *cred, struct socket *socket, +mac_mls_socket_check_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { struct mac_mls *subj, *obj; @@ -2136,7 +2138,7 @@ } static int -mac_mls_check_system_swapon(struct ucred *cred, struct vnode *vp, +mac_mls_system_check_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { struct mac_mls *subj, *obj; @@ -2155,7 +2157,7 @@ } static int -mac_mls_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, +mac_mls_vnode_check_chdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { struct mac_mls *subj, *obj; @@ -2173,7 +2175,7 @@ } static int -mac_mls_check_vnode_chroot(struct ucred *cred, struct vnode *dvp, +mac_mls_vnode_check_chroot(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { struct mac_mls *subj, *obj; @@ -2191,7 +2193,7 @@ } static int -mac_mls_check_vnode_create(struct ucred *cred, struct vnode *dvp, +mac_mls_vnode_check_create(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp, struct vattr *vap) { struct mac_mls *subj, *obj; @@ -2209,31 +2211,7 @@ } static int -mac_mls_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label, - struct componentname *cnp) -{ - struct mac_mls *subj, *obj; - - if (!mac_mls_enabled) - return (0); - - subj = SLOT(cred->cr_label); - obj = SLOT(dlabel); - - if (!mac_mls_dominate_effective(obj, subj)) - return (EACCES); - - obj = SLOT(label); - - if (!mac_mls_dominate_effective(obj, subj)) - return (EACCES); - - return (0); -} - -static int -mac_mls_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { struct mac_mls *subj, *obj; @@ -2251,7 +2229,7 @@ } static int -mac_mls_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name) { struct mac_mls *subj, *obj; @@ -2269,7 +2247,7 @@ } static int -mac_mls_check_vnode_exec(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_check_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel) { @@ -2301,7 +2279,7 @@ } static int -mac_mls_check_vnode_getacl(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_check_getacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { struct mac_mls *subj, *obj; @@ -2319,7 +2297,7 @@ } static int -mac_mls_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_check_getextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { struct mac_mls *subj, *obj; @@ -2337,7 +2315,7 @@ } static int -mac_mls_check_vnode_link(struct ucred *cred, struct vnode *dvp, +mac_mls_vnode_check_link(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { @@ -2360,7 +2338,7 @@ } static int -mac_mls_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_check_listextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace) { @@ -2379,7 +2357,7 @@ } static int -mac_mls_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, +mac_mls_vnode_check_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { struct mac_mls *subj, *obj; @@ -2397,7 +2375,7 @@ } static int -mac_mls_check_vnode_mmap(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_check_mmap(struct ucred *cred, struct vnode *vp, struct label *label, int prot, int flags) { struct mac_mls *subj, *obj; @@ -2425,7 +2403,7 @@ } static int -mac_mls_check_vnode_open(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_check_open(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, int acc_mode) { struct mac_mls *subj, *obj; @@ -2450,7 +2428,7 @@ } static int -mac_mls_check_vnode_poll(struct ucred *active_cred, struct ucred *file_cred, +mac_mls_vnode_check_poll(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { struct mac_mls *subj, *obj; @@ -2468,7 +2446,7 @@ } static int -mac_mls_check_vnode_read(struct ucred *active_cred, struct ucred *file_cred, +mac_mls_vnode_check_read(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { struct mac_mls *subj, *obj; @@ -2486,7 +2464,7 @@ } static int -mac_mls_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, +mac_mls_vnode_check_readdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { struct mac_mls *subj, *obj; @@ -2504,7 +2482,7 @@ } static int -mac_mls_check_vnode_readlink(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_check_readlink(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { struct mac_mls *subj, *obj; @@ -2522,7 +2500,7 @@ } static int -mac_mls_check_vnode_relabel(struct ucred *cred, struct vnode *vp, +mac_mls_vnode_check_relabel(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *newlabel) { struct mac_mls *old, *new, *subj; @@ -2574,7 +2552,7 @@ static int -mac_mls_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, +mac_mls_vnode_check_rename_from(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { @@ -2598,7 +2576,7 @@ } static int -mac_mls_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:02:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D6B216A4DD for ; Sat, 8 Jul 2006 13:02:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A66B443D73 for ; Sat, 8 Jul 2006 13:02:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3FF0C46D33 for ; Sat, 8 Jul 2006 09:02:29 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7DAA46468D; Sat, 8 Jul 2006 13:01:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BD52716A4E7; Sat, 8 Jul 2006 13:01:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9562E16A4E1 for ; Sat, 8 Jul 2006 13:01:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B98443D69 for ; Sat, 8 Jul 2006 13:01:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68D1iHb004022 for ; Sat, 8 Jul 2006 13:01:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68D1iuY004019 for perforce@freebsd.org; Sat, 8 Jul 2006 13:01:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:01:44 GMT Message-Id: <200607081301.k68D1iuY004019@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 100990 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:02:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=100990 Change 100990 by rwatson@rwatson_zoo on 2006/07/08 13:00:44 Disconnect ifoff, partition from mac2. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/conf/files#2 edit .. //depot/projects/trustedbsd/mac2/sys/modules/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/conf/files#2 (text+ko) ==== @@ -1884,11 +1884,9 @@ security/mac/mac_vfs.c optional mac security/mac_biba/mac_biba.c optional mac_biba security/mac_bsdextended/mac_bsdextended.c optional mac_bsdextended -security/mac_ifoff/mac_ifoff.c optional mac_ifoff security/mac_lomac/mac_lomac.c optional mac_lomac security/mac_mls/mac_mls.c optional mac_mls security/mac_none/mac_none.c optional mac_none -security/mac_partition/mac_partition.c optional mac_partition security/mac_portacl/mac_portacl.c optional mac_portacl security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids security/mac_stub/mac_stub.c optional mac_stub ==== //depot/projects/trustedbsd/mac2/sys/modules/Makefile#2 (text+ko) ==== @@ -139,11 +139,9 @@ lpt \ mac_biba \ mac_bsdextended \ - mac_ifoff \ mac_lomac \ mac_mls \ mac_none \ - mac_partition \ mac_portacl \ mac_seeotheruids \ mac_stub \ From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:06:12 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 472E316A4E1 for ; Sat, 8 Jul 2006 13:06:12 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00E7543D62 for ; Sat, 8 Jul 2006 13:05:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E5D4746D32 for ; Sat, 8 Jul 2006 09:05:52 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 503A557CD7; Sat, 8 Jul 2006 13:05:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 47B9716A4E1; Sat, 8 Jul 2006 13:05:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F300916A4DF for ; Sat, 8 Jul 2006 13:05:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BDD743D67 for ; Sat, 8 Jul 2006 13:05:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68D5oXA008104 for ; Sat, 8 Jul 2006 13:05:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68D5o1S008092 for perforce@freebsd.org; Sat, 8 Jul 2006 13:05:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:05:50 GMT Message-Id: <200607081305.k68D5o1S008092@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 100991 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:06:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=100991 Change 100991 by rwatson@rwatson_zoo on 2006/07/08 13:05:00 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_bsdextended/mac_bsdextended.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_bsdextended/mac_bsdextended.c#2 (text+ko) ==== @@ -2,6 +2,7 @@ * Copyright (c) 2005 Tom Rhodes * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -12,6 +13,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -234,7 +238,7 @@ CTLFLAG_RW, sysctl_rule, "BSD extended MAC rules"); static void -mac_bsdextended_init(struct mac_policy_conf *mpc) +mac_bsdextended_policy_init(struct mac_policy_conf *mpc) { /* Initialize ruleset lock. */ @@ -244,7 +248,7 @@ } static void -mac_bsdextended_destroy(struct mac_policy_conf *mpc) +mac_bsdextended_policy_destroy(struct mac_policy_conf *mpc) { /* Destroy ruleset lock. */ @@ -503,7 +507,7 @@ } static int -mac_bsdextended_check_system_swapon(struct ucred *cred, struct vnode *vp, +mac_bsdextended_system_check_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -511,7 +515,7 @@ } static int -mac_bsdextended_check_vnode_access(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_access(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode) { @@ -519,7 +523,7 @@ } static int -mac_bsdextended_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, +mac_bsdextended_vnode_check_chdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -527,7 +531,7 @@ } static int -mac_bsdextended_check_vnode_chroot(struct ucred *cred, struct vnode *dvp, +mac_bsdextended_vnode_check_chroot(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -543,21 +547,7 @@ } static int -mac_bsdextended_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label, - struct componentname *cnp) -{ - int error; - - error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); - if (error) - return (error); - - return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); -} - -static int -mac_bsdextended_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { @@ -565,7 +555,7 @@ } static int -mac_bsdextended_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name) { @@ -573,7 +563,7 @@ } static int -mac_bsdextended_check_vnode_exec(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel) { @@ -582,7 +572,7 @@ } static int -mac_bsdextended_check_vnode_getacl(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_getacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { @@ -590,7 +580,7 @@ } static int -mac_bsdextended_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_getextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { @@ -598,7 +588,7 @@ } static int -mac_bsdextended_check_vnode_link(struct ucred *cred, struct vnode *dvp, +mac_bsdextended_vnode_check_link(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { @@ -615,7 +605,7 @@ } static int -mac_bsdextended_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_listextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace) { @@ -623,7 +613,7 @@ } static int -mac_bsdextended_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, +mac_bsdextended_vnode_check_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -631,7 +621,7 @@ } static int -mac_bsdextended_check_vnode_open(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_open(struct ucred *cred, struct vnode *vp, struct label *filelabel, int acc_mode) { @@ -639,7 +629,7 @@ } static int -mac_bsdextended_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, +mac_bsdextended_vnode_check_readdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -647,7 +637,7 @@ } static int -mac_bsdextended_check_vnode_readdlink(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_readdlink(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -655,7 +645,7 @@ } static int -mac_bsdextended_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, +mac_bsdextended_vnode_check_rename_from(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { @@ -670,7 +660,7 @@ } static int -mac_bsdextended_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, +mac_bsdextended_vnode_check_rename_to(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, int samedir, struct componentname *cnp) { @@ -687,7 +677,7 @@ } static int -mac_bsdextended_check_vnode_revoke(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_revoke(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -703,7 +693,7 @@ } static int -mac_bsdextended_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_setextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { @@ -711,7 +701,7 @@ } static int -mac_bsdextended_check_vnode_setflags(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_setflags(struct ucred *cred, struct vnode *vp, struct label *label, u_long flags) { @@ -719,7 +709,7 @@ } static int -mac_bsdextended_check_vnode_setmode(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_setmode(struct ucred *cred, struct vnode *vp, struct label *label, mode_t mode) { @@ -727,7 +717,7 @@ } static int -mac_bsdextended_check_vnode_setowner(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_setowner(struct ucred *cred, struct vnode *vp, struct label *label, uid_t uid, gid_t gid) { @@ -735,7 +725,7 @@ } static int -mac_bsdextended_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, +mac_bsdextended_vnode_check_setutimes(struct ucred *cred, struct vnode *vp, struct label *label, struct timespec atime, struct timespec utime) { @@ -743,44 +733,58 @@ } static int -mac_bsdextended_check_vnode_stat(struct ucred *active_cred, +mac_bsdextended_vnode_check_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { return (mac_bsdextended_check_vp(active_cred, vp, MBI_STAT)); } +static int +mac_bsdextended_vnode_check_unlink(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) +{ + int error; + + error = mac_bsdextended_check_vp(cred, dvp, MBI_WRITE); + if (error) + return (error); + + return (mac_bsdextended_check_vp(cred, vp, MBI_WRITE)); +} + static struct mac_policy_ops mac_bsdextended_ops = { - .mpo_destroy = mac_bsdextended_destroy, - .mpo_init = mac_bsdextended_init, - .mpo_check_system_swapon = mac_bsdextended_check_system_swapon, - .mpo_check_vnode_access = mac_bsdextended_check_vnode_access, - .mpo_check_vnode_chdir = mac_bsdextended_check_vnode_chdir, - .mpo_check_vnode_chroot = mac_bsdextended_check_vnode_chroot, - .mpo_check_vnode_create = mac_bsdextended_check_create_vnode, - .mpo_check_vnode_delete = mac_bsdextended_check_vnode_delete, - .mpo_check_vnode_deleteacl = mac_bsdextended_check_vnode_deleteacl, - .mpo_check_vnode_deleteextattr = mac_bsdextended_check_vnode_deleteextattr, - .mpo_check_vnode_exec = mac_bsdextended_check_vnode_exec, - .mpo_check_vnode_getacl = mac_bsdextended_check_vnode_getacl, - .mpo_check_vnode_getextattr = mac_bsdextended_check_vnode_getextattr, - .mpo_check_vnode_link = mac_bsdextended_check_vnode_link, - .mpo_check_vnode_listextattr = mac_bsdextended_check_vnode_listextattr, - .mpo_check_vnode_lookup = mac_bsdextended_check_vnode_lookup, - .mpo_check_vnode_open = mac_bsdextended_check_vnode_open, - .mpo_check_vnode_readdir = mac_bsdextended_check_vnode_readdir, - .mpo_check_vnode_readlink = mac_bsdextended_check_vnode_readdlink, - .mpo_check_vnode_rename_from = mac_bsdextended_check_vnode_rename_from, - .mpo_check_vnode_rename_to = mac_bsdextended_check_vnode_rename_to, - .mpo_check_vnode_revoke = mac_bsdextended_check_vnode_revoke, - .mpo_check_vnode_setacl = mac_bsdextended_check_setacl_vnode, - .mpo_check_vnode_setextattr = mac_bsdextended_check_vnode_setextattr, - .mpo_check_vnode_setflags = mac_bsdextended_check_vnode_setflags, - .mpo_check_vnode_setmode = mac_bsdextended_check_vnode_setmode, - .mpo_check_vnode_setowner = mac_bsdextended_check_vnode_setowner, - .mpo_check_vnode_setutimes = mac_bsdextended_check_vnode_setutimes, - .mpo_check_vnode_stat = mac_bsdextended_check_vnode_stat, + .mpo_policy_destroy = mac_bsdextended_policy_destroy, + .mpo_policy_init = mac_bsdextended_policy_init, + .mpo_system_check_swapon = mac_bsdextended_system_check_swapon, + .mpo_vnode_check_access = mac_bsdextended_vnode_check_access, + .mpo_vnode_check_chdir = mac_bsdextended_vnode_check_chdir, + .mpo_vnode_check_chroot = mac_bsdextended_vnode_check_chroot, + .mpo_vnode_check_create = mac_bsdextended_check_create_vnode, + .mpo_vnode_check_deleteacl = mac_bsdextended_vnode_check_deleteacl, + .mpo_vnode_check_deleteextattr = mac_bsdextended_vnode_check_deleteextattr, + .mpo_vnode_check_exec = mac_bsdextended_vnode_check_exec, + .mpo_vnode_check_getacl = mac_bsdextended_vnode_check_getacl, + .mpo_vnode_check_getextattr = mac_bsdextended_vnode_check_getextattr, + .mpo_vnode_check_link = mac_bsdextended_vnode_check_link, + .mpo_vnode_check_listextattr = mac_bsdextended_vnode_check_listextattr, + .mpo_vnode_check_lookup = mac_bsdextended_vnode_check_lookup, + .mpo_vnode_check_open = mac_bsdextended_vnode_check_open, + .mpo_vnode_check_readdir = mac_bsdextended_vnode_check_readdir, + .mpo_vnode_check_readlink = mac_bsdextended_vnode_check_readdlink, + .mpo_vnode_check_rename_from = mac_bsdextended_vnode_check_rename_from, + .mpo_vnode_check_rename_to = mac_bsdextended_vnode_check_rename_to, + .mpo_vnode_check_revoke = mac_bsdextended_vnode_check_revoke, + .mpo_vnode_check_setacl = mac_bsdextended_check_setacl_vnode, + .mpo_vnode_check_setextattr = mac_bsdextended_vnode_check_setextattr, + .mpo_vnode_check_setflags = mac_bsdextended_vnode_check_setflags, + .mpo_vnode_check_setmode = mac_bsdextended_vnode_check_setmode, + .mpo_vnode_check_setowner = mac_bsdextended_vnode_check_setowner, + .mpo_vnode_check_setutimes = mac_bsdextended_vnode_check_setutimes, + .mpo_vnode_check_stat = mac_bsdextended_vnode_check_stat, + .mpo_vnode_check_unlink = mac_bsdextended_vnode_check_unlink, }; MAC_POLICY_SET(&mac_bsdextended_ops, mac_bsdextended, From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:07:11 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 563DB16A4DF for ; Sat, 8 Jul 2006 13:07:11 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D65943D6A for ; Sat, 8 Jul 2006 13:07:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C4E0546D37 for ; Sat, 8 Jul 2006 09:06:59 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3CFE5557F0; Sat, 8 Jul 2006 13:06:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 35E3B16A4E6; Sat, 8 Jul 2006 13:06:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E44B16A4DF for ; Sat, 8 Jul 2006 13:06:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C854E43D73 for ; Sat, 8 Jul 2006 13:06:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68D6qKV008794 for ; Sat, 8 Jul 2006 13:06:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68D6qww008782 for perforce@freebsd.org; Sat, 8 Jul 2006 13:06:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:06:52 GMT Message-Id: <200607081306.k68D6qww008782@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 100992 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:07:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=100992 Change 100992 by rwatson@rwatson_zoo on 2006/07/08 13:06:01 De fslabel. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_stub/mac_stub.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_stub/mac_stub.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 McAfee, Inc. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -165,7 +165,7 @@ * a lot like file system objects. */ static void -stub_associate_vnode_devfs(struct mount *mp, struct label *fslabel, +stub_associate_vnode_devfs(struct mount *mp, struct label *mntlabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel) { @@ -173,7 +173,7 @@ } static int -stub_associate_vnode_extattr(struct mount *mp, struct label *fslabel, +stub_associate_vnode_extattr(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { @@ -182,7 +182,7 @@ static void stub_associate_vnode_singlelabel(struct mount *mp, - struct label *fslabel, struct vnode *vp, struct label *vlabel) + struct label *mntlabel, struct vnode *vp, struct label *vlabel) { } @@ -211,7 +211,7 @@ static int stub_create_vnode_extattr(struct ucred *cred, struct mount *mp, - struct label *fslabel, struct vnode *dvp, struct label *dlabel, + struct label *mntlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp) { @@ -220,7 +220,7 @@ static void stub_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) + struct label *mntlabel) { } @@ -1379,7 +1379,6 @@ .mpo_init_ipq_label = stub_init_label_waitcheck, .mpo_init_mbuf_label = stub_init_label_waitcheck, .mpo_init_mount_label = stub_init_label, - .mpo_init_mount_fs_label = stub_init_label, .mpo_init_pipe_label = stub_init_label, .mpo_init_posix_sem_label = stub_init_label, .mpo_init_socket_label = stub_init_label_waitcheck, @@ -1397,7 +1396,6 @@ .mpo_destroy_ipq_label = stub_destroy_label, .mpo_destroy_mbuf_label = stub_destroy_label, .mpo_destroy_mount_label = stub_destroy_label, - .mpo_destroy_mount_fs_label = stub_destroy_label, .mpo_destroy_pipe_label = stub_destroy_label, .mpo_destroy_posix_sem_label = stub_destroy_label, .mpo_destroy_socket_label = stub_destroy_label, From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:18:01 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 963C216A4DA for ; Sat, 8 Jul 2006 13:18:01 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CEBA43D5D for ; Sat, 8 Jul 2006 13:17:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 193C946D39 for ; Sat, 8 Jul 2006 09:17:45 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C235D555CB; Sat, 8 Jul 2006 13:17:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BBE6416A4E2; Sat, 8 Jul 2006 13:17:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7735E16A4E5 for ; Sat, 8 Jul 2006 13:17:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CA0A43D53 for ; Sat, 8 Jul 2006 13:17:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68DHLeO015664 for ; Sat, 8 Jul 2006 13:17:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68DHK9n015649 for perforce@freebsd.org; Sat, 8 Jul 2006 13:17:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:17:20 GMT Message-Id: <200607081317.k68DHK9n015649@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 100996 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:18:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=100996 Change 100996 by rwatson@rwatson_zoo on 2006/07/08 13:16:54 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_stub/mac_stub.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_stub/mac_stub.c#3 (text+ko) ==== @@ -98,13 +98,13 @@ * Policy module operations. */ static void -stub_destroy(struct mac_policy_conf *conf) +stub_policy_destroy(struct mac_policy_conf *conf) { } static void -stub_init(struct mac_policy_conf *conf) +stub_policy_init(struct mac_policy_conf *conf) { } @@ -165,7 +165,7 @@ * a lot like file system objects. */ static void -stub_associate_vnode_devfs(struct mount *mp, struct label *mntlabel, +stub_devfs_vnode_associate(struct mount *mp, struct label *mntlabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel) { @@ -173,7 +173,7 @@ } static int -stub_associate_vnode_extattr(struct mount *mp, struct label *mntlabel, +stub_vnode_associate_extattr(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { @@ -181,28 +181,28 @@ } static void -stub_associate_vnode_singlelabel(struct mount *mp, +stub_vnode_associate_singlelabel(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { } static void -stub_create_devfs_device(struct ucred *cred, struct mount *mp, +stub_devfs_create_device(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *devfs_dirent, struct label *label) { } static void -stub_create_devfs_directory(struct mount *mp, char *dirname, +stub_devfs_create_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label) { } static void -stub_create_devfs_symlink(struct ucred *cred, struct mount *mp, +stub_devfs_create_symlink(struct ucred *cred, struct mount *mp, struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) { @@ -210,7 +210,7 @@ } static int -stub_create_vnode_extattr(struct ucred *cred, struct mount *mp, +stub_vnode_create_extattr(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp) { @@ -219,21 +219,21 @@ } static void -stub_create_mount(struct ucred *cred, struct mount *mp, +stub_mount_create(struct ucred *cred, struct mount *mp, struct label *mntlabel) { } static void -stub_relabel_vnode(struct ucred *cred, struct vnode *vp, +stub_vnode_relabel(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label) { } static int -stub_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, +stub_vnode_setlabel_extattr(struct ucred *cred, struct vnode *vp, struct label *vlabel, struct label *intlabel) { @@ -241,7 +241,7 @@ } static void -stub_update_devfsdirent(struct mount *mp, +stub_devfs_update(struct mount *mp, struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { @@ -252,35 +252,35 @@ * Labeling event operations: IPC object. */ static void -stub_create_mbuf_from_socket(struct socket *so, struct label *socketlabel, +stub_socket_create_mbuf(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { } static void -stub_create_socket(struct ucred *cred, struct socket *socket, +stub_socket_create(struct ucred *cred, struct socket *socket, struct label *socketlabel) { } static void -stub_create_pipe(struct ucred *cred, struct pipepair *pp, +stub_pipe_create(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { } static void -stub_create_posix_sem(struct ucred *cred, struct ksem *ksemptr, +stub_posix_sem_create(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { } static void -stub_create_socket_from_socket(struct socket *oldsocket, +stub_socket_accept(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) { @@ -288,28 +288,28 @@ } static void -stub_relabel_socket(struct ucred *cred, struct socket *socket, +stub_socket_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { } static void -stub_relabel_pipe(struct ucred *cred, struct pipepair *pp, +stub_pipe_relabel(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel) { } static void -stub_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, +stub_socket_peer_set_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, struct socket *socket, struct label *socketpeerlabel) { } static void -stub_set_socket_peer_from_socket(struct socket *oldsocket, +stub_socket_peer_set_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketpeerlabel) { @@ -320,104 +320,104 @@ * Labeling event operations: network objects. */ static void -stub_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d, +stub_bpfdesc_create(struct ucred *cred, struct bpf_d *bpf_d, struct label *bpflabel) { } static void -stub_create_datagram_from_ipq(struct ipq *ipq, struct label *ipqlabel, +stub_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel, struct mbuf *datagram, struct label *datagramlabel) { } static void -stub_create_fragment(struct mbuf *datagram, struct label *datagramlabel, +stub_netinet_fragment(struct mbuf *datagram, struct label *datagramlabel, struct mbuf *fragment, struct label *fragmentlabel) { } static void -stub_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) +stub_ifnet_create(struct ifnet *ifnet, struct label *ifnetlabel) { } static void -stub_create_inpcb_from_socket(struct socket *so, struct label *solabel, +stub_inpcb_create(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel) { } static void -stub_create_sysv_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, +stub_sysvmsg_create(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel) { } static void -stub_create_sysv_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr, +stub_sysvmsq_create(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel) { } static void -stub_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr, +stub_sysvsem_create(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel) { } static void -stub_create_sysv_shm(struct ucred *cred, struct shmid_kernel *shmsegptr, +stub_sysvshm_create(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmalabel) { } static void -stub_create_ipq(struct mbuf *fragment, struct label *fragmentlabel, +stub_ipq_create(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { } static void -stub_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel, +stub_inpcb_create_mbuf(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel) { } static void -stub_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, +stub_mbuf_create_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { } static void -stub_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct label *bpflabel, +stub_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct label *bpflabel, struct mbuf *mbuf, struct label *mbuflabel) { } static void -stub_create_mbuf_from_ifnet(struct ifnet *ifnet, struct label *ifnetlabel, +stub_ifnet_create_mbuf(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) { } static void -stub_create_mbuf_multicast_encap(struct mbuf *oldmbuf, +stub_mbuf_create_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -425,14 +425,14 @@ } static void -stub_create_mbuf_netlayer(struct mbuf *oldmbuf, +stub_mbuf_create_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) { } static int -stub_fragment_match(struct mbuf *fragment, struct label *fragmentlabel, +stub_ipq_match(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { @@ -440,26 +440,26 @@ } static void -stub_reflect_mbuf_icmp(struct mbuf *m, struct label *mlabel) +stub_netinet_icmp_reply(struct mbuf *m, struct label *mlabel) { } static void -stub_reflect_mbuf_tcp(struct mbuf *m, struct label *mlabel) +stub_netinet_tcp_reply(struct mbuf *m, struct label *mlabel) { } static void -stub_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, +stub_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) { } static void -stub_update_ipq(struct mbuf *fragment, struct label *fragmentlabel, +stub_ipq_update(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { @@ -476,7 +476,7 @@ * Labeling event operations: processes. */ static void -stub_execve_transition(struct ucred *old, struct ucred *new, +stub_vnode_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, struct image_params *imgp, struct label *execlabel) @@ -485,7 +485,7 @@ } static int -stub_execve_will_transition(struct ucred *old, struct vnode *vp, +stub_vnode_execve_will_transition(struct ucred *old, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, struct image_params *imgp, struct label *execlabel) { @@ -494,19 +494,19 @@ } static void -stub_create_proc0(struct ucred *cred) +stub_proc_create_swapper(struct ucred *cred) { } static void -stub_create_proc1(struct ucred *cred) +stub_proc_create_init(struct ucred *cred) { } static void -stub_relabel_cred(struct ucred *cred, struct label *newlabel) +stub_cred_relabel(struct ucred *cred, struct label *newlabel) { } @@ -521,25 +521,25 @@ * Label cleanup/flush operations */ static void -stub_cleanup_sysv_msgmsg(struct label *msglabel) +stub_sysvmsg_cleanup(struct label *msglabel) { } static void -stub_cleanup_sysv_msgqueue(struct label *msqlabel) +stub_sysvmsq_cleanup(struct label *msqlabel) { } static void -stub_cleanup_sysv_sem(struct label *semalabel) +stub_sysvsem_cleanup(struct label *semalabel) { } static void -stub_cleanup_sysv_shm(struct label *shmlabel) +stub_sysvshm_cleanup(struct label *shmlabel) { } @@ -548,7 +548,7 @@ * Access control checks. */ static int -stub_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, +stub_bpfdesc_check_receive(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnet_label) { @@ -556,21 +556,21 @@ } static int -stub_check_cred_relabel(struct ucred *cred, struct label *newlabel) +stub_cred_check_relabel(struct ucred *cred, struct label *newlabel) { return (0); } static int -stub_check_cred_visible(struct ucred *u1, struct ucred *u2) +stub_cred_check_visible(struct ucred *u1, struct ucred *u2) { return (0); } static int -stub_check_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, +stub_ifnet_check_relabel(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) { @@ -578,7 +578,7 @@ } static int -stub_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, +stub_ifnet_check_transmit(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) { @@ -586,7 +586,7 @@ } static int -stub_check_inpcb_deliver(struct inpcb *inp, struct label *inplabel, +stub_inpcb_check_deliver(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel) { @@ -594,7 +594,7 @@ } static int -stub_check_sysv_msgmsq(struct ucred *cred, struct msg *msgptr, +stub_sysvmsq_check_msgmsq(struct ucred *cred, struct msg *msgptr, struct label *msglabel, struct msqid_kernel *msqkptr, struct label *msqklabel) { @@ -603,7 +603,7 @@ } static int -stub_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr, +stub_sysvmsq_check_msgrcv(struct ucred *cred, struct msg *msgptr, struct label *msglabel) { @@ -612,7 +612,7 @@ static int -stub_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr, +stub_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr, struct label *msglabel) { @@ -621,7 +621,7 @@ static int -stub_check_sysv_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, +stub_sysvmsq_check_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) { @@ -630,7 +630,7 @@ static int -stub_check_sysv_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr, +stub_sysvmsq_check_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) { @@ -638,7 +638,7 @@ } static int -stub_check_sysv_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr, +stub_sysvmsq_check_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) { @@ -647,7 +647,7 @@ static int -stub_check_sysv_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, +stub_sysvmsq_check_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd) { @@ -656,7 +656,7 @@ static int -stub_check_sysv_semctl(struct ucred *cred, struct semid_kernel *semakptr, +stub_sysvsem_check_semctl(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, int cmd) { @@ -664,7 +664,7 @@ } static int -stub_check_sysv_semget(struct ucred *cred, struct semid_kernel *semakptr, +stub_sysvsem_check_semget(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel) { @@ -673,7 +673,7 @@ static int -stub_check_sysv_semop(struct ucred *cred, struct semid_kernel *semakptr, +stub_sysvsem_check_semop(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, size_t accesstype) { @@ -681,7 +681,7 @@ } static int -stub_check_sysv_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, +stub_sysvshm_check_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) { @@ -689,7 +689,7 @@ } static int -stub_check_sysv_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, +stub_sysvshm_check_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int cmd) { @@ -697,7 +697,7 @@ } static int -stub_check_sysv_shmdt(struct ucred *cred, struct shmid_kernel *shmsegptr, +stub_sysvshm_check_shmdt(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel) { @@ -706,7 +706,7 @@ static int -stub_check_sysv_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, +stub_sysvshm_check_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) { @@ -714,35 +714,35 @@ } static int -stub_check_kenv_dump(struct ucred *cred) +stub_kenv_check_dump(struct ucred *cred) { return (0); } static int -stub_check_kenv_get(struct ucred *cred, char *name) +stub_kenv_check_get(struct ucred *cred, char *name) { return (0); } static int -stub_check_kenv_set(struct ucred *cred, char *name, char *value) +stub_kenv_check_set(struct ucred *cred, char *name, char *value) { return (0); } static int -stub_check_kenv_unset(struct ucred *cred, char *name) +stub_kenv_check_unset(struct ucred *cred, char *name) { return (0); } static int -stub_check_kld_load(struct ucred *cred, struct vnode *vp, +stub_kld_check_load(struct ucred *cred, struct vnode *vp, struct label *vlabel) { @@ -750,21 +750,21 @@ } static int -stub_check_kld_stat(struct ucred *cred) +stub_kld_check_stat(struct ucred *cred) { return (0); } static int -stub_check_kld_unload(struct ucred *cred) +stub_kld_check_unload(struct ucred *cred) { return (0); } static int -stub_check_mount_stat(struct ucred *cred, struct mount *mp, +stub_mount_check_stat(struct ucred *cred, struct mount *mp, struct label *mntlabel) { @@ -772,7 +772,7 @@ } static int -stub_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp, +stub_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) { @@ -780,7 +780,7 @@ } static int -stub_check_pipe_poll(struct ucred *cred, struct pipepair *pp, +stub_pipe_check_poll(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { @@ -788,7 +788,7 @@ } static int -stub_check_pipe_read(struct ucred *cred, struct pipepair *pp, +stub_pipe_check_read(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { @@ -796,7 +796,7 @@ } static int -stub_check_pipe_relabel(struct ucred *cred, struct pipepair *pp, +stub_pipe_check_relabel(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel) { @@ -804,7 +804,7 @@ } static int -stub_check_pipe_stat(struct ucred *cred, struct pipepair *pp, +stub_pipe_check_stat(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { @@ -812,7 +812,7 @@ } static int -stub_check_pipe_write(struct ucred *cred, struct pipepair *pp, +stub_pipe_check_write(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { @@ -820,7 +820,7 @@ } static int -stub_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr, +stub_posix_sem_check_destroy(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { @@ -828,7 +828,7 @@ } static int -stub_check_posix_sem_getvalue(struct ucred *cred, struct ksem *ksemptr, +stub_posix_sem_check_getvalue(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { @@ -836,7 +836,7 @@ } static int -stub_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr, +stub_posix_sem_check_open(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { @@ -844,7 +844,7 @@ } static int -stub_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr, +stub_posix_sem_check_post(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { @@ -852,7 +852,7 @@ } static int -stub_check_posix_sem_unlink(struct ucred *cred, struct ksem *ksemptr, +stub_posix_sem_check_unlink(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { @@ -860,7 +860,7 @@ } static int -stub_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr, +stub_posix_sem_check_wait(struct ucred *cred, struct ksem *ksemptr, struct label *ks_label) { @@ -868,63 +868,63 @@ } static int -stub_check_proc_debug(struct ucred *cred, struct proc *proc) +stub_proc_check_debug(struct ucred *cred, struct proc *proc) { return (0); } static int -stub_check_proc_sched(struct ucred *cred, struct proc *proc) +stub_proc_check_sched(struct ucred *cred, struct proc *proc) { return (0); } static int -stub_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) +stub_proc_check_signal(struct ucred *cred, struct proc *proc, int signum) { return (0); } static int -stub_check_proc_wait(struct ucred *cred, struct proc *proc) +stub_proc_check_wait(struct ucred *cred, struct proc *proc) { return (0); } static int -stub_check_proc_setuid(struct ucred *cred, uid_t uid) +stub_proc_check_setuid(struct ucred *cred, uid_t uid) { return (0); } static int -stub_check_proc_seteuid(struct ucred *cred, uid_t euid) +stub_proc_check_seteuid(struct ucred *cred, uid_t euid) { return (0); } static int -stub_check_proc_setgid(struct ucred *cred, gid_t gid) +stub_proc_check_setgid(struct ucred *cred, gid_t gid) { return (0); } static int -stub_check_proc_setegid(struct ucred *cred, gid_t egid) +stub_proc_check_setegid(struct ucred *cred, gid_t egid) { return (0); } static int -stub_check_proc_setgroups(struct ucred *cred, int ngroups, +stub_proc_check_setgroups(struct ucred *cred, int ngroups, gid_t *gidset) { @@ -932,21 +932,21 @@ } static int -stub_check_proc_setreuid(struct ucred *cred, uid_t ruid, uid_t euid) +stub_proc_check_setreuid(struct ucred *cred, uid_t ruid, uid_t euid) { return (0); } static int -stub_check_proc_setregid(struct ucred *cred, gid_t rgid, gid_t egid) +stub_proc_check_setregid(struct ucred *cred, gid_t rgid, gid_t egid) { return (0); } static int -stub_check_proc_setresuid(struct ucred *cred, uid_t ruid, uid_t euid, +stub_proc_check_setresuid(struct ucred *cred, uid_t ruid, uid_t euid, uid_t suid) { @@ -954,7 +954,7 @@ } static int -stub_check_proc_setresgid(struct ucred *cred, gid_t rgid, gid_t egid, +stub_proc_check_setresgid(struct ucred *cred, gid_t rgid, gid_t egid, gid_t sgid) { @@ -962,7 +962,7 @@ } static int -stub_check_socket_accept(struct ucred *cred, struct socket *socket, +stub_socket_check_accept(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -970,7 +970,7 @@ } static int -stub_check_socket_bind(struct ucred *cred, struct socket *socket, +stub_socket_check_bind(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -978,7 +978,7 @@ } static int -stub_check_socket_connect(struct ucred *cred, struct socket *socket, +stub_socket_check_connect(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -986,7 +986,7 @@ } static int -stub_check_socket_create(struct ucred *cred, int domain, int type, +stub_socket_check_create(struct ucred *cred, int domain, int type, int protocol) { @@ -994,7 +994,7 @@ } static int -stub_check_socket_deliver(struct socket *so, struct label *socketlabel, +stub_socket_check_deliver(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { @@ -1002,7 +1002,7 @@ } static int -stub_check_socket_listen(struct ucred *cred, struct socket *so, +stub_socket_check_listen(struct ucred *cred, struct socket *so, struct label *socketlabel) { @@ -1010,7 +1010,7 @@ } static int -stub_check_socket_poll(struct ucred *cred, struct socket *so, +stub_socket_check_poll(struct ucred *cred, struct socket *so, struct label *socketlabel) { @@ -1018,7 +1018,7 @@ } static int -stub_check_socket_receive(struct ucred *cred, struct socket *so, +stub_socket_check_receive(struct ucred *cred, struct socket *so, struct label *socketlabel) { @@ -1026,14 +1026,14 @@ } static int -stub_check_socket_relabel(struct ucred *cred, struct socket *socket, +stub_socket_check_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { return (0); } static int -stub_check_socket_send(struct ucred *cred, struct socket *so, +stub_socket_check_send(struct ucred *cred, struct socket *so, struct label *socketlabel) { @@ -1041,7 +1041,7 @@ } static int -stub_check_socket_stat(struct ucred *cred, struct socket *so, +stub_socket_check_stat(struct ucred *cred, struct socket *so, struct label *socketlabel) { @@ -1049,7 +1049,7 @@ } static int -stub_check_socket_visible(struct ucred *cred, struct socket *socket, +stub_socket_check_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:20:45 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B7E316A516 for ; Sat, 8 Jul 2006 13:20:45 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F8D543D64 for ; Sat, 8 Jul 2006 13:20:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8914046D45 for ; Sat, 8 Jul 2006 09:20:41 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8DC3855487; Sat, 8 Jul 2006 13:20:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 86ECC16A4E6; Sat, 8 Jul 2006 13:20:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C70C16A4E2 for ; Sat, 8 Jul 2006 13:20:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9F9E43D5F for ; Sat, 8 Jul 2006 13:20:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68DKQSC017625 for ; Sat, 8 Jul 2006 13:20:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68DKQZB017621 for perforce@freebsd.org; Sat, 8 Jul 2006 13:20:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:20:26 GMT Message-Id: <200607081320.k68DKQZB017621@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 100997 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:20:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=100997 Change 100997 by rwatson@rwatson_zoo on 2006/07/08 13:20:05 Rename policy calls. Remove fs_label. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_test/mac_test.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_test/mac_test.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 McAfee, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -10,6 +11,9 @@ * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -46,7 +50,7 @@ #include #include #include -#include +#include #include #include #include @@ -182,9 +186,6 @@ static int init_count_mount; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_mount, CTLFLAG_RD, &init_count_mount, 0, "mount init calls"); -static int init_count_mount_fslabel; -SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_mount_fslabel, CTLFLAG_RD, - &init_count_mount_fslabel, 0, "mount_fslabel init calls"); static int init_count_socket; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_socket, CTLFLAG_RD, &init_count_socket, 0, "socket init calls"); @@ -241,10 +242,6 @@ static int destroy_count_mount; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_mount, CTLFLAG_RD, &destroy_count_mount, 0, "mount destroy calls"); -static int destroy_count_mount_fslabel; -SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_mount_fslabel, - CTLFLAG_RD, &destroy_count_mount_fslabel, 0, - "mount_fslabel destroy calls"); static int destroy_count_socket; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_socket, CTLFLAG_RD, &destroy_count_socket, 0, "socket destroy calls"); @@ -282,13 +279,13 @@ * Policy module operations. */ static void -mac_test_destroy(struct mac_policy_conf *conf) +mac_test_policy_destroy(struct mac_policy_conf *conf) { } static void -mac_test_init(struct mac_policy_conf *conf) +mac_test_policy_init(struct mac_policy_conf *conf) { } @@ -413,14 +410,6 @@ atomic_add_int(&init_count_mount, 1); } -static void -mac_test_init_mount_fs_label(struct label *label) -{ - - SLOT(label) = MOUNTMAGIC; - atomic_add_int(&init_count_mount_fslabel, 1); -} - static int mac_test_init_socket_label(struct label *label, int flag) { @@ -660,20 +649,6 @@ } static void -mac_test_destroy_mount_fs_label(struct label *label) -{ - - if ((SLOT(label) == MOUNTMAGIC || SLOT(label) == 0)) { - atomic_add_int(&destroy_count_mount_fslabel, 1); - SLOT(label) = EXMAGIC; - } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_mount_fslabel: dup destroy"); - } else { - DEBUGGER("mac_test_destroy_mount_fslabel: corrupted label"); - } -} - -static void mac_test_destroy_socket_label(struct label *label) { @@ -836,32 +811,32 @@ * a lot like file system objects. */ static void -mac_test_associate_vnode_devfs(struct mount *mp, struct label *fslabel, +mac_test_associate_vnode_devfs(struct mount *mp, struct label *mntlabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel) { - ASSERT_MOUNT_LABEL(fslabel); + ASSERT_MOUNT_LABEL(mntlabel); ASSERT_DEVFS_LABEL(delabel); ASSERT_VNODE_LABEL(vlabel); } static int -mac_test_associate_vnode_extattr(struct mount *mp, struct label *fslabel, +mac_test_associate_vnode_extattr(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { - ASSERT_MOUNT_LABEL(fslabel); + ASSERT_MOUNT_LABEL(mntlabel); ASSERT_VNODE_LABEL(vlabel); return (0); } static void mac_test_associate_vnode_singlelabel(struct mount *mp, - struct label *fslabel, struct vnode *vp, struct label *vlabel) + struct label *mntlabel, struct vnode *vp, struct label *vlabel) { - ASSERT_MOUNT_LABEL(fslabel); + ASSERT_MOUNT_LABEL(mntlabel); ASSERT_VNODE_LABEL(vlabel); } @@ -897,12 +872,12 @@ static int mac_test_create_vnode_extattr(struct ucred *cred, struct mount *mp, - struct label *fslabel, struct vnode *dvp, struct label *dlabel, + struct label *mntlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp) { ASSERT_CRED_LABEL(cred->cr_label); - ASSERT_MOUNT_LABEL(fslabel); + ASSERT_MOUNT_LABEL(mntlabel); ASSERT_VNODE_LABEL(dlabel); return (0); @@ -910,12 +885,11 @@ static void mac_test_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) + struct label *mntlabel) { ASSERT_CRED_LABEL(cred->cr_label); ASSERT_MOUNT_LABEL(mntlabel); - ASSERT_MOUNT_LABEL(fslabel); } static void @@ -2411,7 +2385,6 @@ .mpo_init_ipq_label = mac_test_init_ipq_label, .mpo_init_mbuf_label = mac_test_init_mbuf_label, .mpo_init_mount_label = mac_test_init_mount_label, - .mpo_init_mount_fs_label = mac_test_init_mount_fs_label, .mpo_init_pipe_label = mac_test_init_pipe_label, .mpo_init_posix_sem_label = mac_test_init_posix_sem_label, .mpo_init_proc_label = mac_test_init_proc_label, @@ -2431,7 +2404,6 @@ .mpo_destroy_ipq_label = mac_test_destroy_ipq_label, .mpo_destroy_mbuf_label = mac_test_destroy_mbuf_label, .mpo_destroy_mount_label = mac_test_destroy_mount_label, - .mpo_destroy_mount_fs_label = mac_test_destroy_mount_fs_label, .mpo_destroy_pipe_label = mac_test_destroy_pipe_label, .mpo_destroy_posix_sem_label = mac_test_destroy_posix_sem_label, .mpo_destroy_proc_label = mac_test_destroy_proc_label, From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:22:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD07516A4E9 for ; Sat, 8 Jul 2006 13:22:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A85443D58 for ; Sat, 8 Jul 2006 13:22:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 45AA646D4E for ; Sat, 8 Jul 2006 09:22:42 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id EB7EF55A2D; Sat, 8 Jul 2006 13:22:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E4FE216A4E2; Sat, 8 Jul 2006 13:22:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 901F616A4DF for ; Sat, 8 Jul 2006 13:22:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0C1B43D6A for ; Sat, 8 Jul 2006 13:22: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.6/8.13.6) with ESMTP id k68DMTlj018949 for ; Sat, 8 Jul 2006 13:22:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68DMTgb018940 for perforce@freebsd.org; Sat, 8 Jul 2006 13:22:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:22:29 GMT Message-Id: <200607081322.k68DMTgb018940@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 100998 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:22:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=100998 Change 100998 by rwatson@rwatson_zoo on 2006/07/08 13:21:51 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_test/mac_test.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_test/mac_test.c#3 (text+ko) ==== @@ -301,7 +301,7 @@ * Label operations. */ static void -mac_test_init_bpfdesc_label(struct label *label) +mac_test_bpfdesc_init_label(struct label *label) { SLOT(label) = BPFMAGIC; @@ -309,7 +309,7 @@ } static void -mac_test_init_cred_label(struct label *label) +mac_test_cred_init_label(struct label *label) { SLOT(label) = CREDMAGIC; @@ -317,7 +317,7 @@ } static void -mac_test_init_devfsdirent_label(struct label *label) +mac_test_devfs_init_label(struct label *label) { SLOT(label) = DEVFSMAGIC; @@ -325,7 +325,7 @@ } static void -mac_test_init_ifnet_label(struct label *label) +mac_test_ifnet_init_label(struct label *label) { SLOT(label) = IFNETMAGIC; @@ -333,12 +333,12 @@ } static int -mac_test_init_inpcb_label(struct label *label, int flag) +mac_test_inpcb_init_label(struct label *label, int flag) { if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "mac_test_init_inpcb_label() at %s:%d", __FILE__, + "mac_test_inpcb_init_label() at %s:%d", __FILE__, __LINE__); SLOT(label) = INPCBMAGIC; @@ -347,40 +347,40 @@ } static void -mac_test_init_sysv_msgmsg_label(struct label *label) +mac_test_sysvmsg_init_label(struct label *label) { SLOT(label) = SYSVIPCMSGMAGIC; atomic_add_int(&init_count_sysv_msg, 1); } static void -mac_test_init_sysv_msgqueue_label(struct label *label) +mac_test_sysvmsq_init_label(struct label *label) { SLOT(label) = SYSVIPCMSQMAGIC; atomic_add_int(&init_count_sysv_msq, 1); } static void -mac_test_init_sysv_sem_label(struct label *label) +mac_test_sysvsem_init_label(struct label *label) { SLOT(label) = SYSVIPCSEMMAGIC; atomic_add_int(&init_count_sysv_sem, 1); } static void -mac_test_init_sysv_shm_label(struct label *label) +mac_test_sysvshm_init_label(struct label *label) { SLOT(label) = SYSVIPCSHMMAGIC; atomic_add_int(&init_count_sysv_shm, 1); } static int -mac_test_init_ipq_label(struct label *label, int flag) +mac_test_ipq_init_label(struct label *label, int flag) { if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "mac_test_init_ipq_label() at %s:%d", __FILE__, + "mac_test_ipq_init_label() at %s:%d", __FILE__, __LINE__); SLOT(label) = IPQMAGIC; @@ -389,12 +389,12 @@ } static int -mac_test_init_mbuf_label(struct label *label, int flag) +mac_test_mbuf_init_label(struct label *label, int flag) { if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "mac_test_init_mbuf_label() at %s:%d", __FILE__, + "mac_test_mbuf_init_label() at %s:%d", __FILE__, __LINE__); SLOT(label) = MBUFMAGIC; @@ -403,7 +403,7 @@ } static void -mac_test_init_mount_label(struct label *label) +mac_test_mount_init_label(struct label *label) { SLOT(label) = MOUNTMAGIC; @@ -411,12 +411,12 @@ } static int -mac_test_init_socket_label(struct label *label, int flag) +mac_test_socket_init_label(struct label *label, int flag) { if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "mac_test_init_socket_label() at %s:%d", __FILE__, + "mac_test_socket_init_label() at %s:%d", __FILE__, __LINE__); SLOT(label) = SOCKETMAGIC; @@ -425,12 +425,12 @@ } static int -mac_test_init_socket_peer_label(struct label *label, int flag) +mac_test_socket_peer_init_label(struct label *label, int flag) { if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "mac_test_init_socket_peer_label() at %s:%d", __FILE__, + "mac_test_socket_peer_init_label() at %s:%d", __FILE__, __LINE__); SLOT(label) = SOCKETMAGIC; @@ -439,7 +439,7 @@ } static void -mac_test_init_pipe_label(struct label *label) +mac_test_pipe_init_label(struct label *label) { SLOT(label) = PIPEMAGIC; @@ -447,7 +447,7 @@ } static void -mac_test_init_posix_sem_label(struct label *label) +mac_test_posix_sem_init_label(struct label *label) { SLOT(label) = POSIXSEMMAGIC; @@ -455,7 +455,7 @@ } static void -mac_test_init_proc_label(struct label *label) +mac_test_proc_init_label(struct label *label) { SLOT(label) = PROCMAGIC; @@ -463,7 +463,7 @@ } static void -mac_test_init_vnode_label(struct label *label) +mac_test_vnode_init_label(struct label *label) { SLOT(label) = VNODEMAGIC; @@ -471,149 +471,149 @@ } static void -mac_test_destroy_bpfdesc_label(struct label *label) +mac_test_bpfdesc_destroy_label(struct label *label) { if (SLOT(label) == BPFMAGIC || SLOT(label) == 0) { atomic_add_int(&destroy_count_bpfdesc, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_bpfdesc: dup destroy"); + DEBUGGER("mac_test_bpfdesc_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_bpfdesc: corrupted label"); + DEBUGGER("mac_test_bpfdesc_destroy: corrupted label"); } } static void -mac_test_destroy_cred_label(struct label *label) +mac_test_cred_destroy_label(struct label *label) { if (SLOT(label) == CREDMAGIC || SLOT(label) == 0) { atomic_add_int(&destroy_count_cred, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_cred: dup destroy"); + DEBUGGER("mac_test_cred_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_cred: corrupted label"); + DEBUGGER("mac_test_cred_destroy: corrupted label"); } } static void -mac_test_destroy_devfsdirent_label(struct label *label) +mac_test_devfs_destroy_label(struct label *label) { if (SLOT(label) == DEVFSMAGIC || SLOT(label) == 0) { atomic_add_int(&destroy_count_devfsdirent, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_devfsdirent: dup destroy"); + DEBUGGER("mac_test_devfs_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_devfsdirent: corrupted label"); + DEBUGGER("mac_test_devfs_destroy: corrupted label"); } } static void -mac_test_destroy_ifnet_label(struct label *label) +mac_test_ifnet_destroy_label(struct label *label) { if (SLOT(label) == IFNETMAGIC || SLOT(label) == 0) { atomic_add_int(&destroy_count_ifnet, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_ifnet: dup destroy"); + DEBUGGER("mac_test_ifnet_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_ifnet: corrupted label"); + DEBUGGER("mac_test_ifnet_destroy: corrupted label"); } } static void -mac_test_destroy_inpcb_label(struct label *label) +mac_test_inpcb_destroy_label(struct label *label) { if (SLOT(label) == INPCBMAGIC || SLOT(label) == 0) { atomic_add_int(&destroy_count_inpcb, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_inpcb: dup destroy"); + DEBUGGER("mac_test_inpcb_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_inpcb: corrupted label"); + DEBUGGER("mac_test_inpcb_destroy: corrupted label"); } } static void -mac_test_destroy_sysv_msgmsg_label(struct label *label) +mac_test_sysvmsg_destroy_label(struct label *label) { if (SLOT(label) == SYSVIPCMSGMAGIC || SLOT(label) == 0) { atomic_add_int(&destroy_count_sysv_msg, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_sysv_msgmsg_label: dup destroy"); + DEBUGGER("mac_test_sysvmsg_destroy_label: dup destroy"); } else { DEBUGGER( - "mac_test_destroy_sysv_msgmsg_label: corrupted label"); + "mac_test_sysvmsg_destroy_label: corrupted label"); } } static void -mac_test_destroy_sysv_msgqueue_label(struct label *label) +mac_test_sysvmsq_destroy_label(struct label *label) { if (SLOT(label) == SYSVIPCMSQMAGIC || SLOT(label) == 0) { atomic_add_int(&destroy_count_sysv_msq, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_sysv_msgqueue_label: dup destroy"); + DEBUGGER("mac_test_sysvmsq_destroy_label: dup destroy"); } else { DEBUGGER( - "mac_test_destroy_sysv_msgqueue_label: corrupted label"); + "mac_test_sysvmsq_destroy_label: corrupted label"); } } static void -mac_test_destroy_sysv_sem_label(struct label *label) +mac_test_sysvsem_destroy_label(struct label *label) { if (SLOT(label) == SYSVIPCSEMMAGIC || SLOT(label) == 0) { atomic_add_int(&destroy_count_sysv_sem, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_sysv_sem_label: dup destroy"); + DEBUGGER("mac_test_sysvsem_destroy_label: dup destroy"); } else { - DEBUGGER("mac_test_destroy_sysv_sem_label: corrupted label"); + DEBUGGER("mac_test_sysvsem_destroy_label: corrupted label"); } } static void -mac_test_destroy_sysv_shm_label(struct label *label) +mac_test_sysvshm_destroy_label(struct label *label) { if (SLOT(label) == SYSVIPCSHMMAGIC || SLOT(label) == 0) { atomic_add_int(&destroy_count_sysv_shm, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_sysv_shm_label: dup destroy"); + DEBUGGER("mac_test_sysvshm_destroy_label: dup destroy"); } else { - DEBUGGER("mac_test_destroy_sysv_shm_label: corrupted label"); + DEBUGGER("mac_test_sysvshm_destroy_label: corrupted label"); } } static void -mac_test_destroy_ipq_label(struct label *label) +mac_test_ipq_destroy_label(struct label *label) { if (SLOT(label) == IPQMAGIC || SLOT(label) == 0) { atomic_add_int(&destroy_count_ipq, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_ipq: dup destroy"); + DEBUGGER("mac_test_ipq_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_ipq: corrupted label"); + DEBUGGER("mac_test_ipq_destroy: corrupted label"); } } static void -mac_test_destroy_mbuf_label(struct label *label) +mac_test_mbuf_destroy_label(struct label *label) { /* @@ -628,112 +628,112 @@ atomic_add_int(&destroy_count_mbuf, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_mbuf: dup destroy"); + DEBUGGER("mac_test_mbuf_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_mbuf: corrupted label"); + DEBUGGER("mac_test_mbuf_destroy: corrupted label"); } } static void -mac_test_destroy_mount_label(struct label *label) +mac_test_mount_destroy_label(struct label *label) { if ((SLOT(label) == MOUNTMAGIC || SLOT(label) == 0)) { atomic_add_int(&destroy_count_mount, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_mount: dup destroy"); + DEBUGGER("mac_test_mount_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_mount: corrupted label"); + DEBUGGER("mac_test_mount_destroy: corrupted label"); } } static void -mac_test_destroy_socket_label(struct label *label) +mac_test_socket_destroy_label(struct label *label) { if ((SLOT(label) == SOCKETMAGIC || SLOT(label) == 0)) { atomic_add_int(&destroy_count_socket, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_socket: dup destroy"); + DEBUGGER("mac_test_socket_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_socket: corrupted label"); + DEBUGGER("mac_test_socket_destroy: corrupted label"); } } static void -mac_test_destroy_socket_peer_label(struct label *label) +mac_test_socket_peer_destroy_label(struct label *label) { if ((SLOT(label) == SOCKETMAGIC || SLOT(label) == 0)) { atomic_add_int(&destroy_count_socket_peerlabel, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_socket_peerlabel: dup destroy"); + DEBUGGER("mac_test_socket_peer_destroylabel: dup destroy"); } else { - DEBUGGER("mac_test_destroy_socket_peerlabel: corrupted label"); + DEBUGGER("mac_test_socket_peer_destroylabel: corrupted label"); } } static void -mac_test_destroy_pipe_label(struct label *label) +mac_test_pipe_destroy_label(struct label *label) { if ((SLOT(label) == PIPEMAGIC || SLOT(label) == 0)) { atomic_add_int(&destroy_count_pipe, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_pipe: dup destroy"); + DEBUGGER("mac_test_pipe_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_pipe: corrupted label"); + DEBUGGER("mac_test_pipe_destroy: corrupted label"); } } static void -mac_test_destroy_posix_sem_label(struct label *label) +mac_test_posix_sem_destroy_label(struct label *label) { if ((SLOT(label) == POSIXSEMMAGIC || SLOT(label) == 0)) { atomic_add_int(&destroy_count_posixsems, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_posix_sem: dup destroy"); + DEBUGGER("mac_test_posix_sem_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_posix_sem: corrupted label"); + DEBUGGER("mac_test_posix_sem_destroy: corrupted label"); } } static void -mac_test_destroy_proc_label(struct label *label) +mac_test_proc_destroy_label(struct label *label) { if ((SLOT(label) == PROCMAGIC || SLOT(label) == 0)) { atomic_add_int(&destroy_count_proc, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_proc: dup destroy"); + DEBUGGER("mac_test_proc_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_proc: corrupted label"); + DEBUGGER("mac_test_proc_destroy: corrupted label"); } } static void -mac_test_destroy_vnode_label(struct label *label) +mac_test_vnode_destroy_label(struct label *label) { if (SLOT(label) == VNODEMAGIC || SLOT(label) == 0) { atomic_add_int(&destroy_count_vnode, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - DEBUGGER("mac_test_destroy_vnode: dup destroy"); + DEBUGGER("mac_test_vnode_destroy: dup destroy"); } else { - DEBUGGER("mac_test_destroy_vnode: corrupted label"); + DEBUGGER("mac_test_vnode_destroy: corrupted label"); } } static void -mac_test_copy_cred_label(struct label *src, struct label *dest) +mac_test_cred_copy_label(struct label *src, struct label *dest) { ASSERT_CRED_LABEL(src); @@ -741,7 +741,7 @@ } static void -mac_test_copy_ifnet_label(struct label *src, struct label *dest) +mac_test_ifnet_copy_label(struct label *src, struct label *dest) { ASSERT_IFNET_LABEL(src); @@ -749,7 +749,7 @@ } static void -mac_test_copy_mbuf_label(struct label *src, struct label *dest) +mac_test_mbuf_copy_label(struct label *src, struct label *dest) { ASSERT_MBUF_LABEL(src); @@ -757,7 +757,7 @@ } static void -mac_test_copy_pipe_label(struct label *src, struct label *dest) +mac_test_pipe_copy_label(struct label *src, struct label *dest) { ASSERT_PIPE_LABEL(src); @@ -765,7 +765,7 @@ } static void -mac_test_copy_socket_label(struct label *src, struct label *dest) +mac_test_socket_copy_label(struct label *src, struct label *dest) { ASSERT_SOCKET_LABEL(src); @@ -773,7 +773,7 @@ } static void -mac_test_copy_vnode_label(struct label *src, struct label *dest) +mac_test_vnode_copy_label(struct label *src, struct label *dest) { ASSERT_VNODE_LABEL(src); @@ -811,7 +811,7 @@ * a lot like file system objects. */ static void -mac_test_associate_vnode_devfs(struct mount *mp, struct label *mntlabel, +mac_test_devfs_vnode_associate(struct mount *mp, struct label *mntlabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel) { @@ -822,7 +822,7 @@ } static int -mac_test_associate_vnode_extattr(struct mount *mp, struct label *mntlabel, +mac_test_vnode_associate_extattr(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { @@ -832,7 +832,7 @@ } static void -mac_test_associate_vnode_singlelabel(struct mount *mp, +mac_test_vnode_associate_singlelabel(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { @@ -841,7 +841,7 @@ } static void -mac_test_create_devfs_device(struct ucred *cred, struct mount *mp, +mac_test_devfs_create_device(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *devfs_dirent, struct label *label) { @@ -852,7 +852,7 @@ } static void -mac_test_create_devfs_directory(struct mount *mp, char *dirname, +mac_test_devfs_create_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label) { @@ -860,7 +860,7 @@ } static void -mac_test_create_devfs_symlink(struct ucred *cred, struct mount *mp, +mac_test_devfs_create_symlink(struct ucred *cred, struct mount *mp, struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) { @@ -871,7 +871,7 @@ } static int -mac_test_create_vnode_extattr(struct ucred *cred, struct mount *mp, +mac_test_vnode_create_extattr(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp) { @@ -884,7 +884,7 @@ } static void -mac_test_create_mount(struct ucred *cred, struct mount *mp, +mac_test_mount_create(struct ucred *cred, struct mount *mp, struct label *mntlabel) { @@ -893,7 +893,7 @@ } static void -mac_test_relabel_vnode(struct ucred *cred, struct vnode *vp, +mac_test_vnode_relabel(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label) { @@ -903,7 +903,7 @@ } static int -mac_test_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, +mac_test_vnode_setlabel_extattr(struct ucred *cred, struct vnode *vp, struct label *vlabel, struct label *intlabel) { @@ -914,7 +914,7 @@ } static void -mac_test_update_devfsdirent(struct mount *mp, +mac_test_devfs_update(struct mount *mp, struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { @@ -927,7 +927,7 @@ * Labeling event operations: IPC object. */ static void -mac_test_create_mbuf_from_socket(struct socket *so, struct label *socketlabel, +mac_test_socket_create_mbuf(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { @@ -936,7 +936,7 @@ } static void -mac_test_create_socket(struct ucred *cred, struct socket *socket, +mac_test_socket_create(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -945,7 +945,7 @@ } static void -mac_test_create_pipe(struct ucred *cred, struct pipepair *pp, +mac_test_pipe_create(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { @@ -954,7 +954,7 @@ } static void -mac_test_create_posix_sem(struct ucred *cred, struct ksem *ksem, +mac_test_posix_sem_create(struct ucred *cred, struct ksem *ksem, struct label *posixlabel) { @@ -963,7 +963,7 @@ } static void -mac_test_create_socket_from_socket(struct socket *oldsocket, +mac_test_socket_accept(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) { @@ -973,7 +973,7 @@ } static void -mac_test_relabel_socket(struct ucred *cred, struct socket *socket, +mac_test_socket_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { @@ -982,7 +982,7 @@ } static void -mac_test_relabel_pipe(struct ucred *cred, struct pipepair *pp, +mac_test_pipe_relabel(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel) { @@ -992,7 +992,7 @@ } static void -mac_test_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, +mac_test_socket_peer_set_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, struct socket *socket, struct label *socketpeerlabel) { @@ -1004,7 +1004,7 @@ * Labeling event operations: network objects. */ static void -mac_test_set_socket_peer_from_socket(struct socket *oldsocket, +mac_test_socket_peer_set_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketpeerlabel) { @@ -1014,7 +1014,7 @@ } static void -mac_test_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d, +mac_test_bpfdesc_create(struct ucred *cred, struct bpf_d *bpf_d, struct label *bpflabel) { @@ -1023,7 +1023,7 @@ } static void -mac_test_create_datagram_from_ipq(struct ipq *ipq, struct label *ipqlabel, +mac_test_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel, struct mbuf *datagram, struct label *datagramlabel) { @@ -1032,7 +1032,7 @@ } static void -mac_test_create_fragment(struct mbuf *datagram, struct label *datagramlabel, +mac_test_netinet_fragment(struct mbuf *datagram, struct label *datagramlabel, struct mbuf *fragment, struct label *fragmentlabel) { @@ -1041,14 +1041,14 @@ } static void -mac_test_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) +mac_test_ifnet_create(struct ifnet *ifnet, struct label *ifnetlabel) { ASSERT_IFNET_LABEL(ifnetlabel); } static void -mac_test_create_inpcb_from_socket(struct socket *so, struct label *solabel, +mac_test_inpcb_create(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel) { @@ -1057,7 +1057,7 @@ } static void -mac_test_create_sysv_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_test_sysvmsg_create(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel) { @@ -1066,7 +1066,7 @@ } static void -mac_test_create_sysv_msgqueue(struct ucred *cred, +mac_test_sysvmsq_create(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel) { @@ -1074,7 +1074,7 @@ } static void -mac_test_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr, +mac_test_sysvsem_create(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel) { @@ -1082,7 +1082,7 @@ } static void -mac_test_create_sysv_shm(struct ucred *cred, struct shmid_kernel *shmsegptr, +mac_test_sysvshm_create(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmlabel) { @@ -1090,7 +1090,7 @@ } static void -mac_test_create_ipq(struct mbuf *fragment, struct label *fragmentlabel, +mac_test_ipq_create(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { @@ -1099,7 +1099,7 @@ } static void -mac_test_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel, +mac_test_inpcb_create_mbuf(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel) { @@ -1108,7 +1108,7 @@ } static void -mac_test_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, +mac_test_mbuf_create_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { @@ -1117,7 +1117,7 @@ } static void -mac_test_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct label *bpflabel, +mac_test_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct label *bpflabel, struct mbuf *mbuf, struct label *mbuflabel) { @@ -1126,7 +1126,7 @@ } static void -mac_test_create_mbuf_from_ifnet(struct ifnet *ifnet, struct label *ifnetlabel, +mac_test_ifnet_create_mbuf(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) { @@ -1135,7 +1135,7 @@ } static void -mac_test_create_mbuf_multicast_encap(struct mbuf *oldmbuf, +mac_test_mbuf_create_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -1146,7 +1146,7 @@ } static void -mac_test_create_mbuf_netlayer(struct mbuf *oldmbuf, +mac_test_mbuf_create_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -1156,7 +1156,7 @@ } static int -mac_test_fragment_match(struct mbuf *fragment, struct label *fragmentlabel, +mac_test_ipq_match(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { @@ -1167,21 +1167,21 @@ } static void -mac_test_reflect_mbuf_icmp(struct mbuf *m, struct label *mlabel) +mac_test_netinet_icmp_reply(struct mbuf *m, struct label *mlabel) { ASSERT_MBUF_LABEL(mlabel); } static void -mac_test_reflect_mbuf_tcp(struct mbuf *m, struct label *mlabel) +mac_test_netinet_tcp_reply(struct mbuf *m, struct label *mlabel) { ASSERT_MBUF_LABEL(mlabel); } static void -mac_test_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, +mac_test_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) { @@ -1191,7 +1191,7 @@ } static void -mac_test_update_ipq(struct mbuf *fragment, struct label *fragmentlabel, +mac_test_ipq_update(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { @@ -1212,7 +1212,7 @@ * Labeling event operations: processes. */ static void -mac_test_execve_transition(struct ucred *old, struct ucred *new, +mac_test_vnode_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *filelabel, struct label *interpvnodelabel, struct image_params *imgp, struct label *execlabel) @@ -1230,7 +1230,7 @@ } static int -mac_test_execve_will_transition(struct ucred *old, struct vnode *vp, +mac_test_vnode_execve_will_transition(struct ucred *old, struct vnode *vp, struct label *filelabel, struct label *interpvnodelabel, struct image_params *imgp, struct label *execlabel) { @@ -1248,21 +1248,21 @@ } static void -mac_test_create_proc0(struct ucred *cred) +mac_test_proc_create_swapper(struct ucred *cred) { ASSERT_CRED_LABEL(cred->cr_label); } static void -mac_test_create_proc1(struct ucred *cred) +mac_test_proc_create_init(struct ucred *cred) { ASSERT_CRED_LABEL(cred->cr_label); } static void -mac_test_relabel_cred(struct ucred *cred, struct label *newlabel) +mac_test_cred_relabel(struct ucred *cred, struct label *newlabel) { ASSERT_CRED_LABEL(cred->cr_label); @@ -1281,28 +1281,28 @@ * Label cleanup/flush operations */ static void -mac_test_cleanup_sysv_msgmsg(struct label *msglabel) +mac_test_sysvmsg_cleanup(struct label *msglabel) { ASSERT_SYSVIPCMSG_LABEL(msglabel); } static void -mac_test_cleanup_sysv_msgqueue(struct label *msqlabel) +mac_test_sysvmsq_cleanup(struct label *msqlabel) { ASSERT_SYSVIPCMSQ_LABEL(msqlabel); } static void -mac_test_cleanup_sysv_sem(struct label *semalabel) +mac_test_sysvsem_cleanup(struct label *semalabel) { ASSERT_SYSVIPCSEM_LABEL(semalabel); } static void >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:23:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7520C16A4EC for ; Sat, 8 Jul 2006 13:23:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FEB743D4C for ; Sat, 8 Jul 2006 13:23:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 18C1946D45 for ; Sat, 8 Jul 2006 09:23:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1AB165594A; Sat, 8 Jul 2006 13:23:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1427916A4DF; Sat, 8 Jul 2006 13:23:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE86716A4DD for ; Sat, 8 Jul 2006 13:23:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAF1743D5A for ; Sat, 8 Jul 2006 13:23:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68DNVNF019606 for ; Sat, 8 Jul 2006 13:23:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68DNVr6019600 for perforce@freebsd.org; Sat, 8 Jul 2006 13:23:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:23:31 GMT Message-Id: <200607081323.k68DNVr6019600@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 100999 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:23:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=100999 Change 100999 by rwatson@rwatson_zoo on 2006/07/08 13:23:30 Rename policy entry points. Remove fs_label. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_lomac/mac_lomac.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_lomac/mac_lomac.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -10,6 +11,9 @@ * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -604,7 +608,7 @@ * Policy module operations. */ static void -mac_lomac_init(struct mac_policy_conf *conf) +mac_lomac_policy_init(struct mac_policy_conf *conf) { } @@ -948,15 +952,13 @@ static void mac_lomac_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) + struct label *mntlabel) { struct mac_lomac *source, *dest; source = SLOT(cred->cr_label); dest = SLOT(mntlabel); mac_lomac_copy_single(source, dest); - dest = SLOT(fslabel); - mac_lomac_copy_single(source, dest); } static void @@ -985,7 +987,7 @@ } static void -mac_lomac_associate_vnode_devfs(struct mount *mp, struct label *fslabel, +mac_lomac_associate_vnode_devfs(struct mount *mp, struct label *mntlabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel) { @@ -998,13 +1000,13 @@ } static int -mac_lomac_associate_vnode_extattr(struct mount *mp, struct label *fslabel, +mac_lomac_associate_vnode_extattr(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { struct mac_lomac temp, *source, *dest; int buflen, error; - source = SLOT(fslabel); + source = SLOT(mntlabel); dest = SLOT(vlabel); buflen = sizeof(temp); @@ -1013,7 +1015,7 @@ error = vn_extattr_get(vp, IO_NODELOCKED, MAC_LOMAC_EXTATTR_NAMESPACE, MAC_LOMAC_EXTATTR_NAME, &buflen, (char *)&temp, curthread); if (error == ENOATTR || error == EOPNOTSUPP) { - /* Fall back to the fslabel. */ + /* Fall back to the mntlabel. */ mac_lomac_copy_single(source, dest); return (0); } else if (error) @@ -1046,11 +1048,11 @@ static void mac_lomac_associate_vnode_singlelabel(struct mount *mp, - struct label *fslabel, struct vnode *vp, struct label *vlabel) + struct label *mntlabel, struct vnode *vp, struct label *vlabel) { struct mac_lomac *source, *dest; - source = SLOT(fslabel); + source = SLOT(mntlabel); dest = SLOT(vlabel); mac_lomac_copy_single(source, dest); @@ -1058,7 +1060,7 @@ static int mac_lomac_create_vnode_extattr(struct ucred *cred, struct mount *mp, - struct label *fslabel, struct vnode *dvp, struct label *dlabel, + struct label *mntlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp) { struct mac_lomac *source, *dest, *dir, temp; @@ -2555,7 +2557,7 @@ static struct mac_policy_ops mac_lomac_ops = { - .mpo_init = mac_lomac_init, + .mpo_policy_init = mac_lomac_policy_init, .mpo_init_bpfdesc_label = mac_lomac_init_label, .mpo_init_cred_label = mac_lomac_init_label, .mpo_init_devfsdirent_label = mac_lomac_init_label, @@ -2564,7 +2566,6 @@ .mpo_init_ipq_label = mac_lomac_init_label_waitcheck, .mpo_init_mbuf_label = mac_lomac_init_label_waitcheck, .mpo_init_mount_label = mac_lomac_init_label, - .mpo_init_mount_fs_label = mac_lomac_init_label, .mpo_init_pipe_label = mac_lomac_init_label, .mpo_init_proc_label = mac_lomac_init_proc_label, .mpo_init_socket_label = mac_lomac_init_label_waitcheck, @@ -2578,7 +2579,6 @@ .mpo_destroy_ipq_label = mac_lomac_destroy_label, .mpo_destroy_mbuf_label = mac_lomac_destroy_label, .mpo_destroy_mount_label = mac_lomac_destroy_label, - .mpo_destroy_mount_fs_label = mac_lomac_destroy_label, .mpo_destroy_pipe_label = mac_lomac_destroy_label, .mpo_destroy_proc_label = mac_lomac_destroy_proc_label, .mpo_destroy_socket_label = mac_lomac_destroy_label, From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:25:41 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7EEB16A51A for ; Sat, 8 Jul 2006 13:25:41 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5014943D46 for ; Sat, 8 Jul 2006 13:25:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 640E046D38 for ; Sat, 8 Jul 2006 09:25:40 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9128A558D3; Sat, 8 Jul 2006 13:25:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AAB616A4E7; Sat, 8 Jul 2006 13:25:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 641A416A4E5 for ; Sat, 8 Jul 2006 13:25:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48E9A43D66 for ; Sat, 8 Jul 2006 13:25: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.6/8.13.6) with ESMTP id k68DPac7020849 for ; Sat, 8 Jul 2006 13:25:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68DPZ3b020844 for perforce@freebsd.org; Sat, 8 Jul 2006 13:25:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:25:35 GMT Message-Id: <200607081325.k68DPZ3b020844@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 101001 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:25:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=101001 Change 101001 by rwatson@rwatson_zoo on 2006/07/08 13:25:30 Add regular expressions to rename policy entry points, and some notes on renaming that requires some hand attention. Affected files ... .. //depot/projects/trustedbsd/mac2/mac2_notes.txt#4 edit Differences ... ==== //depot/projects/trustedbsd/mac2/mac2_notes.txt#4 (text+ko) ==== @@ -66,3 +66,163 @@ - Move from just init/destroy to also attach/detach methods for the policy, so that memory allocation can be performed without the mac policy lock held. + +Rename expressions for policies: + +Delete references to mount fslabel by removing init, destroy methods, +removing argument and assignment from mount_create, other references +are a search and replace of fslabel with mntlabel. + +Rename policy init and destroy methods, no easy search/replace for this. + +:%s/init_bpfdesc/bpfdesc_init/g +:%s/init_cred/cred_init/g +:%s/init_devfsdirent/devfs_init/g +:%s/init_ifnet/ifnet_init/g +:%s/init_inpcb/inpcb_init/g +:%s/init_ipq/ipq_init/g +:%s/init_mbuf/mbuf_init/g +:%s/init_mount/mount_init/g +:%s/init_pipe/pipe_init/g +:%s/init_posix_sem/posix_sem_init/g +:%s/init_proc/proc_init/g +:%s/init_socket_peer/socket_peer_init/g +:%s/init_socket/socket_init/g +:%s/init_sysv_msgmsg/sysvmsg_init/g +:%s/init_sysv_msgqueue/sysvmsq_init/g +:%s/init_sysv_sem/sysvsem_init/g +:%s/init_sysv_shm/sysvshm_init/g +:%s/init_vnode/vnode_init/g + +:%s/destroy_bpfdesc/bpfdesc_destroy/g +:%s/destroy_cred/cred_destroy/g +:%s/destroy_devfsdirent/devfs_destroy/g +:%s/destroy_ifnet/ifnet_destroy/g +:%s/destroy_inpcb/inpcb_destroy/g +:%s/destroy_ipq/ipq_destroy/g +:%s/destroy_mbuf/mbuf_destroy/g +:%s/destroy_mount/mount_destroy/g +:%s/destroy_pipe/pipe_destroy/g +:%s/destroy_posix_sem/posix_sem_destroy/g +:%s/destroy_proc/proc_destroy/g +:%s/destroy_socket_peer/socket_peer_destroy/g +:%s/destroy_socket/socket_destroy/g +:%s/destroy_sysv_msgmsg/sysvmsg_destroy/g +:%s/destroy_sysv_msgqueue/sysvmsq_destroy/g +:%s/destroy_sysv_sem/sysvsem_destroy/g +:%s/destroy_sysv_shm/sysvshm_destroy/g +:%s/destroy_vnode/vnode_destroy/g + +:%s/cleanup_sysv_msgmsg/sysvmsg_cleanup/g +:%s/cleanup_sysv_msgqueue/sysvmsq_cleanup/g +:%s/cleanup_sysv_sem/sysvsem_cleanup/g +:%s/cleanup_sysv_shm/sysvshm_cleanup/g + +:%s/copy_cred/cred_copy/g +:%s/copy_ifnet/ifnet_copy/g +:%s/copy_mbuf/mbuf_copy/g +:%s/copy_pipe/pipe_copy/g +:%s/copy_socket/socket_copy/g +:%s/copy_vnode/vnode_copy/g + +:%s/check_bpfdesc/bpfdesc_check/g +:%s/check_cred/cred_check/g +:%s/check_devfsdirent/devfs_check/g +:%s/check_ifnet/ifnet_check/g +:%s/check_inpcb/inpcb_check/g +:%s/check_ipq/ipq_check/g +:%s/check_kenv/kenv_check/g +:%s/check_kld/kld_check/g +:%s/check_mbuf/mbuf_check/g +:%s/check_mount/mount_check/g +:%s/check_pipe/pipe_check/g +:%s/check_posix_sem/posix_sem_check/g +:%s/check_proc/proc_check/g +:%s/check_socket/socket_check/g +:%s/check_system/system_check/g +:%s/check_vnode/vnode_check/g + +:%s/externalize_cred/cred_externalize/g +:%s/externalize_ifnet/ifnet_externalize/g +:%s/externalize_pipe/pipe_externalize/g +:%s/externalize_socket_peer/socket_peer_externalize/g +:%s/externalize_socket/socket_externalize/g +:%s/externalize_vnode/vnode_externalize/g +:%s/internalize_cred/cred_internalize/g +:%s/internalize_ifnet/ifnet_internalize/g +:%s/internalize_pipe/pipe_internalize/g +:%s/internalize_socket/socket_internalize/g +:%s/internalize_vnode/vnode_internalize/g + +:%s/associate_vnode/vnode_associate/g +:%s/vnode_associate_devfs/devfs_vnode_associate/g +:%s/create_devfs/devfs_create/g +:%s/relabel_vnode/vnode_relabel/g +:%s/create_vnode/vnode_create/g +:%s/create_mount/mount_create/g +:%s/setlabel_vnode/vnode_setlabel/g +:%s/update_devfsdirent/devfs_update/g + +:%s/relabel_pipe/pipe_relabel/g +:%s/create_bpfdesc/bpfdesc_create/g +:%s/create_datagram_from_ipq/ipq_reassemble/g +:%s/set_socket_peer_from_mbuf/socket_peer_set_from_mbuf/g +:%s/set_socket_peer_from_socket/socket_peer_set_from_socket/g +:%s/create_fragment/netinet_fragment/g +:%s/create_ifnet/ifnet_create/g +:%s/create_inpcb_from_socket/inpcb_create/g +:%s/create_ipq/ipq_create/g +:%s/create_pipe/pipe_create/g +:%s/relabel_pipe/pipe_relabel/g +:%s/create_posix_sem/posix_sem_create/g + +:%s/create_mbuf_from_inpcb/inpcb_create_mbuf/g +:%s/create_mbuf_linklayer/mbuf_create_linklayer/g +:%s/create_mbuf_from_bpfdesc/bpfdesc_create_mbuf/g +:%s/create_mbuf_from_ifnet/ifnet_create_mbuf/g +:%s/create_mbuf_from_socket/socket_create_mbuf/g +:%s/create_mbuf_multicast_encap/mbuf_create_multicast_encap/g +:%s/create_mbuf_netlayer/mbuf_create_netlayer/g +:%s/fragment_match/ipq_match/g +:%s/relabel_ifnet/ifnet_relabel/g +:%s/update_ipq/ipq_update/g +:%s/create_proc0/proc_create_swapper/g +:%s/create_proc1/proc_create_init/g +:%s/relabel_cred/cred_relabel/g +:%s/relabel_socket/socket_relabel/g +:%s/create_socket_from_socket/socket_accept/g +:%s/create_socket/socket_create/g + +:%s/vnode_check_delete(/vnode_check_unlink(/g +:%s/vnode_check_delete,/vnode_check_unlink,/g +:%s/vnode_check_delete /vnode_check_unlink /g + +:%s/create_sysv_msgmsg/sysvmsg_create/g +:%s/create_sysv_msgqueue/sysvmsq_create/g +:%s/create_sysv_sem/sysvsem_create/g +:%s/create_sysv_shm/sysvshm_create/g + +:%s/check_sysv_msgrcv/sysvmsq_check_msgrcv/g +:%s/check_sysv_msgrmid/sysvmsq_check_msgrmid/g +:%s/check_sysv_msqget/sysvmsq_check_msqget/g +:%s/check_sysv_msqsnd/sysvmsq_check_msqsnd/g +:%s/check_sysv_msqrcv/sysvmsq_check_msqrcv/g +:%s/check_sysv_msqctl/sysvmsq_check_msqctl/g +:%s/check_sysv_msgmsq/sysvmsq_check_msgmsq/g + +:%s/check_sysv_semctl/sysvsem_check_semctl/g +:%s/check_sysv_semget/sysvsem_check_semget/g +:%s/check_sysv_semop/sysvsem_check_semop/g +:%s/check_sysv_shmat/sysvshm_check_shmat/g +:%s/check_sysv_shmctl/sysvshm_check_shmctl/g +:%s/check_sysv_shmget/sysvshm_check_shmget/g +:%s/check_sysv_shmdt/sysvshm_check_shmdt/g + +:%s/reflect_mbuf_icmp/netinet_icmp_reply/g +:%s/reflect_mbuf_tcp/netinet_tcp_reply/g + +:%s/execve_transition/vnode_execve_transition/g +:%s/execve_will_transition/vnode_execve_will_transition/g + +:%s/check_sysarch_ioperm/system_check_ioperm/g + From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:25:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A49C416A4DA for ; Sat, 8 Jul 2006 13:25:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 45B9843D45 for ; Sat, 8 Jul 2006 13:25:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3B1D646D4E for ; Sat, 8 Jul 2006 09:25:51 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A4941569F2; Sat, 8 Jul 2006 13:25:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AF37816A560; Sat, 8 Jul 2006 13:25:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88F1216A4DD for ; Sat, 8 Jul 2006 13:25:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F0A543D5A for ; Sat, 8 Jul 2006 13:25:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68DPZXb020841 for ; Sat, 8 Jul 2006 13:25:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68DPZxY020837 for perforce@freebsd.org; Sat, 8 Jul 2006 13:25:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:25:35 GMT Message-Id: <200607081325.k68DPZxY020837@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 101000 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:25:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=101000 Change 101000 by rwatson@rwatson_zoo on 2006/07/08 13:24:40 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_lomac/mac_lomac.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_lomac/mac_lomac.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include @@ -635,7 +635,7 @@ } static void -mac_lomac_init_proc_label(struct label *label) +mac_lomac_proc_init_label(struct label *label) { PSLOT_SET(label, malloc(sizeof(struct mac_lomac_proc), M_MACLOMAC, @@ -652,7 +652,7 @@ } static void -mac_lomac_destroy_proc_label(struct label *label) +mac_lomac_proc_destroy_label(struct label *label) { mtx_destroy(&PSLOT(label)->mtx); @@ -905,7 +905,7 @@ * a lot like file system objects. */ static void -mac_lomac_create_devfs_device(struct ucred *cred, struct mount *mp, +mac_lomac_devfs_create_device(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_lomac *mac_lomac; @@ -928,7 +928,7 @@ } static void -mac_lomac_create_devfs_directory(struct mount *mp, char *dirname, +mac_lomac_devfs_create_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_lomac *mac_lomac; @@ -938,7 +938,7 @@ } static void -mac_lomac_create_devfs_symlink(struct ucred *cred, struct mount *mp, +mac_lomac_devfs_create_symlink(struct ucred *cred, struct mount *mp, struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) { @@ -951,7 +951,7 @@ } static void -mac_lomac_create_mount(struct ucred *cred, struct mount *mp, +mac_lomac_mount_create(struct ucred *cred, struct mount *mp, struct label *mntlabel) { struct mac_lomac *source, *dest; @@ -962,7 +962,7 @@ } static void -mac_lomac_relabel_vnode(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_relabel(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label) { struct mac_lomac *source, *dest; @@ -974,7 +974,7 @@ } static void -mac_lomac_update_devfsdirent(struct mount *mp, +mac_lomac_devfs_update(struct mount *mp, struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { @@ -987,7 +987,7 @@ } static void -mac_lomac_associate_vnode_devfs(struct mount *mp, struct label *mntlabel, +mac_lomac_devfs_vnode_associate(struct mount *mp, struct label *mntlabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel) { @@ -1000,7 +1000,7 @@ } static int -mac_lomac_associate_vnode_extattr(struct mount *mp, struct label *mntlabel, +mac_lomac_vnode_associate_extattr(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { struct mac_lomac temp, *source, *dest; @@ -1023,7 +1023,7 @@ if (buflen != sizeof(temp)) { if (buflen != sizeof(temp) - sizeof(temp.ml_auxsingle)) { - printf("mac_lomac_associate_vnode_extattr: bad size %d\n", + printf("mac_lomac_vnode_associate_extattr: bad size %d\n", buflen); return (EPERM); } @@ -1034,11 +1034,11 @@ buflen, (char *)&temp, curthread); } if (mac_lomac_valid(&temp) != 0) { - printf("mac_lomac_associate_vnode_extattr: invalid\n"); + printf("mac_lomac_vnode_associate_extattr: invalid\n"); return (EPERM); } if ((temp.ml_flags & MAC_LOMAC_FLAGS_BOTH) != MAC_LOMAC_FLAG_SINGLE) { - printf("mac_lomac_associate_vnode_extattr: not single\n"); + printf("mac_lomac_vnode_associate_extattr: not single\n"); return (EPERM); } @@ -1047,7 +1047,7 @@ } static void -mac_lomac_associate_vnode_singlelabel(struct mount *mp, +mac_lomac_vnode_associate_singlelabel(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { struct mac_lomac *source, *dest; @@ -1059,7 +1059,7 @@ } static int -mac_lomac_create_vnode_extattr(struct ucred *cred, struct mount *mp, +mac_lomac_vnode_create_extattr(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp) { @@ -1089,7 +1089,7 @@ } static int -mac_lomac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_setlabel_extattr(struct ucred *cred, struct vnode *vp, struct label *vlabel, struct label *intlabel) { struct mac_lomac *source, temp; @@ -1113,7 +1113,7 @@ * Labeling event operations: IPC object. */ static void -mac_lomac_create_inpcb_from_socket(struct socket *so, struct label *solabel, +mac_lomac_inpcb_create(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel) { struct mac_lomac *source, *dest; @@ -1125,7 +1125,7 @@ } static void -mac_lomac_create_mbuf_from_socket(struct socket *so, struct label *socketlabel, +mac_lomac_socket_create_mbuf(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_lomac *source, *dest; @@ -1137,7 +1137,7 @@ } static void -mac_lomac_create_socket(struct ucred *cred, struct socket *socket, +mac_lomac_socket_create(struct ucred *cred, struct socket *socket, struct label *socketlabel) { struct mac_lomac *source, *dest; @@ -1149,7 +1149,7 @@ } static void -mac_lomac_create_pipe(struct ucred *cred, struct pipepair *pp, +mac_lomac_pipe_create(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_lomac *source, *dest; @@ -1161,7 +1161,7 @@ } static void -mac_lomac_create_socket_from_socket(struct socket *oldsocket, +mac_lomac_socket_accept(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) { @@ -1174,7 +1174,7 @@ } static void -mac_lomac_relabel_socket(struct ucred *cred, struct socket *socket, +mac_lomac_socket_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { struct mac_lomac *source, *dest; @@ -1186,7 +1186,7 @@ } static void -mac_lomac_relabel_pipe(struct ucred *cred, struct pipepair *pp, +mac_lomac_pipe_relabel(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel) { struct mac_lomac *source, *dest; @@ -1198,7 +1198,7 @@ } static void -mac_lomac_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, +mac_lomac_socket_peer_set_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, struct socket *socket, struct label *socketpeerlabel) { struct mac_lomac *source, *dest; @@ -1213,7 +1213,7 @@ * Labeling event operations: network objects. */ static void -mac_lomac_set_socket_peer_from_socket(struct socket *oldsocket, +mac_lomac_socket_peer_set_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketpeerlabel) { @@ -1226,7 +1226,7 @@ } static void -mac_lomac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d, +mac_lomac_bpfdesc_create(struct ucred *cred, struct bpf_d *bpf_d, struct label *bpflabel) { struct mac_lomac *source, *dest; @@ -1238,7 +1238,7 @@ } static void -mac_lomac_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) +mac_lomac_ifnet_create(struct ifnet *ifnet, struct label *ifnetlabel) { char tifname[IFNAMSIZ], *p, *q; char tiflist[sizeof(trusted_interfaces)]; @@ -1296,7 +1296,7 @@ } static void -mac_lomac_create_ipq(struct mbuf *fragment, struct label *fragmentlabel, +mac_lomac_ipq_create(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { struct mac_lomac *source, *dest; @@ -1308,7 +1308,7 @@ } static void -mac_lomac_create_datagram_from_ipq(struct ipq *ipq, struct label *ipqlabel, +mac_lomac_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel, struct mbuf *datagram, struct label *datagramlabel) { struct mac_lomac *source, *dest; @@ -1321,7 +1321,7 @@ } static void -mac_lomac_create_fragment(struct mbuf *datagram, struct label *datagramlabel, +mac_lomac_netinet_fragment(struct mbuf *datagram, struct label *datagramlabel, struct mbuf *fragment, struct label *fragmentlabel) { struct mac_lomac *source, *dest; @@ -1333,7 +1333,7 @@ } static void -mac_lomac_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel, +mac_lomac_inpcb_create_mbuf(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel) { struct mac_lomac *source, *dest; @@ -1345,7 +1345,7 @@ } static void -mac_lomac_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, +mac_lomac_mbuf_create_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { struct mac_lomac *dest; @@ -1356,7 +1356,7 @@ } static void -mac_lomac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct label *bpflabel, +mac_lomac_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct label *bpflabel, struct mbuf *mbuf, struct label *mbuflabel) { struct mac_lomac *source, *dest; @@ -1368,7 +1368,7 @@ } static void -mac_lomac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct label *ifnetlabel, +mac_lomac_ifnet_create_mbuf(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_lomac *source, *dest; @@ -1380,7 +1380,7 @@ } static void -mac_lomac_create_mbuf_multicast_encap(struct mbuf *oldmbuf, +mac_lomac_mbuf_create_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -1393,7 +1393,7 @@ } static void -mac_lomac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, +mac_lomac_mbuf_create_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) { struct mac_lomac *source, *dest; @@ -1405,7 +1405,7 @@ } static int -mac_lomac_fragment_match(struct mbuf *fragment, struct label *fragmentlabel, +mac_lomac_ipq_match(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { struct mac_lomac *a, *b; @@ -1417,7 +1417,7 @@ } static void -mac_lomac_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, +mac_lomac_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) { struct mac_lomac *source, *dest; @@ -1429,7 +1429,7 @@ } static void -mac_lomac_update_ipq(struct mbuf *fragment, struct label *fragmentlabel, +mac_lomac_ipq_update(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { @@ -1452,7 +1452,7 @@ * Labeling event operations: processes. */ static void -mac_lomac_execve_transition(struct ucred *old, struct ucred *new, +mac_lomac_vnode_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, struct image_params *imgp, struct label *execlabel) @@ -1489,7 +1489,7 @@ } static int -mac_lomac_execve_will_transition(struct ucred *old, struct vnode *vp, +mac_lomac_vnode_execve_will_transition(struct ucred *old, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, struct image_params *imgp, struct label *execlabel) { @@ -1509,7 +1509,7 @@ } static void -mac_lomac_create_proc0(struct ucred *cred) +mac_lomac_proc_create_swapper(struct ucred *cred) { struct mac_lomac *dest; @@ -1521,7 +1521,7 @@ } static void -mac_lomac_create_proc1(struct ucred *cred) +mac_lomac_proc_create_init(struct ucred *cred) { struct mac_lomac *dest; @@ -1533,7 +1533,7 @@ } static void -mac_lomac_relabel_cred(struct ucred *cred, struct label *newlabel) +mac_lomac_cred_relabel(struct ucred *cred, struct label *newlabel) { struct mac_lomac *source, *dest; @@ -1547,7 +1547,7 @@ * Access control checks. */ static int -mac_lomac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, +mac_lomac_bpfdesc_check_receive(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel) { struct mac_lomac *a, *b; @@ -1564,7 +1564,7 @@ } static int -mac_lomac_check_cred_relabel(struct ucred *cred, struct label *newlabel) +mac_lomac_cred_check_relabel(struct ucred *cred, struct label *newlabel) { struct mac_lomac *subj, *new; int error; @@ -1630,7 +1630,7 @@ } static int -mac_lomac_check_cred_visible(struct ucred *u1, struct ucred *u2) +mac_lomac_cred_check_visible(struct ucred *u1, struct ucred *u2) { struct mac_lomac *subj, *obj; @@ -1648,7 +1648,7 @@ } static int -mac_lomac_check_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, +mac_lomac_ifnet_check_relabel(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) { struct mac_lomac *subj, *new; @@ -1703,7 +1703,7 @@ } static int -mac_lomac_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, +mac_lomac_ifnet_check_transmit(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_lomac *p, *i; @@ -1718,7 +1718,7 @@ } static int -mac_lomac_check_inpcb_deliver(struct inpcb *inp, struct label *inplabel, +mac_lomac_inpcb_check_deliver(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel) { struct mac_lomac *p, *i; @@ -1733,7 +1733,7 @@ } static int -mac_lomac_check_kld_load(struct ucred *cred, struct vnode *vp, +mac_lomac_kld_check_load(struct ucred *cred, struct vnode *vp, struct label *label) { struct mac_lomac *subj, *obj; @@ -1754,7 +1754,7 @@ } static int -mac_lomac_check_kld_unload(struct ucred *cred) +mac_lomac_kld_check_unload(struct ucred *cred) { struct mac_lomac *subj; @@ -1770,7 +1770,7 @@ } static int -mac_lomac_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp, +mac_lomac_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) { @@ -1783,7 +1783,7 @@ } static int -mac_lomac_check_pipe_read(struct ucred *cred, struct pipepair *pp, +mac_lomac_pipe_check_read(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_lomac *subj, *obj; @@ -1801,7 +1801,7 @@ } static int -mac_lomac_check_pipe_relabel(struct ucred *cred, struct pipepair *pp, +mac_lomac_pipe_check_relabel(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel) { struct mac_lomac *subj, *obj, *new; @@ -1852,7 +1852,7 @@ } static int -mac_lomac_check_pipe_write(struct ucred *cred, struct pipepair *pp, +mac_lomac_pipe_check_write(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { struct mac_lomac *subj, *obj; @@ -1870,7 +1870,7 @@ } static int -mac_lomac_check_proc_debug(struct ucred *cred, struct proc *proc) +mac_lomac_proc_check_debug(struct ucred *cred, struct proc *proc) { struct mac_lomac *subj, *obj; @@ -1890,7 +1890,7 @@ } static int -mac_lomac_check_proc_sched(struct ucred *cred, struct proc *proc) +mac_lomac_proc_check_sched(struct ucred *cred, struct proc *proc) { struct mac_lomac *subj, *obj; @@ -1910,7 +1910,7 @@ } static int -mac_lomac_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) +mac_lomac_proc_check_signal(struct ucred *cred, struct proc *proc, int signum) { struct mac_lomac *subj, *obj; @@ -1930,7 +1930,7 @@ } static int -mac_lomac_check_socket_deliver(struct socket *so, struct label *socketlabel, +mac_lomac_socket_check_deliver(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_lomac *p, *s; @@ -1945,7 +1945,7 @@ } static int -mac_lomac_check_socket_relabel(struct ucred *cred, struct socket *socket, +mac_lomac_socket_check_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { struct mac_lomac *subj, *obj, *new; @@ -1996,7 +1996,7 @@ } static int -mac_lomac_check_socket_visible(struct ucred *cred, struct socket *socket, +mac_lomac_socket_check_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { struct mac_lomac *subj, *obj; @@ -2014,7 +2014,7 @@ } static int -mac_lomac_check_system_swapon(struct ucred *cred, struct vnode *vp, +mac_lomac_system_check_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { struct mac_lomac *subj, *obj; @@ -2035,7 +2035,7 @@ } static int -mac_lomac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, +mac_lomac_system_check_sysctl(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req) { struct mac_lomac *subj; @@ -2063,7 +2063,7 @@ } static int -mac_lomac_check_vnode_create(struct ucred *cred, struct vnode *dvp, +mac_lomac_vnode_check_create(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp, struct vattr *vap) { struct mac_lomac *subj, *obj; @@ -2084,7 +2084,7 @@ } static int -mac_lomac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, +mac_lomac_vnode_check_unlink(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { @@ -2108,7 +2108,7 @@ } static int -mac_lomac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { struct mac_lomac *subj, *obj; @@ -2126,7 +2126,7 @@ } static int -mac_lomac_check_vnode_link(struct ucred *cred, struct vnode *dvp, +mac_lomac_vnode_check_link(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { @@ -2150,7 +2150,7 @@ } static int -mac_lomac_check_vnode_mmap(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_mmap(struct ucred *cred, struct vnode *vp, struct label *label, int prot, int flags) { struct mac_lomac *subj, *obj; @@ -2178,7 +2178,7 @@ } static void -mac_lomac_check_vnode_mmap_downgrade(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_mmap_downgrade(struct ucred *cred, struct vnode *vp, struct label *label, /* XXX vm_prot_t */ int *prot) { struct mac_lomac *subj, *obj; @@ -2198,7 +2198,7 @@ } static int -mac_lomac_check_vnode_open(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_open(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, int acc_mode) { struct mac_lomac *subj, *obj; @@ -2219,7 +2219,7 @@ } static int -mac_lomac_check_vnode_read(struct ucred *active_cred, struct ucred *file_cred, +mac_lomac_vnode_check_read(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { struct mac_lomac *subj, *obj; @@ -2237,7 +2237,7 @@ } static int -mac_lomac_check_vnode_relabel(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_relabel(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *newlabel) { struct mac_lomac *old, *new, *subj; @@ -2313,7 +2313,7 @@ } static int -mac_lomac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, +mac_lomac_vnode_check_rename_from(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { @@ -2337,7 +2337,7 @@ } static int -mac_lomac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, +mac_lomac_vnode_check_rename_to(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, int samedir, struct componentname *cnp) { @@ -2363,7 +2363,7 @@ } static int -mac_lomac_check_vnode_revoke(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_revoke(struct ucred *cred, struct vnode *vp, struct label *label) { struct mac_lomac *subj, *obj; @@ -2381,7 +2381,7 @@ } static int -mac_lomac_check_vnode_setacl(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_setacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl) { struct mac_lomac *subj, *obj; @@ -2399,7 +2399,7 @@ } static int -mac_lomac_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_setextattr(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, int attrnamespace, const char *name, struct uio *uio) { @@ -2420,7 +2420,7 @@ } static int -mac_lomac_check_vnode_setflags(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_setflags(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, u_long flags) { struct mac_lomac *subj, *obj; @@ -2438,7 +2438,7 @@ } static int -mac_lomac_check_vnode_setmode(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_setmode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, mode_t mode) { struct mac_lomac *subj, *obj; @@ -2456,7 +2456,7 @@ } static int -mac_lomac_check_vnode_setowner(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_setowner(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, uid_t uid, gid_t gid) { struct mac_lomac *subj, *obj; @@ -2474,7 +2474,7 @@ } static int -mac_lomac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, +mac_lomac_vnode_check_setutimes(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct timespec atime, struct timespec mtime) { struct mac_lomac *subj, *obj; @@ -2492,7 +2492,7 @@ } static int -mac_lomac_check_vnode_write(struct ucred *active_cred, +mac_lomac_vnode_check_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { struct mac_lomac *subj, *obj; @@ -2558,132 +2558,132 @@ static struct mac_policy_ops mac_lomac_ops = { .mpo_policy_init = mac_lomac_policy_init, - .mpo_init_bpfdesc_label = mac_lomac_init_label, - .mpo_init_cred_label = mac_lomac_init_label, - .mpo_init_devfsdirent_label = mac_lomac_init_label, - .mpo_init_ifnet_label = mac_lomac_init_label, - .mpo_init_inpcb_label = mac_lomac_init_label_waitcheck, - .mpo_init_ipq_label = mac_lomac_init_label_waitcheck, - .mpo_init_mbuf_label = mac_lomac_init_label_waitcheck, - .mpo_init_mount_label = mac_lomac_init_label, - .mpo_init_pipe_label = mac_lomac_init_label, - .mpo_init_proc_label = mac_lomac_init_proc_label, - .mpo_init_socket_label = mac_lomac_init_label_waitcheck, - .mpo_init_socket_peer_label = mac_lomac_init_label_waitcheck, - .mpo_init_vnode_label = mac_lomac_init_label, - .mpo_destroy_bpfdesc_label = mac_lomac_destroy_label, - .mpo_destroy_cred_label = mac_lomac_destroy_label, - .mpo_destroy_devfsdirent_label = mac_lomac_destroy_label, - .mpo_destroy_ifnet_label = mac_lomac_destroy_label, - .mpo_destroy_inpcb_label = mac_lomac_destroy_label, - .mpo_destroy_ipq_label = mac_lomac_destroy_label, - .mpo_destroy_mbuf_label = mac_lomac_destroy_label, - .mpo_destroy_mount_label = mac_lomac_destroy_label, - .mpo_destroy_pipe_label = mac_lomac_destroy_label, - .mpo_destroy_proc_label = mac_lomac_destroy_proc_label, - .mpo_destroy_socket_label = mac_lomac_destroy_label, - .mpo_destroy_socket_peer_label = mac_lomac_destroy_label, - .mpo_destroy_vnode_label = mac_lomac_destroy_label, - .mpo_copy_cred_label = mac_lomac_copy_label, - .mpo_copy_ifnet_label = mac_lomac_copy_label, - .mpo_copy_mbuf_label = mac_lomac_copy_label, - .mpo_copy_pipe_label = mac_lomac_copy_label, - .mpo_copy_socket_label = mac_lomac_copy_label, - .mpo_copy_vnode_label = mac_lomac_copy_label, - .mpo_externalize_cred_label = mac_lomac_externalize_label, - .mpo_externalize_ifnet_label = mac_lomac_externalize_label, - .mpo_externalize_pipe_label = mac_lomac_externalize_label, - .mpo_externalize_socket_label = mac_lomac_externalize_label, - .mpo_externalize_socket_peer_label = mac_lomac_externalize_label, - .mpo_externalize_vnode_label = mac_lomac_externalize_label, - .mpo_internalize_cred_label = mac_lomac_internalize_label, - .mpo_internalize_ifnet_label = mac_lomac_internalize_label, - .mpo_internalize_pipe_label = mac_lomac_internalize_label, - .mpo_internalize_socket_label = mac_lomac_internalize_label, - .mpo_internalize_vnode_label = mac_lomac_internalize_label, - .mpo_create_devfs_device = mac_lomac_create_devfs_device, - .mpo_create_devfs_directory = mac_lomac_create_devfs_directory, - .mpo_create_devfs_symlink = mac_lomac_create_devfs_symlink, - .mpo_create_mount = mac_lomac_create_mount, - .mpo_relabel_vnode = mac_lomac_relabel_vnode, - .mpo_update_devfsdirent = mac_lomac_update_devfsdirent, - .mpo_associate_vnode_devfs = mac_lomac_associate_vnode_devfs, - .mpo_associate_vnode_extattr = mac_lomac_associate_vnode_extattr, - .mpo_associate_vnode_singlelabel = - mac_lomac_associate_vnode_singlelabel, - .mpo_create_vnode_extattr = mac_lomac_create_vnode_extattr, - .mpo_setlabel_vnode_extattr = mac_lomac_setlabel_vnode_extattr, - .mpo_create_mbuf_from_socket = mac_lomac_create_mbuf_from_socket, - .mpo_create_pipe = mac_lomac_create_pipe, - .mpo_create_socket = mac_lomac_create_socket, - .mpo_create_socket_from_socket = mac_lomac_create_socket_from_socket, - .mpo_relabel_pipe = mac_lomac_relabel_pipe, - .mpo_relabel_socket = mac_lomac_relabel_socket, - .mpo_set_socket_peer_from_mbuf = mac_lomac_set_socket_peer_from_mbuf, - .mpo_set_socket_peer_from_socket = - mac_lomac_set_socket_peer_from_socket, - .mpo_create_bpfdesc = mac_lomac_create_bpfdesc, - .mpo_create_datagram_from_ipq = mac_lomac_create_datagram_from_ipq, - .mpo_create_fragment = mac_lomac_create_fragment, - .mpo_create_ifnet = mac_lomac_create_ifnet, - .mpo_create_inpcb_from_socket = mac_lomac_create_inpcb_from_socket, - .mpo_create_ipq = mac_lomac_create_ipq, - .mpo_create_mbuf_from_inpcb = mac_lomac_create_mbuf_from_inpcb, - .mpo_create_mbuf_linklayer = mac_lomac_create_mbuf_linklayer, - .mpo_create_mbuf_from_bpfdesc = mac_lomac_create_mbuf_from_bpfdesc, - .mpo_create_mbuf_from_ifnet = mac_lomac_create_mbuf_from_ifnet, - .mpo_create_mbuf_multicast_encap = - mac_lomac_create_mbuf_multicast_encap, - .mpo_create_mbuf_netlayer = mac_lomac_create_mbuf_netlayer, - .mpo_fragment_match = mac_lomac_fragment_match, - .mpo_relabel_ifnet = mac_lomac_relabel_ifnet, - .mpo_update_ipq = mac_lomac_update_ipq, + .mpo_bpfdesc_init_label = mac_lomac_init_label, + .mpo_cred_init_label = mac_lomac_init_label, + .mpo_devfs_init_label = mac_lomac_init_label, + .mpo_ifnet_init_label = mac_lomac_init_label, + .mpo_inpcb_init_label = mac_lomac_init_label_waitcheck, + .mpo_ipq_init_label = mac_lomac_init_label_waitcheck, + .mpo_mbuf_init_label = mac_lomac_init_label_waitcheck, + .mpo_mount_init_label = mac_lomac_init_label, + .mpo_pipe_init_label = mac_lomac_init_label, + .mpo_proc_init_label = mac_lomac_proc_init_label, + .mpo_socket_init_label = mac_lomac_init_label_waitcheck, + .mpo_socket_peer_init_label = mac_lomac_init_label_waitcheck, + .mpo_vnode_init_label = mac_lomac_init_label, + .mpo_bpfdesc_destroy_label = mac_lomac_destroy_label, + .mpo_cred_destroy_label = mac_lomac_destroy_label, + .mpo_devfs_destroy_label = mac_lomac_destroy_label, + .mpo_ifnet_destroy_label = mac_lomac_destroy_label, + .mpo_inpcb_destroy_label = mac_lomac_destroy_label, + .mpo_ipq_destroy_label = mac_lomac_destroy_label, + .mpo_mbuf_destroy_label = mac_lomac_destroy_label, + .mpo_mount_destroy_label = mac_lomac_destroy_label, + .mpo_pipe_destroy_label = mac_lomac_destroy_label, + .mpo_proc_destroy_label = mac_lomac_proc_destroy_label, + .mpo_socket_destroy_label = mac_lomac_destroy_label, + .mpo_socket_peer_destroy_label = mac_lomac_destroy_label, + .mpo_vnode_destroy_label = mac_lomac_destroy_label, + .mpo_cred_copy_label = mac_lomac_copy_label, + .mpo_ifnet_copy_label = mac_lomac_copy_label, + .mpo_mbuf_copy_label = mac_lomac_copy_label, + .mpo_pipe_copy_label = mac_lomac_copy_label, + .mpo_socket_copy_label = mac_lomac_copy_label, + .mpo_vnode_copy_label = mac_lomac_copy_label, + .mpo_cred_externalize_label = mac_lomac_externalize_label, + .mpo_ifnet_externalize_label = mac_lomac_externalize_label, + .mpo_pipe_externalize_label = mac_lomac_externalize_label, + .mpo_socket_externalize_label = mac_lomac_externalize_label, + .mpo_socket_peer_externalize_label = mac_lomac_externalize_label, + .mpo_vnode_externalize_label = mac_lomac_externalize_label, + .mpo_cred_internalize_label = mac_lomac_internalize_label, + .mpo_ifnet_internalize_label = mac_lomac_internalize_label, + .mpo_pipe_internalize_label = mac_lomac_internalize_label, + .mpo_socket_internalize_label = mac_lomac_internalize_label, + .mpo_vnode_internalize_label = mac_lomac_internalize_label, + .mpo_devfs_create_device = mac_lomac_devfs_create_device, + .mpo_devfs_create_directory = mac_lomac_devfs_create_directory, + .mpo_devfs_create_symlink = mac_lomac_devfs_create_symlink, + .mpo_mount_create = mac_lomac_mount_create, + .mpo_vnode_relabel = mac_lomac_vnode_relabel, + .mpo_devfs_update = mac_lomac_devfs_update, + .mpo_devfs_vnode_associate = mac_lomac_devfs_vnode_associate, + .mpo_vnode_associate_extattr = mac_lomac_vnode_associate_extattr, + .mpo_vnode_associate_singlelabel = + mac_lomac_vnode_associate_singlelabel, + .mpo_vnode_create_extattr = mac_lomac_vnode_create_extattr, + .mpo_vnode_setlabel_extattr = mac_lomac_vnode_setlabel_extattr, + .mpo_socket_create_mbuf = mac_lomac_socket_create_mbuf, + .mpo_pipe_create = mac_lomac_pipe_create, + .mpo_socket_create = mac_lomac_socket_create, + .mpo_socket_accept = mac_lomac_socket_accept, + .mpo_pipe_relabel = mac_lomac_pipe_relabel, + .mpo_socket_relabel = mac_lomac_socket_relabel, + .mpo_socket_peer_set_from_mbuf = mac_lomac_socket_peer_set_from_mbuf, + .mpo_socket_peer_set_from_socket = + mac_lomac_socket_peer_set_from_socket, + .mpo_bpfdesc_create = mac_lomac_bpfdesc_create, + .mpo_ipq_reassemble = mac_lomac_ipq_reassemble, + .mpo_netinet_fragment = mac_lomac_netinet_fragment, + .mpo_ifnet_create = mac_lomac_ifnet_create, + .mpo_inpcb_create = mac_lomac_inpcb_create, + .mpo_ipq_create = mac_lomac_ipq_create, + .mpo_inpcb_create_mbuf = mac_lomac_inpcb_create_mbuf, + .mpo_mbuf_create_linklayer = mac_lomac_mbuf_create_linklayer, + .mpo_bpfdesc_create_mbuf = mac_lomac_bpfdesc_create_mbuf, + .mpo_ifnet_create_mbuf = mac_lomac_ifnet_create_mbuf, + .mpo_mbuf_create_multicast_encap = + mac_lomac_mbuf_create_multicast_encap, + .mpo_mbuf_create_netlayer = mac_lomac_mbuf_create_netlayer, + .mpo_ipq_match = mac_lomac_ipq_match, + .mpo_ifnet_relabel = mac_lomac_ifnet_relabel, + .mpo_ipq_update = mac_lomac_ipq_update, .mpo_inpcb_sosetlabel = mac_lomac_inpcb_sosetlabel, - .mpo_execve_transition = mac_lomac_execve_transition, - .mpo_execve_will_transition = mac_lomac_execve_will_transition, - .mpo_create_proc0 = mac_lomac_create_proc0, - .mpo_create_proc1 = mac_lomac_create_proc1, - .mpo_relabel_cred = mac_lomac_relabel_cred, - .mpo_check_bpfdesc_receive = mac_lomac_check_bpfdesc_receive, - .mpo_check_cred_relabel = mac_lomac_check_cred_relabel, - .mpo_check_cred_visible = mac_lomac_check_cred_visible, - .mpo_check_ifnet_relabel = mac_lomac_check_ifnet_relabel, - .mpo_check_ifnet_transmit = mac_lomac_check_ifnet_transmit, - .mpo_check_inpcb_deliver = mac_lomac_check_inpcb_deliver, - .mpo_check_kld_load = mac_lomac_check_kld_load, - .mpo_check_kld_unload = mac_lomac_check_kld_unload, - .mpo_check_pipe_ioctl = mac_lomac_check_pipe_ioctl, - .mpo_check_pipe_read = mac_lomac_check_pipe_read, - .mpo_check_pipe_relabel = mac_lomac_check_pipe_relabel, - .mpo_check_pipe_write = mac_lomac_check_pipe_write, - .mpo_check_proc_debug = mac_lomac_check_proc_debug, - .mpo_check_proc_sched = mac_lomac_check_proc_sched, - .mpo_check_proc_signal = mac_lomac_check_proc_signal, - .mpo_check_socket_deliver = mac_lomac_check_socket_deliver, - .mpo_check_socket_relabel = mac_lomac_check_socket_relabel, - .mpo_check_socket_visible = mac_lomac_check_socket_visible, - .mpo_check_system_swapon = mac_lomac_check_system_swapon, - .mpo_check_system_sysctl = mac_lomac_check_system_sysctl, - .mpo_check_vnode_access = mac_lomac_check_vnode_open, - .mpo_check_vnode_create = mac_lomac_check_vnode_create, - .mpo_check_vnode_delete = mac_lomac_check_vnode_delete, - .mpo_check_vnode_deleteacl = mac_lomac_check_vnode_deleteacl, - .mpo_check_vnode_link = mac_lomac_check_vnode_link, - .mpo_check_vnode_mmap = mac_lomac_check_vnode_mmap, - .mpo_check_vnode_mmap_downgrade = mac_lomac_check_vnode_mmap_downgrade, - .mpo_check_vnode_open = mac_lomac_check_vnode_open, - .mpo_check_vnode_read = mac_lomac_check_vnode_read, - .mpo_check_vnode_relabel = mac_lomac_check_vnode_relabel, - .mpo_check_vnode_rename_from = mac_lomac_check_vnode_rename_from, - .mpo_check_vnode_rename_to = mac_lomac_check_vnode_rename_to, - .mpo_check_vnode_revoke = mac_lomac_check_vnode_revoke, - .mpo_check_vnode_setacl = mac_lomac_check_vnode_setacl, - .mpo_check_vnode_setextattr = mac_lomac_check_vnode_setextattr, - .mpo_check_vnode_setflags = mac_lomac_check_vnode_setflags, - .mpo_check_vnode_setmode = mac_lomac_check_vnode_setmode, - .mpo_check_vnode_setowner = mac_lomac_check_vnode_setowner, - .mpo_check_vnode_setutimes = mac_lomac_check_vnode_setutimes, - .mpo_check_vnode_write = mac_lomac_check_vnode_write, + .mpo_vnode_execve_transition = mac_lomac_vnode_execve_transition, + .mpo_vnode_execve_will_transition = mac_lomac_vnode_execve_will_transition, + .mpo_proc_create_swapper = mac_lomac_proc_create_swapper, + .mpo_proc_create_init = mac_lomac_proc_create_init, + .mpo_cred_relabel = mac_lomac_cred_relabel, + .mpo_bpfdesc_check_receive = mac_lomac_bpfdesc_check_receive, + .mpo_cred_check_relabel = mac_lomac_cred_check_relabel, + .mpo_cred_check_visible = mac_lomac_cred_check_visible, + .mpo_ifnet_check_relabel = mac_lomac_ifnet_check_relabel, + .mpo_ifnet_check_transmit = mac_lomac_ifnet_check_transmit, + .mpo_inpcb_check_deliver = mac_lomac_inpcb_check_deliver, + .mpo_kld_check_load = mac_lomac_kld_check_load, + .mpo_kld_check_unload = mac_lomac_kld_check_unload, + .mpo_pipe_check_ioctl = mac_lomac_pipe_check_ioctl, + .mpo_pipe_check_read = mac_lomac_pipe_check_read, + .mpo_pipe_check_relabel = mac_lomac_pipe_check_relabel, + .mpo_pipe_check_write = mac_lomac_pipe_check_write, + .mpo_proc_check_debug = mac_lomac_proc_check_debug, + .mpo_proc_check_sched = mac_lomac_proc_check_sched, + .mpo_proc_check_signal = mac_lomac_proc_check_signal, + .mpo_socket_check_deliver = mac_lomac_socket_check_deliver, + .mpo_socket_check_relabel = mac_lomac_socket_check_relabel, + .mpo_socket_check_visible = mac_lomac_socket_check_visible, + .mpo_system_check_swapon = mac_lomac_system_check_swapon, + .mpo_system_check_sysctl = mac_lomac_system_check_sysctl, + .mpo_vnode_check_access = mac_lomac_vnode_check_open, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:26:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D11E016A4EB for ; Sat, 8 Jul 2006 13:26:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91F8B43D45 for ; Sat, 8 Jul 2006 13:26:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3085346CE6 for ; Sat, 8 Jul 2006 09:26:39 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7D58E5568B; Sat, 8 Jul 2006 13:26:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 76AED16A4E1; Sat, 8 Jul 2006 13:26:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3677316A4DA for ; Sat, 8 Jul 2006 13:26:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE9E443D46 for ; Sat, 8 Jul 2006 13:26:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68DQbTc021521 for ; Sat, 8 Jul 2006 13:26:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68DQbqf021515 for perforce@freebsd.org; Sat, 8 Jul 2006 13:26:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:26:37 GMT Message-Id: <200607081326.k68DQbqf021515@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 101002 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:26:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=101002 Change 101002 by rwatson@rwatson_zoo on 2006/07/08 13:26:11 More renaming and sorting notes. Affected files ... .. //depot/projects/trustedbsd/mac2/mac2_notes.txt#5 edit Differences ... ==== //depot/projects/trustedbsd/mac2/mac2_notes.txt#5 (text+ko) ==== @@ -226,3 +226,6 @@ :%s/check_sysarch_ioperm/system_check_ioperm/g +Resort. Easy resort is just to resort vnode_check_unlink since it was +renamed from check_vnode_delete. Really, should also sort to match +object sorting in mac_policy.h. From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:27:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A80FB16A4ED for ; Sat, 8 Jul 2006 13:27:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FA5543D45 for ; Sat, 8 Jul 2006 13:27:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 00FB346D3A for ; Sat, 8 Jul 2006 09:27:41 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6AF3C556B7; Sat, 8 Jul 2006 13:27:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6485216A4E7; Sat, 8 Jul 2006 13:27:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3384E16A4DA for ; Sat, 8 Jul 2006 13:27:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAFD043D45 for ; Sat, 8 Jul 2006 13:27:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68DRdv0022177 for ; Sat, 8 Jul 2006 13:27:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68DRdEt022173 for perforce@freebsd.org; Sat, 8 Jul 2006 13:27:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:27:39 GMT Message-Id: <200607081327.k68DRdEt022173@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 101003 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:27:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=101003 Change 101003 by rwatson@rwatson_zoo on 2006/07/08 13:26:47 Resort. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/security/mac_lomac/mac_lomac.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/security/mac_lomac/mac_lomac.c#4 (text+ko) ==== @@ -2084,30 +2084,6 @@ } static int -mac_lomac_vnode_check_unlink(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label, - struct componentname *cnp) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(cred->cr_label); - obj = SLOT(dlabel); - - if (!mac_lomac_subject_dominate(subj, obj)) - return (EACCES); - - obj = SLOT(label); - - if (!mac_lomac_subject_dominate(subj, obj)) - return (EACCES); - - return (0); -} - -static int mac_lomac_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type) { @@ -2492,6 +2468,30 @@ } static int +mac_lomac_vnode_check_unlink(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) +{ + struct mac_lomac *subj, *obj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(dlabel); + + if (!mac_lomac_subject_dominate(subj, obj)) + return (EACCES); + + obj = SLOT(label); + + if (!mac_lomac_subject_dominate(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_lomac_vnode_check_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { @@ -2666,7 +2666,6 @@ .mpo_system_check_sysctl = mac_lomac_system_check_sysctl, .mpo_vnode_check_access = mac_lomac_vnode_check_open, .mpo_vnode_check_create = mac_lomac_vnode_check_create, - .mpo_vnode_check_unlink = mac_lomac_vnode_check_unlink, .mpo_vnode_check_deleteacl = mac_lomac_vnode_check_deleteacl, .mpo_vnode_check_link = mac_lomac_vnode_check_link, .mpo_vnode_check_mmap = mac_lomac_vnode_check_mmap, @@ -2683,6 +2682,7 @@ .mpo_vnode_check_setmode = mac_lomac_vnode_check_setmode, .mpo_vnode_check_setowner = mac_lomac_vnode_check_setowner, .mpo_vnode_check_setutimes = mac_lomac_vnode_check_setutimes, + .mpo_vnode_check_unlink = mac_lomac_vnode_check_unlink, .mpo_vnode_check_write = mac_lomac_vnode_check_write, .mpo_thread_userret = mac_lomac_thread_userret, }; From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jul 8 13:33:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 91B3616A4DA for ; Sat, 8 Jul 2006 13:33:50 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02E5A43D46 for ; Sat, 8 Jul 2006 13:33:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 535F746D48 for ; Sat, 8 Jul 2006 09:33:49 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A591A555B2; Sat, 8 Jul 2006 13:33:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F56716A4E0; Sat, 8 Jul 2006 13:33:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6292016A4DD for ; Sat, 8 Jul 2006 13:33:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DEA143D46 for ; Sat, 8 Jul 2006 13:33:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68DXlBo025828 for ; Sat, 8 Jul 2006 13:33:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68DXlFo025822 for perforce@freebsd.org; Sat, 8 Jul 2006 13:33:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:33:47 GMT Message-Id: <200607081333.k68DXlFo025822@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 101004 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:33:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=101004 Change 101004 by rwatson@rwatson_zoo on 2006/07/08 13:33:41 Finish basic renaming pass. Everything compiles again. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_getcwd.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_fcntl.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_misc.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_msg.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#3 (text+ko) ==== @@ -314,7 +314,7 @@ /* * Do directory search MAC check using non-cached credentials. */ - if ((error = mac_check_vnode_readdir(td->td_ucred, vp))) + if ((error = mac_vnode_check_readdir(td->td_ucred, vp))) goto out; #endif /* MAC */ if ((error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &ncookies, ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_getcwd.c#3 (text+ko) ==== @@ -169,7 +169,7 @@ * On successful return, *uvpp will be locked */ #ifdef MAC - error = mac_check_vnode_lookup(td->td_ucred, lvp, &cn); + error = mac_vnode_check_lookup(td->td_ucred, lvp, &cn); if (error == 0) #endif error = VOP_LOOKUP(lvp, uvpp, &cn); @@ -215,7 +215,7 @@ eofflag = 0; #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, uvp); + error = mac_vnode_check_readdir(td->td_ucred, uvp); if (error == 0) #endif /* MAC */ error = VOP_READDIR(uvp, &uio, td->td_ucred, &eofflag, ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#3 (text+ko) ==== @@ -301,7 +301,7 @@ * and to reduce code redundancy all over the place here. */ #ifdef MAC - error = mac_check_vnode_open(td->td_ucred, vp, FREAD); + error = mac_vnode_check_open(td->td_ucred, vp, FREAD); if (error) goto cleanup; #endif ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_fcntl.c#3 (text+ko) ==== @@ -269,7 +269,7 @@ #ifdef MAC vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = mac_check_vnode_revoke(td->td_ucred, vp); + error = mac_vnode_check_revoke(td->td_ucred, vp); VOP_UNLOCK(vp, 0, td); if (error) goto out; ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#3 (text+ko) ==== @@ -293,7 +293,7 @@ } #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, vp); + error = mac_vnode_check_readdir(td->td_ucred, vp); if (error) goto out; #endif @@ -455,7 +455,7 @@ auio.uio_offset = off; #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, vp); + error = mac_vnode_check_readdir(td->td_ucred, vp); if (error) goto out; #endif @@ -1286,7 +1286,7 @@ #ifdef __FreeBSD__ mtx_destroy(&q->p_mtx); #ifdef MAC - mac_destroy_proc(q); + mac_proc_destroy(q); #endif uma_zfree(proc_zone, q); #endif ==== //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_misc.c#3 (text+ko) ==== @@ -370,7 +370,7 @@ } #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, vp); + error = mac_vnode_check_readdir(td->td_ucred, vp); if (error) goto out; #endif @@ -529,7 +529,7 @@ } #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, vp); + error = mac_vnode_check_readdir(td->td_ucred, vp); if (error) goto out; #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/sysv_msg.c#4 (text+ko) ==== @@ -857,7 +857,7 @@ msghdr->msg_ts = msgsz; #ifdef MAC /* - * XXXMAC: Should the mac_check_sysv_msgmsq check follow here + * XXXMAC: Should the mac_sysvmsq_check_msgmsq check follow here * immediately? Or, should it be checked just before the msg is * enqueued in the msgq (as it is done now)? */ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jul 11 00:07:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4123016A4DF for ; Tue, 11 Jul 2006 00:07:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A69FA43D53 for ; Tue, 11 Jul 2006 00:07:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1A32F46BDD for ; Mon, 10 Jul 2006 20:07:18 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 298C8555E7; Tue, 11 Jul 2006 00:07:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2302516A4E6; Tue, 11 Jul 2006 00:07:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 018BE16A4E2 for ; Tue, 11 Jul 2006 00:07:17 +0000 (UTC) (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 B3FC743D46 for ; Tue, 11 Jul 2006 00:07:16 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6B07GeY001820 for ; Tue, 11 Jul 2006 00:07:16 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6B07GIe001816 for perforce@freebsd.org; Tue, 11 Jul 2006 00:07:16 GMT (envelope-from wsalamon@computer.org) Date: Tue, 11 Jul 2006 00:07:16 GMT Message-Id: <200607110007.k6B07GIe001816@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 101254 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jul 2006 00:07:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=101254 Change 101254 by wsalamon@vh3 on 2006/07/11 00:07:01 Change the au_to_exec_* function prototypes, removing the 'const' modifier, adding the argument names. Also define KERNEL and user space versions of these functions. Fix up man page to match above. Fix name of exec argument for env in token printer. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#21 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#8 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#38 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#49 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#21 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#20 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#21 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -308,8 +308,13 @@ gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_exec_args(const char **); -token_t *au_to_exec_env(const char **); +#if defined(_KERNEL) || defined(KERNEL) +token_t *au_to_exec_args(char *args, int argc); +token_t *au_to_exec_env(char *envs, int envc); +#else +token_t *au_to_exec_args(char **argv); +token_t *au_to_exec_env(char **envp); +#endif token_t *au_to_text(char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); ==== //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#8 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -155,9 +155,9 @@ .Ft token_t * .Fn au_to_me "void" .Ft token_t * -.Fn au_to_exec_args "const char **args" +.Fn au_to_exec_args "char **argv" .Ft token_t * -.Fn au_to_exec_env "const char **env" +.Fn au_to_exec_env "char **envp" .Ft token_t * .Fn au_to_header "int rec_size" "au_event_t e_type" "au_emod_t emod" .Ft token_t * ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#38 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#38 $ */ #include @@ -1259,7 +1259,7 @@ { int i; - print_tok_type(fp, tok->id, "exec arg", raw); + print_tok_type(fp, tok->id, "exec env", raw); for (i = 0; i< tok->tt.execenv.count; i++) { print_delim(fp, del); print_string(fp, tok->tt.execenv.text[i], ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#49 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#48 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#49 $ */ #include @@ -1055,7 +1055,7 @@ * text count null-terminated strings */ token_t * -au_to_exec_args(const char **args) +au_to_exec_args(char **argv) { token_t *t; u_char *dptr = NULL; @@ -1063,7 +1063,7 @@ int i, count = 0; size_t totlen = 0; - nextarg = *args; + nextarg = *argv; while (nextarg != NULL) { int nextlen; @@ -1071,7 +1071,7 @@ nextlen = strlen(nextarg); totlen += nextlen + 1; count++; - nextarg = *(args + count); + nextarg = *(argv + count); } totlen += count * sizeof(char); /* nul terminations. */ @@ -1083,7 +1083,7 @@ ADD_U_INT32(dptr, count); for (i = 0; i < count; i++) { - nextarg = *(args + i); + nextarg = *(argv + i); ADD_MEM(dptr, nextarg, strlen(nextarg) + 1); } @@ -1096,7 +1096,7 @@ * text count null-terminated strings */ token_t * -au_to_exec_env(const char **env) +au_to_exec_env(char **envp) { token_t *t; u_char *dptr = NULL; @@ -1104,7 +1104,7 @@ size_t totlen = 0; const char *nextenv; - nextenv = *env; + nextenv = *envp; while (nextenv != NULL) { int nextlen; @@ -1112,7 +1112,7 @@ nextlen = strlen(nextenv); totlen += nextlen + 1; count++; - nextenv = *(env + count); + nextenv = *(envp + count); } totlen += sizeof(char) * count; @@ -1124,7 +1124,7 @@ ADD_U_INT32(dptr, count); for (i = 0; i < count; i++) { - nextenv = *(env + i); + nextenv = *(envp + i); ADD_MEM(dptr, nextenv, strlen(nextenv) + 1); } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jul 11 00:13:26 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F0C8616A4DA for ; Tue, 11 Jul 2006 00:13:26 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E82643D45 for ; Tue, 11 Jul 2006 00:13:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0785946BD4 for ; Mon, 10 Jul 2006 20:13:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 298BD55904; Tue, 11 Jul 2006 00:13:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F99F16A4E0; Tue, 11 Jul 2006 00:13:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EAA2216A4DA for ; Tue, 11 Jul 2006 00:13:24 +0000 (UTC) (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 B795843D45 for ; Tue, 11 Jul 2006 00:13:24 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6B0DOeE002175 for ; Tue, 11 Jul 2006 00:13:24 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6B0DOx5002172 for perforce@freebsd.org; Tue, 11 Jul 2006 00:13:24 GMT (envelope-from wsalamon@computer.org) Date: Tue, 11 Jul 2006 00:13:24 GMT Message-Id: <200607110013.k6B0DOx5002172@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 101255 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jul 2006 00:13:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=101255 Change 101255 by wsalamon@vh3 on 2006/07/11 00:12:51 Updated with recent changes to argv and env tokenizer changes. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#19 (text+ko) ==== @@ -2,6 +2,9 @@ - Correct typo in definition of AUR_INT. - Adopt OpenSolaris constant values for AUDIT_* configuration flags. +- Arguments to au_to_exec_args() and au_to_exec_env() no longer const. +- Add kernel versions of au_to_exec_args() and au_to_exec_env(). +- Fix exec argument type that is printed for env strings from 'arg' to 'env'. OpenBSM 1.0 alpha 7 @@ -180,4 +183,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#18 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#19 $ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jul 11 00:36:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05CE616A5ED for ; Tue, 11 Jul 2006 00:36:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5898D43D53 for ; Tue, 11 Jul 2006 00:36:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B9A8F46B55 for ; Mon, 10 Jul 2006 20:36:55 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0C2485641E; Tue, 11 Jul 2006 00:36:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 05B5116A4E1; Tue, 11 Jul 2006 00:36:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6FA916A4DF for ; Tue, 11 Jul 2006 00:36:54 +0000 (UTC) (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 684B643D4C for ; Tue, 11 Jul 2006 00:36:54 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6B0asDR003953 for ; Tue, 11 Jul 2006 00:36:54 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6B0arkX003939 for perforce@freebsd.org; Tue, 11 Jul 2006 00:36:53 GMT (envelope-from wsalamon@computer.org) Date: Tue, 11 Jul 2006 00:36:53 GMT Message-Id: <200607110036.k6B0arkX003939@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 101256 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jul 2006 00:36:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=101256 Change 101256 by wsalamon@vh3 on 2006/07/11 00:36:25 Integrate latest OpenBSM changes into contrib. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#12 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#15 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#18 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#7 (text+ko) ==== @@ -1,3 +1,11 @@ +OpenBSM 1.0 alpha 8 + +- Correct typo in definition of AUR_INT. +- Adopt OpenSolaris constant values for AUDIT_* configuration flags. +- Arguments to au_to_exec_args() and au_to_exec_env() no longer const. +- Add kernel versions of au_to_exec_args() and au_to_exec_env(). +- Fix exec argument type that is printed for env strings from 'arg' to 'env'. + OpenBSM 1.0 alpha 7 - Adopted Solaris-compatible format for subject32_ex and subject64_ex @@ -175,4 +183,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#6 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#7 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#10 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_7 +OPENBSM_1_0_ALPHA_8 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#13 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#12 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#13 $ */ #ifndef _BSM_AUDIT_H @@ -146,6 +146,7 @@ /* * Audit policy controls. */ +#ifdef OLD_WORLD_ORDER #define AUDIT_CNT 0x0001 #define AUDIT_AHLT 0x0002 #define AUDIT_ARGV 0x0004 @@ -157,6 +158,22 @@ #define AUDIT_GROUP 0x0100 #define AUDIT_TRAIL 0x0200 #define AUDIT_PATH 0x0400 +#else /* !OLD_WORLD_ORDER */ +#define AUDIT_CNT 0x0001 +#define AUDIT_AHLT 0x0002 +#define AUDIT_ARGV 0x0004 +#define AUDIT_ARGE 0x0008 +#define AUDIT_SEQ 0x0010 +#define AUDIT_WINDATA 0x0020 +#define AUDIT_USER 0x0040 +#define AUDIT_GROUP 0x0080 +#define AUDIT_TRAIL 0x0100 +#define AUDIT_PATH 0x0200 +#define AUDIT_SCNT 0x0400 +#define AUDIT_PUBLIC 0x0800 +#define AUDIT_ZONENAME 0x1000 +#define AUDIT_PERZONE 0x2000 +#endif /* !OLD_WORLD_ORDER */ /* * Audit queue control parameters ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#12 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#11 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#12 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -184,7 +184,7 @@ #define AUR_CHAR AUR_BYTE #define AUR_SHORT 1 #define AUR_INT32 2 -#define AUR_INT AUR_INT +#define AUR_INT AUR_INT32 #define AUR_INT64 3 /* ... and their sizes */ @@ -308,8 +308,13 @@ gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_exec_args(const char **); -token_t *au_to_exec_env(const char **); +#if defined(_KERNEL) || defined(KERNEL) +token_t *au_to_exec_args(char *args, int argc); +token_t *au_to_exec_env(char *envs, int envc); +#else +token_t *au_to_exec_args(char **argv); +token_t *au_to_exec_env(char **envp); +#endif token_t *au_to_text(char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#8 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0a7], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#7 $]) +AC_INIT([OpenBSM], [1.0a8], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#8 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#6 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#7 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -155,9 +155,9 @@ .Ft token_t * .Fn au_to_me "void" .Ft token_t * -.Fn au_to_exec_args "const char **args" +.Fn au_to_exec_args "char **argv" .Ft token_t * -.Fn au_to_exec_env "const char **env" +.Fn au_to_exec_env "char **envp" .Ft token_t * .Fn au_to_header "int rec_size" "au_event_t e_type" "au_emod_t emod" .Ft token_t * ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#14 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#15 $ */ #include @@ -1259,7 +1259,7 @@ { int i; - print_tok_type(fp, tok->id, "exec arg", raw); + print_tok_type(fp, tok->id, "exec env", raw); for (i = 0; i< tok->tt.execenv.count; i++) { print_delim(fp, del); print_string(fp, tok->tt.execenv.text[i], ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#18 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#17 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#18 $ */ #include @@ -1055,7 +1055,7 @@ * text count null-terminated strings */ token_t * -au_to_exec_args(const char **args) +au_to_exec_args(char **argv) { token_t *t; u_char *dptr = NULL; @@ -1063,7 +1063,7 @@ int i, count = 0; size_t totlen = 0; - nextarg = *args; + nextarg = *argv; while (nextarg != NULL) { int nextlen; @@ -1071,7 +1071,7 @@ nextlen = strlen(nextarg); totlen += nextlen + 1; count++; - nextarg = *(args + count); + nextarg = *(argv + count); } totlen += count * sizeof(char); /* nul terminations. */ @@ -1083,7 +1083,7 @@ ADD_U_INT32(dptr, count); for (i = 0; i < count; i++) { - nextarg = *(args + i); + nextarg = *(argv + i); ADD_MEM(dptr, nextarg, strlen(nextarg) + 1); } @@ -1096,7 +1096,7 @@ * text count null-terminated strings */ token_t * -au_to_exec_env(const char **env) +au_to_exec_env(char **envp) { token_t *t; u_char *dptr = NULL; @@ -1104,7 +1104,7 @@ size_t totlen = 0; const char *nextenv; - nextenv = *env; + nextenv = *envp; while (nextenv != NULL) { int nextlen; @@ -1112,7 +1112,7 @@ nextlen = strlen(nextenv); totlen += nextlen + 1; count++; - nextenv = *(env + count); + nextenv = *(envp + count); } totlen += sizeof(char) * count; @@ -1124,7 +1124,7 @@ ADD_U_INT32(dptr, count); for (i = 0; i < count; i++) { - nextenv = *(env + i); + nextenv = *(envp + i); ADD_MEM(dptr, nextenv, strlen(nextenv) + 1); } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Jul 11 22:10:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E1B216A4DA for ; Tue, 11 Jul 2006 22:10:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82AB743D62 for ; Tue, 11 Jul 2006 22:10:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7317A46CAA for ; Tue, 11 Jul 2006 18:10:50 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8578355A45; Tue, 11 Jul 2006 22:10:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EEFB16A4E1; Tue, 11 Jul 2006 22:10:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 470D016A4DA for ; Tue, 11 Jul 2006 22:10:49 +0000 (UTC) (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 1015243D6D for ; Tue, 11 Jul 2006 22:10:48 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6BMAlOH015826 for ; Tue, 11 Jul 2006 22:10:47 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6BMAl3n015814 for perforce@freebsd.org; Tue, 11 Jul 2006 22:10:47 GMT (envelope-from wsalamon@computer.org) Date: Tue, 11 Jul 2006 22:10:47 GMT Message-Id: <200607112210.k6BMAl3n015814@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 101305 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jul 2006 22:10:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=101305 Change 101305 by wsalamon@vh3 on 2006/07/11 22:10:38 Audit the argv and env vectors passed in on exec: Add the argument auditing functions for argv and env. Add kernel-specific versions of the tokenizer functions for the arg and env represented as a char array. Integrate the changes from OpenBSM for the tokenizer function prototypes (and pick up an earlier change for free). Implement the AUDIT_ARGV and AUDIT_ARGE audit policy commands to enable/disable argv/env auditing. Call the argument auditing from the exec system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#17 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#11 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#34 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#18 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#20 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#18 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#21 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#30 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#18 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#17 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#16 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#17 $ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.3 2006/07/03 14:44:13 rwatson Exp $ */ @@ -185,7 +185,7 @@ #define AUR_CHAR AUR_BYTE #define AUR_SHORT 1 #define AUR_INT32 2 -#define AUR_INT AUR_INT +#define AUR_INT AUR_INT32 #define AUR_INT64 3 /* ... and their sizes */ @@ -309,8 +309,13 @@ gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_exec_args(const char **); -token_t *au_to_exec_env(const char **); +#if defined(_KERNEL) || defined(KERNEL) +token_t *au_to_exec_args(char *args, int argc); +token_t *au_to_exec_env(char *envs, int envc); +#else +token_t *au_to_exec_args(char **argv); +token_t *au_to_exec_env(char **envp); +#endif token_t *au_to_text(char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#11 (text+ko) ==== @@ -79,6 +79,8 @@ #include +#include + MALLOC_DEFINE(M_PARGS, "proc-args", "Process arguments"); static int sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS); @@ -239,6 +241,10 @@ struct proc *p = td->td_proc; int error; + AUDIT_ARG(argv, args->begin_argv, args->argc, + args->begin_envv - args->begin_argv); + AUDIT_ARG(envv, args->begin_envv, args->envc, + args->endp - args->begin_envv); if (p->p_flag & P_HADTHREADS) { PROC_LOCK(p); if (thread_single(SINGLE_BOUNDARY)) { ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#34 (text+ko) ==== @@ -92,6 +92,8 @@ */ int audit_panic_on_write_fail; int audit_fail_stop; +int audit_argv; +int audit_arge; /* * Are we currently "failing stop" due to out of disk space? @@ -206,6 +208,10 @@ free(ar->k_ar.ar_arg_iovecstr, M_AUDITTEXT); if (ar->k_udata != NULL) free(ar->k_udata, M_AUDITDATA); + if (ar->k_ar.ar_arg_argv != NULL) + free(ar->k_ar.ar_arg_argv, M_AUDITTEXT); + if (ar->k_ar.ar_arg_envv != NULL) + free(ar->k_ar.ar_arg_envv, M_AUDITTEXT); } /* @@ -223,6 +229,8 @@ audit_panic_on_write_fail = 0; audit_fail_stop = 0; audit_in_failure = 0; + audit_argv = 0; + audit_arge = 0; audit_fstat.af_filesz = 0; /* '0' means unset, unbounded */ audit_fstat.af_currsz = 0; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#18 (text+ko) ==== @@ -113,6 +113,8 @@ #define ARG_MACHPORT2 0x0000200000000000ULL #define ARG_EXIT 0x0000400000000000ULL #define ARG_IOVECSTR 0x0000800000000000ULL +#define ARG_ARGV 0x0001000000000000ULL +#define ARG_ENVV 0x0002000000000000ULL #define ARG_NONE 0x0000000000000000ULL #define ARG_ALL 0xFFFFFFFFFFFFFFFFULL @@ -168,6 +170,8 @@ void audit_arg_posix_ipc_perm(uid_t uid, gid_t gid, mode_t mode); void audit_arg_auditon(union auditon_udata *udata); void audit_arg_file(struct proc *p, struct file *fp); +void audit_arg_argv(char *argv, int argc, int length); +void audit_arg_envv(char *envv, int envc, int length); void audit_sysclose(struct thread *td, int fd); void audit_proc_alloc(struct proc *p); void audit_proc_kproc0(struct proc *p); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#20 (text+ko) ==== @@ -800,6 +800,48 @@ } /* + * Audit the argument strings passed to exec. + */ +void +audit_arg_argv(char *argv, int argc, int length) +{ + struct kaudit_record *ar; + + if (audit_argv == 0) + return; + + ar = currecord(); + if (ar == NULL) + return; + + ar->k_ar.ar_arg_argv = malloc(length, M_AUDITTEXT, M_WAITOK); + bcopy(argv, ar->k_ar.ar_arg_argv, length); + ar->k_ar.ar_arg_argc = argc; + ARG_SET_VALID(ar, ARG_ARGV); +} + +/* + * Audit the environment strings passed to exec. + */ +void +audit_arg_envv(char *envv, int envc, int length) +{ + struct kaudit_record *ar; + + if (audit_arge == 0) + return; + + ar = currecord(); + if (ar == NULL) + return; + + ar->k_ar.ar_arg_envv = malloc(length, M_AUDITTEXT, M_WAITOK); + bcopy(envv, ar->k_ar.ar_arg_envv, length); + ar->k_ar.ar_arg_envc = envc; + ARG_SET_VALID(ar, ARG_ENVV); +} + +/* * The close() system call uses it's own audit call to capture the path/vnode * information because those pieces are not easily obtained within the system * call itself. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#18 (text+ko) ==== @@ -585,7 +585,6 @@ case AUE_CHDIR: case AUE_CHROOT: case AUE_EACCESS: - case AUE_EXECVE: case AUE_GETATTRLIST: case AUE_NFS_GETFH: case AUE_LSTAT: @@ -684,6 +683,20 @@ EXTATTR_TOKENS; break; + case AUE_EXECVE: + if (ARG_IS_VALID(kar, ARG_ARGV)) { + tok = au_to_exec_args(ar->ar_arg_argv, + ar->ar_arg_argc); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_ENVV)) { + tok = au_to_exec_env(ar->ar_arg_envv, + ar->ar_arg_envc); + kau_write(rec, tok); + } + UPATH1_VNODE1_TOKENS; + break; + case AUE_FCHMOD: if (ARG_IS_VALID(kar, ARG_MODE)) { tok = au_to_arg32(2, "new file mode", ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#20 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#21 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.4 2006/06/17 13:53:04 wsalamon Exp $ */ @@ -1018,13 +1018,60 @@ } #endif +#if defined(_KERNEL) || defined(KERNEL) +static token_t * +au_to_exec_strings(char *strs, int count, u_char type) +{ + token_t *t; + u_char *dptr = NULL; + u_int32_t totlen; + int ctr; + char *p; + + totlen = 0; + ctr = count; + p = strs; + while (ctr-- > 0) { + totlen += strlen(p) + 1; + p = strs + totlen; + } + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + totlen); + ADD_U_CHAR(dptr, type); + ADD_U_INT32(dptr, count); + ADD_STRING(dptr, strs, totlen); + + return (t); +} + +/* + * token ID 1 byte + * count 4 bytes + * text count null-terminated strings + */ +token_t * +au_to_exec_args(char *args, int argc) +{ + return (au_to_exec_strings(args, argc, AUT_EXEC_ARGS)); +} + /* * token ID 1 byte * count 4 bytes * text count null-terminated strings */ token_t * -au_to_exec_args(const char **args) +au_to_exec_env(char *envs, int envc) +{ + return (au_to_exec_strings(envs, envc, AUT_EXEC_ENV)); +} +#else +/* + * token ID 1 byte + * count 4 bytes + * text count null-terminated strings + */ +token_t * +au_to_exec_args(char **argv) { token_t *t; u_char *dptr = NULL; @@ -1032,7 +1079,7 @@ int i, count = 0; size_t totlen = 0; - nextarg = *args; + nextarg = *argv; while (nextarg != NULL) { int nextlen; @@ -1040,7 +1087,7 @@ nextlen = strlen(nextarg); totlen += nextlen + 1; count++; - nextarg = *(args + count); + nextarg = *(argv + count); } totlen += count * sizeof(char); /* nul terminations. */ @@ -1050,7 +1097,7 @@ ADD_U_INT32(dptr, count); for (i = 0; i < count; i++) { - nextarg = *(args + i); + nextarg = *(argv + i); ADD_MEM(dptr, nextarg, strlen(nextarg) + 1); } @@ -1063,7 +1110,7 @@ * text count null-terminated strings */ token_t * -au_to_exec_env(const char **env) +au_to_exec_env(char **envp) { token_t *t; u_char *dptr = NULL; @@ -1071,7 +1118,7 @@ size_t totlen = 0; const char *nextenv; - nextenv = *env; + nextenv = *envp; while (nextenv != NULL) { int nextlen; @@ -1079,7 +1126,7 @@ nextlen = strlen(nextenv); totlen += nextlen + 1; count++; - nextenv = *(env + count); + nextenv = *(envp + count); } totlen += sizeof(char) * count; @@ -1089,12 +1136,13 @@ ADD_U_INT32(dptr, count); for (i = 0; i < count; i++) { - nextenv = *(env + i); + nextenv = *(envp + i); ADD_MEM(dptr, nextenv, strlen(nextenv) + 1); } return (t); } +#endif /* * token ID 1 byte ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#30 (text+ko) ==== @@ -74,6 +74,8 @@ extern struct au_mask audit_nae_mask; extern int audit_panic_on_write_fail; extern int audit_fail_stop; +extern int audit_argv; +extern int audit_arge; /* * Success/failure conditions for the conversion of a kernel audit record to @@ -219,6 +221,10 @@ void * ar_arg_svipc_addr; struct posix_ipc_perm ar_arg_pipc_perm; union auditon_udata ar_arg_auditon; + char *ar_arg_argv; + int ar_arg_argc; + char *ar_arg_envv; + int ar_arg_envc; int ar_arg_exitstatus; int ar_arg_exitretval; }; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#18 (text+ko) ==== @@ -195,16 +195,23 @@ udata.au_policy |= AUDIT_CNT; if (audit_panic_on_write_fail) udata.au_policy |= AUDIT_AHLT; + if (audit_argv) + udata.au_policy |= AUDIT_ARGV; + if (audit_arge) + udata.au_policy |= AUDIT_ARGE; break; case A_SETPOLICY: - if (udata.au_policy & ~(AUDIT_CNT|AUDIT_AHLT)) + if (udata.au_policy & ~(AUDIT_CNT|AUDIT_AHLT|AUDIT_ARGV| + AUDIT_ARGE)) return (EINVAL); /* * XXX - Need to wake up waiters if the policy relaxes? */ audit_fail_stop = ((udata.au_policy & AUDIT_CNT) == 0); audit_panic_on_write_fail = (udata.au_policy & AUDIT_AHLT); + audit_argv = (udata.au_policy & AUDIT_ARGV); + audit_arge = (udata.au_policy & AUDIT_ARGE); break; case A_GETKMASK: From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 20 00:56:39 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8860316A55B for ; Thu, 20 Jul 2006 00:56:39 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D84D43D46 for ; Thu, 20 Jul 2006 00:56:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9043646CC5 for ; Wed, 19 Jul 2006 20:56:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 10369555A9; Thu, 20 Jul 2006 00:56:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0844F16A4DF; Thu, 20 Jul 2006 00:56:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D89FF16A4DA for ; Thu, 20 Jul 2006 00:56:37 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A68CF43D46 for ; Thu, 20 Jul 2006 00:56:37 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6K0ub4M024048 for ; Thu, 20 Jul 2006 00:56:37 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6K0ubH3024045 for perforce@freebsd.org; Thu, 20 Jul 2006 00:56:37 GMT (envelope-from trhodes@freebsd.org) Date: Thu, 20 Jul 2006 00:56:37 GMT Message-Id: <200607200056.k6K0ubH3024045@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 101974 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jul 2006 00:56:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=101974 Change 101974 by trhodes@trhodes_local on 2006/07/20 00:56:23 Use void in a function which returns nothing. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#17 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#17 $ */ #include @@ -88,7 +88,7 @@ * Free our local list of directory names. */ static void -free_dir_q() +free_dir_q(void) { struct dir_ent *dirent; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 27 14:26:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AF9F16A4DA for ; Thu, 27 Jul 2006 14:26:24 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47E3C43D5C for ; Thu, 27 Jul 2006 14:26:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CCEEB46CA3 for ; Thu, 27 Jul 2006 10:25:58 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 94313643CF; Thu, 27 Jul 2006 14:25:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AECB916A4F6; Thu, 27 Jul 2006 14:25:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6695816A4EF for ; Thu, 27 Jul 2006 14:25:15 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E76E43D49 for ; Thu, 27 Jul 2006 14:25:08 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6REP8Cw025519 for ; Thu, 27 Jul 2006 14:25:08 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6REP84B025511 for perforce@freebsd.org; Thu, 27 Jul 2006 14:25:08 GMT (envelope-from millert@freebsd.org) Date: Thu, 27 Jul 2006 14:25:08 GMT Message-Id: <200607271425.k6REP84B025511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 102561 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 14:26:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=102561 Change 102561 by millert@millert_macbook on 2006/07/27 14:24:23 Initial import of sedarwin8 based on Mac OS X 10.4.6. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/ERRATA#1 add .. //depot/projects/trustedbsd/sedarwin8/Makeconfig.in#1 add .. //depot/projects/trustedbsd/sedarwin8/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/README#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/APPLE_LICENSE#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/bootinfo.hdr#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/Control2.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/MAC-PARTS.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/ci.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/ci_io.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/ci.subproj/sl_words.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/CaseTables.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/HFSCompare.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/cache.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ext2fs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ext2fs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ext2fs_bswap.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ext2fs_dinode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ext2fs_dir.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/fs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/hfs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/md5c.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/net.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ufs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ufs_byteorder.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/fs.subproj/ufs_byteorder.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/boot_args.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/ci.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/device_tree.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/fs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/libclite.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/sl.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/include.subproj/sl_words.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/bsearch.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/bswap.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/mem.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/prf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/printf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/sprintf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/string.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/strtol.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/libclite.subproj/zalloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aes.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aescrypt.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aeskey.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aesopt.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aestab.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/aestab.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/appleboot.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/bmdecompress.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/clut.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/device_tree.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/display.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/drivers.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/elf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/elf.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/failedboot.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/lzss.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/macho.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/main.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/netboot.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/plist.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/bootx.tproj/sl.subproj/raid.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/dpkg/control#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/fcode-to-c.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/fcode-to-c.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/fcode-to-c.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/fcode-to-c.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/fcode-to-c.tproj/fcode-to-c.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/macho-to-xcoff.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/macho-to-xcoff.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/macho-to-xcoff.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/macho-to-xcoff.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/BootX/macho-to-xcoff.tproj/macho-to-xcoff.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/NXLogError.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/except.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/file_funcs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/globals.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/indir_ops.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/ipc_funcs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/memory_funcs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streams.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streams.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streams_doprnt.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streams_doscan.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streams_internal.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streamsextra.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Libstreams/streamsimpl.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/adv_cmds.rtf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/cap_mkdb.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/cap_mkdb.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/cap_mkdb.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/cap_mkdb.tproj/cap_mkdb.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/cap_mkdb.tproj/cap_mkdb.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/colldef.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/common.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/fbsdcompat.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/locale/collate.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/parse.y#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/colldef.tproj/scan.l#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/dpkg/control#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/finger.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/finger.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/finger.conf.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/finger.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/lprint.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/net.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/sprint.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/finger.tproj/util.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/finger.plist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/fingerd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/fingerd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/fingerd.tproj/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/fbsdcompat.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/gencat.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/gencat.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/gencat.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/genlib.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/gencat.tproj/nls/msgcat.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/last.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/last.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/last.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/last.tproj/last.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/last.tproj/last.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/locale/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/locale/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/locale/locale.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/locale/locale.cc#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/charmap.p-1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/charmap.p-2#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/charmap.test#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/def.p-1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/def.p-2#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/localedef#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/localedef/localedef.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/lsvfs.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/lsvfs.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/lsvfs.tproj/lsvfs.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/lsvfs.tproj/lsvfs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/md.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/md.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/md.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/md.tproj/md.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/md.tproj/md.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/fbsdcompat.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/ldef.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/lex.l#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/mklocale.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/yacc.y#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mklocale.tproj/yacc.y.patch#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/mksymroot#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/fmt.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/h.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/keyword.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/m.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/nlist.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/print.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/ps.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/ps.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/ps.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/ps.tproj/tasks.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/pstat.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/pstat.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/pstat.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/pstat.tproj/pstat.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/pstat.tproj/pstat.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/cchar.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/gfmt.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/key.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/modes.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/print.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/stty.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/stty.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/stty.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/stty.tproj/util.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tabs.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tabs.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tabs.tproj/tabs.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tabs.tproj/tabs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tty.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tty.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tty.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tty.tproj/tty.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/tty.tproj/tty.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/README#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/be_BY.CP1131.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/be_BY.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/be_BY.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ca_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ca_ES.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/cs_CZ.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/de_DE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/de_DE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/en_DK.example#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/es_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/es_ES.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/et_EE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/is_IS.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/is_IS.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/la_LN.ISO8859-4.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/la_LN.US-ASCII.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/lt_LT.ISO8859-4.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ARMSCII-8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.CP1131#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.CP1251#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.CP866#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISCII-DEV#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-13#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-15#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-2#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-4#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.ISO8859-7#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.KOI8-R#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.KOI8-U#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/map.PT154#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/pl_PL.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ru_RU.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ru_RU.CP866.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ru_RU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/sl_SI.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/sr_YU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/sv_SE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/sv_SE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/uk_UA.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/colldef/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/dummy.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/README.locale_name#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/am_ET.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/be_BY.CP1131.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ja_JP.SJIS.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ja_JP.eucJP.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ko_KR.CP949.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ko_KR.eucKR.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.ISO8859-4.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/la_LN.US-ASCII.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ru_RU.CP866.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ru_RU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_CN.GB18030.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_CN.GB2312.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_CN.GBK.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_CN.eucCN.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_HK.Big5HKSCS.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/mklocale/zh_TW.Big5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/af_ZA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/am_ET.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/be_BY.CP1131.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/be_BY.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/be_BY.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/be_BY.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/bg_BG.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ca_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/cs_CZ.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/cs_CZ.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/da_DK.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/de_AT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/de_CH.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/de_DE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_AU.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_CA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_GB.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_GB.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_IE.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_NZ.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/en_US.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/es_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/et_EE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/fi_FI.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/fr_BE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/fr_CA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/fr_FR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/he_IL.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/hr_HR.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/hu_HU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/hy_AM.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/is_IS.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/it_IT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ja_JP.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ja_JP.eucJP.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/kk_KZ.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ko_KR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ko_KR.eucKR.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/nl_BE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/nl_NL.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/no_NO.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/pl_PL.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/pl_PL.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/pt_BR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/pt_PT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ro_RO.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.CP866.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/ru_RU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sk_SK.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sl_SI.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sr_YU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sr_YU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sr_YU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/sv_SE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/tr_TR.ISO8859-9.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/uk_UA.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/uk_UA.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_CN.GB18030.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_CN.GB2312.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_CN.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_CN.eucCN.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_HK.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/monetdef/zh_TW.Big5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/af_ZA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/am_ET.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/be_BY.CP1131.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/be_BY.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/be_BY.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/be_BY.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/bg_BG.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ca_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/cs_CZ.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/da_DK.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/de_DE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/el_GR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/en_CA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/en_GB.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/en_US.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/es_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/et_EE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/eu_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/fi_FI.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/fr_BE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/fr_CH.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/fr_FR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/he_IL.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/hr_HR.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/hu_HU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/hy_AM.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/is_IS.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/it_IT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ja_JP.SJIS.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ja_JP.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ja_JP.eucJP.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/kk_KZ.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ko_KR.eucKR.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/nl_NL.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/no_NO.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/pl_PL.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/pt_PT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ro_RO.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.CP866.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/ru_RU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/sl_SI.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/sr_YU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/sr_YU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/sr_YU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/sv_SE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/tr_TR.ISO8859-9.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/uk_UA.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/uk_UA.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_CN.GB18030.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_CN.GB2312.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_CN.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_CN.eucCN.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_TW.Big5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/msgdef/zh_TW.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/af_ZA.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/am_ET.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/be_BY.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/ca_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/cs_CZ.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/da_DK.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/de_DE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/en_US.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/es_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/et_EE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/eu_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/fi_FI.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/fr_BE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/fr_FR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/hr_HR.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/hu_HU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/is_IS.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/it_IT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/ja_JP.eucJP.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/ko_KR.eucKR.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/nl_NL.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/no_NO.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/pl_PL.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/pt_BR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/pt_PT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/ro_RO.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/sk_SK.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/sl_SI.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/sr_YU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/sr_YU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/sv_SE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/tr_TR.ISO8859-9.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/numericdef/zh_CN.eucCN.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/am_ET.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/be_BY.CP1131.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/be_BY.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/be_BY.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/be_BY.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/bg_BG.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/bg_BG.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ca_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ca_ES.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/cs_CZ.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/cs_CZ.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/da_DK.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/da_DK.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/de_AT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/de_AT.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/de_DE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/de_DE.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/el_GR.ISO8859-7.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/el_GR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/en_GB.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/en_US.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/es_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/es_ES.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/et_EE.ISO8859-15.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/et_EE.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/eu_ES.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/fi_FI.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/fi_FI.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/fr_FR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/fr_FR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/he_IL.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hi_IN.ISCII-DEV.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hr_HR.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hr_HR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hu_HU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hu_HU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hy_AM.ARMSCII-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/hy_AM.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/is_IS.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/is_IS.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/it_IT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/it_IT.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ja_JP.SJIS.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ja_JP.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ja_JP.eucJP.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/kk_KZ.PT154.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/kk_KZ.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ko_KR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ko_KR.eucKR.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/la_LN.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/lt_LT.ISO8859-13.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/lt_LT.ISO8859-4.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/lt_LT.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/nl_NL.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/no_NO.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/no_NO.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pl_PL.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pl_PL.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pt_BR.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pt_BR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pt_PT.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/pt_PT.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ro_RO.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ro_RO.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.CP1251.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.CP866.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.KOI8-R.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/ru_RU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sk_SK.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sk_SK.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sl_SI.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sl_SI.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sr_YU.ISO8859-2.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sr_YU.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sr_YU.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sv_SE.ISO8859-1.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/sv_SE.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/tr_TR.ISO8859-9.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/tr_TR.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/uk_UA.ISO8859-5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/uk_UA.KOI8-U.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/uk_UA.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_CN.GB18030.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_CN.GB2312.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_CN.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_CN.eucCN.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_TW.Big5.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/usr-share-locale.tproj/timedef/zh_TW.UTF-8.src#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/whois.tproj/BSDmakefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/whois.tproj/COMPINFO#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/whois.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/whois.tproj/whois.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/adv_cmds/whois.tproj/whois.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/config.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/externs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/lexer.l#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/main.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/mkglue.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/mkheaders.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/mkioconf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/mkmakefile.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/mkswapconf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/openp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/parser.y#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/config.tproj/searchp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/decomment.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/decomment.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/decomment.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/decomment.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/decomment.tproj/decomment.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/alloc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/error.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/error.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/flask.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/global.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/global.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/header.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/i386/mig_machine.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/lexxer.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/lexxer.l#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/mig.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/mig.sh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/mig_machine.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/parser.y#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/ppc/mig_machine.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/routine.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/routine.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/server.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/statement.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/statement.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/strdefs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/string.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/type.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/type.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/user.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/utils.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/utils.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/migcom.tproj/write.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/relpath.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/relpath.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/relpath.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/relpath.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/relpath.tproj/relpath.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/vers_string.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bootstrap_cmds/vers_string.sh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/bin/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/bin/auditreduce.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/bin/auditreduce.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/bin/praudit.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_class#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_control#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_event#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_user#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_warn#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/audit_uevents.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_audit.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_class.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_control.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_event.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_flags.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_io.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_mask.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_notify.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_token.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/bsm_user.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/lib_wrappers.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/lib/libbsm.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/audit_class.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/audit_control.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/audit_event.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/audit_user.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/audit_warn.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/auditreduce.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/man/praudit.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/test/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/test/bsm_lib_test.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/test/bsm_tok_test.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/build/Mig.mk#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/build/PolicyKext.mk#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/build/mkPolicyInfoPlist.sh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/build/policy-ops.gdb#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/APPLE_LICENSE#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/RelNotes/CompilerTools.html#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/RelNotes/FatFiles.rtf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/RelNotes/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/RelNotes/Prebinding.html#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/RelNotes/Private_CompilerTools.html#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/append.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/ar.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/ar.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/ar.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/archive.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/archive.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/contents.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/delete.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/extract.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/misc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/move.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/notes#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/print.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/ar/replace.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/COPYING#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/app.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/app.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/as.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/as.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/atof-generic.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/atof-ieee.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/atof-ieee.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/bignum.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/driver.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/expr.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/expr.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/fixes.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/fixes.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/flonum-const.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/flonum-copy.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/flonum-mult.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/flonum.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/frags.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/frags.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hash.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hash.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hex-value.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hex_value.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hppa-aux.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hppa-aux.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hppa-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hppa-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/hppa.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i386-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i386-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i386.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i386.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i860-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i860-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/i860.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/input-file.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/input-file.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/input-scrub.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/input-scrub.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/layout.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/layout.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m68k-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m68k-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m68k.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m88k-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m88k-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/m88k.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/make.defs#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/make_defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/md.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/messages.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/messages.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/notes#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/obstack.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/obstack.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/ppc-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/ppc-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/ppc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/read.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/read.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/relax.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/sections.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/sections.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/sparc-check.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/sparc-opcode.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/sparc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/struc-symbol.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/symbols.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/symbols.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/write_object.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/write_object.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/xmalloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/as/xmalloc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/cbtlibs/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/cbtlibs/libsyminfo.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/cbtlibs/notes#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/allocate.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/allocate.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/cache_flush.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/cthread_internals.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/debug.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/debug.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_api#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_debug.defs#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_debug_defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_event.defs#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_event_MsgError.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_event_defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_init.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_init.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_libfuncs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_prebind.defs#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_prebind_defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/dyld_start.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/entry_point.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/entry_point.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/errors.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/errors.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/fp_save_restore.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/fp_save_restore.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/generic_reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/getsecbyname.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/gmon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/halt.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/hppa_reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/images.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/images.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/inline_bsearch.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/inline_strcmp.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/lock.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/lock.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/machdep_lock.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/malloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/mig_support.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/mod_init_funcs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/mod_init_funcs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/notes#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/ppc_reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/register_funcs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/register_funcs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/reloc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/section_order.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/sparc_reloc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/stub_binding_helper.s#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/symbols.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/symbols.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/trace.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/trace.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/dyld/zoneprotect.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/apprentice.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/ascmagic.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/compress.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/file.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/file.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/file.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/fsmagic.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/internat.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/is_tar.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/386bsd#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/Header#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/Localstuff#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/OpenBSD#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/alliant#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/alpha#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/amanda#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/amigaos#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/animation#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/apl#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/apple#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/archive#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/asterix#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/att3b#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/audio#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/blit#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/bsdi#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/c-lang#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/chi#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/clipper#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/commands#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/compress#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/convex#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/database#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/diamond#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/diff#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/digital#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/dump#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/elf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/encore#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/filesystems#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/fonts#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/frame#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/freebsd#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/hp#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/ibm370#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/ibm6000#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/iff#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/images#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/intel#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/interleaf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/ispell#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/java#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/karma#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/lex#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/lif#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/linux#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/lisp#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/mach#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/macintosh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/magic#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/mail.news#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/mirage#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/mkid#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/mmdf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/motorola#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/msdos#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/ncr#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/news#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/olf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/os9#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/osf1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pbm#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pdf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pdp#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pgp#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pkgadd#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/plus5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/printer#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/psdbms#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/pyramid#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/rpm#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/rtf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sc#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sccs#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sendmail#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sequent#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sgi#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sgml#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sniffer#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/softquad#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/sun#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/terminfo#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/tex#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/timezone#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/troff#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/typeset#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/unknown#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/uuencode#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/varied.out#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/vax#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/visx#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/vms#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/xenix#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/zilog#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magdir/zyxel#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/magic.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/names.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/notes#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/patchlevel.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/print.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/readelf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/readelf.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/cctools/file/readfat.c#1 add >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 2 15:51:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1FAD16A4E0 for ; Wed, 2 Aug 2006 15:51:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DEB843D5A for ; Wed, 2 Aug 2006 15:51:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9758946D22 for ; Wed, 2 Aug 2006 11:51:41 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CFE4773EC0; Wed, 2 Aug 2006 15:50:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C6DC816A4E5; Wed, 2 Aug 2006 15:50:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8588616A4DD for ; Wed, 2 Aug 2006 15:50:44 +0000 (UTC) (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 D257D43D76 for ; Wed, 2 Aug 2006 15:50:37 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k72FobwV066495 for ; Wed, 2 Aug 2006 15:50:37 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k72Fob30066492 for perforce@freebsd.org; Wed, 2 Aug 2006 15:50:37 GMT (envelope-from csjp@freebsd.org) Date: Wed, 2 Aug 2006 15:50:37 GMT Message-Id: <200608021550.k72Fob30066492@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 103037 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2006 15:51:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=103037 Change 103037 by csjp@csjp_xor on 2006/08/02 15:49:52 Do some cosmetic changes to make merging into HEAD a bit easier. Should be no functional change here Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#17 (text+ko) ==== @@ -217,9 +217,8 @@ * Try to provide more helpful debugging output if su(1) is running * non-setuid, or was run from a file system not mounted setuid. */ - if (geteuid() != 0) { + if (geteuid() != 0) errx(1, "not running setuid"); - } if (strlen(user) > MAXLOGNAME - 1) { #ifdef USE_BSM_AUDIT @@ -231,9 +230,8 @@ } nargv = malloc(sizeof(char *) * (size_t)(argc + 4)); - if (nargv == NULL) { + if (nargv == NULL) errx(1, "malloc failure"); - } nargv[argc + 3] = NULL; for (i = argc; i >= optind; i--) @@ -266,9 +264,8 @@ } username = strdup(pwd->pw_name); - if (username == NULL) { + if (username == NULL) err(1, "strdup failure"); - } if (asme) { if (pwd->pw_shell != NULL && *pwd->pw_shell != '\0') { @@ -370,16 +367,14 @@ errx(1, "only root may use -c"); } lc = login_getclass(class); - if (lc == NULL) { + if (lc == NULL) errx(1, "unknown class: %s", class); - } } /* if asme and non-standard target shell, must be root */ if (asme) { - if (ruid != 0 && !chshell(pwd->pw_shell)) { + if (ruid != 0 && !chshell(pwd->pw_shell)) errx(1, "permission denied (shell)"); - } } else if (pwd->pw_shell && *pwd->pw_shell) { shell = pwd->pw_shell; @@ -403,18 +398,16 @@ /* Switch to home directory */ if (asthem) { - if (chdir(pwd->pw_dir) < 0) { + if (chdir(pwd->pw_dir) < 0) errx(1, "no directory"); - } } /* * PAM modules might add supplementary groups in pam_setcred(), so * initialize them first. */ - if (setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETGROUP) < 0) { + if (setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETGROUP) < 0) err(1, "setusercontext"); - } retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED); if (retcode != PAM_SUCCESS) { @@ -478,9 +471,8 @@ child_pgrp = getpgid(child_pid); if (tcgetpgrp(STDERR_FILENO) == child_pgrp) tcsetpgrp(STDERR_FILENO, getpgrp()); - if (pid == -1) { + if (pid == -1) err(1, "waitpid"); - } PAM_END(); exit(WEXITSTATUS(statusp)); case -1: @@ -512,9 +504,8 @@ */ if ((asme || (!asthem && class == NULL)) && pwd->pw_uid) setwhat &= ~(LOGIN_SETPRIORITY | LOGIN_SETRESOURCES); - if (setusercontext(lc, pwd, pwd->pw_uid, setwhat) < 0) { + if (setusercontext(lc, pwd, pwd->pw_uid, setwhat) < 0) err(1, "setusercontext"); - } if (!asme) { if (asthem) { @@ -555,7 +546,7 @@ /* csh strips the first character... */ *np.a = asthem ? "-su" : iscsh == YES ? "_su" : "su"; - if (ruid != 0) + if (ruid != 0) syslog(LOG_NOTICE, "%s to %s%s", username, user, ontty()); From owner-trustedbsd-cvs@FreeBSD.ORG Fri Aug 4 18:05:04 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6313E16A4DE for ; Fri, 4 Aug 2006 18:05:04 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 441BC43D45 for ; Fri, 4 Aug 2006 18:05:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B1A2C46C05 for ; Fri, 4 Aug 2006 14:05:02 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 16A2C14BD5A; Fri, 4 Aug 2006 18:01:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 13DAE16A4FC; Fri, 4 Aug 2006 18:01:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C88FC16A4F8 for ; Fri, 4 Aug 2006 18:00:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E70B643D6A for ; Fri, 4 Aug 2006 18:00:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k74I0vYH020152 for ; Fri, 4 Aug 2006 18:00:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k74I0vwM020149 for perforce@freebsd.org; Fri, 4 Aug 2006 18:00:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 4 Aug 2006 18:00:57 GMT Message-Id: <200608041800.k74I0vwM020149@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 103183 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2006 18:05:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=103183 Change 103183 by rwatson@rwatson_zoo on 2006/08/04 18:00:28 Remove HEADER_VERSION, which is a poorly named define for a public header file. Add new version constants, and allocate a specific constant for OpenBSM, as well as list some constants used by other implementations. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#22 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#50 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#22 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#22 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -199,9 +199,19 @@ #define PAD_NOTATTR 0x4000 /* nonattributable event */ #define PAD_FAILURE 0x8000 /* fail audit event */ +#define BSM_MAX_GROUPS 16 -#define BSM_MAX_GROUPS 16 -#define HEADER_VERSION 1 +/* + * A number of BSM versions are floating around and defined. Here are + * constants for them. OpenBSM uses the same token types, etc, used in the + * Solaris BSM version, but has a separate version number in order to + * identify a potentially different event identifier name space. + */ +#define BSM_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ +#define BSM_HEADER_VERSION_SOLARIS 2 +#define BSM_HEADER_VERSION_TSOL25 3 +#define BSM_HEADER_VERSION_TSOL 4 +#define BSM_HEADER_VERSION_OPENBSM 10 /* * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#50 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#49 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#50 $ */ #include @@ -1155,7 +1155,7 @@ ADD_U_CHAR(dptr, AUT_HEADER32); ADD_U_INT32(dptr, rec_size); - ADD_U_CHAR(dptr, HEADER_VERSION); + ADD_U_CHAR(dptr, BSM_HEADER_VERSION_OPENBSM); ADD_U_INT16(dptr, e_type); ADD_U_INT16(dptr, e_mod); From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 12:24:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1E2E16A4E8 for ; Sat, 5 Aug 2006 12:24:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F05A643D53 for ; Sat, 5 Aug 2006 12:24:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F1B1646CE4 for ; Sat, 5 Aug 2006 08:24:51 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8135B55432; Sat, 5 Aug 2006 12:24:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A54816A4DD; Sat, 5 Aug 2006 12:24:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C0C816A4E1 for ; Sat, 5 Aug 2006 12:24:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E91F43D5A for ; Sat, 5 Aug 2006 12:24:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75COY4v056201 for ; Sat, 5 Aug 2006 12:24:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75COXNw056198 for perforce@freebsd.org; Sat, 5 Aug 2006 12:24:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 12:24:33 GMT Message-Id: <200608051224.k75COXNw056198@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 103240 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 12:24:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=103240 Change 103240 by rwatson@rwatson_zoo on 2006/08/05 12:23:50 Renumber OpenBSM audit events to 43xxx in order to avoid collisions with future Solaris event numbers, which are approaching 301, the first event added to the Solaris list for Darwin. Provide compatibility entries for current Darwin event numbering, but these should be avoided and the new events used in place of them. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#20 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#39 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#20 (text+ko) ==== @@ -5,6 +5,11 @@ - Arguments to au_to_exec_args() and au_to_exec_env() no longer const. - Add kernel versions of au_to_exec_args() and au_to_exec_env(). - Fix exec argument type that is printed for env strings from 'arg' to 'env'. +- New OpenBSM token version number assigned, constants added for other + commonly seen version numbers. +- OpenBSM-specific events assigned numbers in the 43xxx range to avoid future + collisions with Solaris. Darwin events renamed to AUE_DARWIN_foo, as they + are now deprecated numberings. OpenBSM 1.0 alpha 7 @@ -183,4 +188,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#19 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#20 $ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#39 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#38 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#39 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -273,134 +273,200 @@ #define AUE_NTP_ADJTIME 288 /* - * Events not present in OpenSolaris BSM, generally derived from Apple Darwin - * BSM or added in OpenBSM. This start a little too close to the top end of - * the OpenSolaris event list for my comfort. + * Events added for Apple Darwin that potentially collide with future Solaris + * BSM events. These are assigned AUE_DARWIN prefixes, and are deprecated in + * new trails. Systems generating these events should switch to the new + * identifiers that avoid colliding with the Solaris identifier space. */ -#define AUE_GETFSSTAT 301 -#define AUE_PTRACE 302 -#define AUE_CHFLAGS 303 -#define AUE_FCHFLAGS 304 -#define AUE_PROFILE 305 -#define AUE_KTRACE 306 -#define AUE_SETLOGIN 307 +#define AUE_DARWIN_GETFSSTAT 301 +#define AUE_DARWIN_PTRACE 302 +#define AUE_DARWIN_CHFLAGS 303 +#define AUE_DARWIN_FCHFLAGS 304 +#define AUE_DARWIN_PROFILE 305 +#define AUE_DARWIN_KTRACE 306 +#define AUE_DARWIN_SETLOGIN 307 #define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */ -#define AUE_REVOKE 309 -#define AUE_UMASK 310 -#define AUE_MPROTECT 311 +#define AUE_DARWIN_REVOKE 309 +#define AUE_DARWIN_UMASK 310 +#define AUE_DARWIN_MPROTECT 311 #define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */ #define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */ #define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */ -#define AUE_MKFIFO 315 -#define AUE_POLL 316 +#define AUE_DARWIN_MKFIFO 315 +#define AUE_DARWIN_POLL 316 #define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ -#define AUE_FUTIMES 318 -#define AUE_SETSID 319 -#define AUE_SETPRIVEXEC 320 /* Darwin-specific. */ +#define AUE_DARWIN_FUTIMES 318 +#define AUE_DARWIN_SETSID 319 +#define AUE_DARWIN_SETPRIVEXEC 320 /* Darwin-specific. */ #define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ #define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ #define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ -#define AUE_ADDPROFILE 324 /* Darwin-specific. */ -#define AUE_KDEBUGTRACE 325 /* Darwin-specific. */ -#define AUE_KDBUGTRACE AUE_KDEBUGTRACE -#define AUE_FSTAT 326 -#define AUE_FPATHCONF 327 -#define AUE_GETDIRENTRIES 328 +#define AUE_DARWIN_ADDPROFILE 324 /* Darwin-specific. */ +#define AUE_DARWIN_KDEBUGTRACE 325 /* Darwin-specific. */ +#define AUE_DARWIN_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_DARWIN_FSTAT 326 +#define AUE_DARWIN_FPATHCONF 327 +#define AUE_DARWIN_GETDIRENTRIES 328 #define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */ #define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */ -#define AUE_SYSCTL 331 -#define AUE_MLOCK 332 -#define AUE_MUNLOCK 333 -#define AUE_UNDELETE 334 -#define AUE_GETATTRLIST 335 /* Darwin-specific. */ -#define AUE_SETATTRLIST 336 /* Darwin-specific. */ -#define AUE_GETDIRENTRIESATTR 337 /* Darwin-specific. */ -#define AUE_EXCHANGEDATA 338 /* Darwin-specific. */ -#define AUE_SEARCHFS 339 /* Darwin-specific. */ -#define AUE_MINHERIT 340 -#define AUE_SEMCONFIG 341 -#define AUE_SEMOPEN 342 -#define AUE_SEMCLOSE 343 -#define AUE_SEMUNLINK 344 -#define AUE_SHMOPEN 345 -#define AUE_SHMUNLINK 346 -#define AUE_LOADSHFILE 347 /* Darwin-specific. */ -#define AUE_RESETSHFILE 348 /* Darwin-specific. */ -#define AUE_NEWSYSTEMSHREG 349 /* Darwin-specific. */ -#define AUE_PTHREADKILL 350 /* Darwin-specific. */ -#define AUE_PTHREADSIGMASK 351 /* Darwin-specific. */ -#define AUE_AUDITCTL 352 -#define AUE_RFORK 353 -#define AUE_LCHMOD 354 -#define AUE_SWAPOFF 355 -#define AUE_INITPROCESS 356 /* Darwin-specific. */ -#define AUE_MAPFD 357 /* Darwin-specific. */ -#define AUE_TASKFORPID 358 /* Darwin-specific. */ -#define AUE_PIDFORTASK 359 /* Darwin-specific. */ -#define AUE_SYSCTL_NONADMIN 360 -#define AUE_COPYFILE 361 /* Darwin-specific. */ -#define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 363 /* FreeBSD-specific. */ -#define AUE_SENDFILE 364 /* BSD/Linux-specific. */ -#define AUE_USELIB 365 /* Linux-specific. */ -#define AUE_GETRESUID 366 -#define AUE_SETRESUID 367 -#define AUE_GETRESGID 368 -#define AUE_SETRESGID 369 -#define AUE_WAIT4 370 /* FreeBSD-specific. */ -#define AUE_LGETFH 371 /* FreeBSD-specific. */ -#define AUE_FHSTATFS 372 /* FreeBSD-specific. */ -#define AUE_FHOPEN 373 /* FreeBSD-specific. */ -#define AUE_FHSTAT 374 /* FreeBSD-specific. */ -#define AUE_JAIL 375 /* FreeBSD-specific. */ -#define AUE_EACCESS 376 /* FreeBSD-specific. */ -#define AUE_KQUEUE 377 /* FreeBSD-specific. */ -#define AUE_KEVENT 378 /* FreeBSD-specific. */ -#define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD-specific. */ -#define AUE_BDFLUSH 381 /* Linux-specific. */ -#define AUE_SETFSUID 382 /* Linux-specific. */ -#define AUE_SETFSGID 383 /* Linux-specific. */ -#define AUE_PERSONALITY 384 /* Linux-specific. */ -#define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ -#define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ -#define AUE_PRCTL 387 /* Linux-specific. */ -#define AUE_GETCWD 388 /* FreeBSD/Linux-specific. */ -#define AUE_CAPGET 389 /* Linux-specific. */ -#define AUE_CAPSET 390 /* Linux-specific. */ -#define AUE_PIVOT_ROOT 391 /* Linux-specific. */ -#define AUE_RTPRIO 392 /* FreeBSD-specific. */ -#define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ -#define AUE_SCHED_SETPARAM 394 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ -#define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ -#define AUE_ACL_GET_FILE 398 /* FreeBSD. */ -#define AUE_ACL_SET_FILE 399 /* FreeBSD. */ -#define AUE_ACL_GET_FD 400 /* FreeBSD. */ -#define AUE_ACL_SET_FD 401 /* FreeBSD. */ -#define AUE_ACL_DELETE_FILE 402 /* FreeBSD. */ -#define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ -#define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ -#define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ -#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ -#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ -#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ -#define AUE_SYSARCH 410 /* FreeBSD. */ -#define AUE_EXTATTRCTL 411 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ -#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ -#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ +#define AUE_DARWIN_SYSCTL 331 +#define AUE_DARWIN_MLOCK 332 +#define AUE_DARWIN_MUNLOCK 333 +#define AUE_DARWIN_UNDELETE 334 +#define AUE_DARWIN_GETATTRLIST 335 /* Darwin-specific. */ +#define AUE_DARWIN_SETATTRLIST 336 /* Darwin-specific. */ +#define AUE_DARWIN_GETDIRENTRIESATTR 337 /* Darwin-specific. */ +#define AUE_DARWIN_EXCHANGEDATA 338 /* Darwin-specific. */ +#define AUE_DARWIN_SEARCHFS 339 /* Darwin-specific. */ +#define AUE_DARWIN_MINHERIT 340 +#define AUE_DARWIN_SEMCONFIG 341 +#define AUE_DARWIN_SEMOPEN 342 +#define AUE_DARWIN_SEMCLOSE 343 +#define AUE_DARWIN_SEMUNLINK 344 +#define AUE_DARWIN_SHMOPEN 345 +#define AUE_DARWIN_SHMUNLINK 346 +#define AUE_DARWIN_LOADSHFILE 347 /* Darwin-specific. */ +#define AUE_DARWIN_RESETSHFILE 348 /* Darwin-specific. */ +#define AUE_DARWIN_NEWSYSTEMSHREG 349 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADKILL 350 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADSIGMASK 351 /* Darwin-specific. */ +#define AUE_DARWIN_AUDITCTL 352 +#define AUE_DARWIN_RFORK 353 +#define AUE_DARWIN_LCHMOD 354 +#define AUE_DARWIN_SWAPOFF 355 +#define AUE_DARWIN_INITPROCESS 356 /* Darwin-specific. */ +#define AUE_DARWIN_MAPFD 357 /* Darwin-specific. */ +#define AUE_DARWIN_TASKFORPID 358 /* Darwin-specific. */ +#define AUE_DARWIN_PIDFORTASK 359 /* Darwin-specific. */ +#define AUE_DARWIN_SYSCTL_NONADMIN 360 +#define AUE_DARWIN_COPYFILE 361 /* Darwin-specific. */ + +/* + * Audit event identifiers added as part of OpenBSM, generally corresponding + * to events in FreeBSD, Darwin, and Linux that were not present in Solaris. + * These often duplicate events added to the Solaris set by Darwin, but use + * event identifiers in a higher range in order to avoid colliding with + * future Solaris additions. + */ +#define AUE_GETFSSTAT 43001 +#define AUE_PTRACE 43002 +#define AUE_CHFLAGS 43003 +#define AUE_FCHFLAGS 43004 +#define AUE_PROFILE 43005 +#define AUE_KTRACE 43006 +#define AUE_SETLOGIN 43007 +#define AUE_REVOKE 43008 +#define AUE_UMASK 43009 +#define AUE_MPROTECT 43010 +#define AUE_MKFIFO 43011 +#define AUE_POLL 43012 +#define AUE_FUTIMES 43013 +#define AUE_SETSID 43014 +#define AUE_SETPRIVEXEC 43015 /* Darwin-specific. */ +#define AUE_ADDPROFILE 43016 /* Darwin-specific. */ +#define AUE_KDEBUGTRACE 43017 /* Darwin-specific. */ +#define AUE_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_FSTAT 43018 +#define AUE_FPATHCONF 43019 +#define AUE_GETDIRENTRIES 43020 +#define AUE_SYSCTL 43021 +#define AUE_MLOCK 43022 +#define AUE_MUNLOCK 43023 +#define AUE_UNDELETE 43024 +#define AUE_GETATTRLIST 43025 /* Darwin-specific. */ +#define AUE_SETATTRLIST 43026 /* Darwin-specific. */ +#define AUE_GETDIRENTRIESATTR 43027 /* Darwin-specific. */ +#define AUE_EXCHANGEDATA 43028 /* Darwin-specific. */ +#define AUE_SEARCHFS 43029 /* Darwin-specific. */ +#define AUE_MINHERIT 43030 +#define AUE_SEMCONFIG 43031 +#define AUE_SEMOPEN 43032 +#define AUE_SEMCLOSE 43033 +#define AUE_SEMUNLINK 43034 +#define AUE_SHMOPEN 43035 +#define AUE_SHMUNLINK 43036 +#define AUE_LOADSHFILE 43037 /* Darwin-specific. */ +#define AUE_RESETSHFILE 43038 /* Darwin-specific. */ +#define AUE_NEWSYSTEMSHREG 43039 /* Darwin-specific. */ +#define AUE_PTHREADKILL 43040 /* Darwin-specific. */ +#define AUE_PTHREADSIGMASK 43041 /* Darwin-specific. */ +#define AUE_AUDITCTL 43042 +#define AUE_RFORK 43043 +#define AUE_LCHMOD 43044 +#define AUE_SWAPOFF 43045 +#define AUE_INITPROCESS 43046 /* Darwin-specific. */ +#define AUE_MAPFD 43047 /* Darwin-specific. */ +#define AUE_TASKFORPID 43048 /* Darwin-specific. */ +#define AUE_PIDFORTASK 43049 /* Darwin-specific. */ +#define AUE_SYSCTL_NONADMIN 43050 +#define AUE_COPYFILE 43051 /* Darwin-specific. */ + +/* + * Events added to OpenBSM for FreeBSD and Linux; may also be used by Darwin + * in the future. + */ +#define AUE_LUTIMES 43052 +#define AUE_LCHFLAGS 43053 /* FreeBSD-specific. */ +#define AUE_SENDFILE 43054 /* BSD/Linux-specific. */ +#define AUE_USELIB 43055 /* Linux-specific. */ +#define AUE_GETRESUID 43056 +#define AUE_SETRESUID 43057 +#define AUE_GETRESGID 43058 +#define AUE_SETRESGID 43059 +#define AUE_WAIT4 43060 /* FreeBSD-specific. */ +#define AUE_LGETFH 43061 /* FreeBSD-specific. */ +#define AUE_FHSTATFS 43062 /* FreeBSD-specific. */ +#define AUE_FHOPEN 43063 /* FreeBSD-specific. */ +#define AUE_FHSTAT 43064 /* FreeBSD-specific. */ +#define AUE_JAIL 43065 /* FreeBSD-specific. */ +#define AUE_EACCESS 43066 /* FreeBSD-specific. */ +#define AUE_KQUEUE 43067 /* FreeBSD-specific. */ +#define AUE_KEVENT 43068 /* FreeBSD-specific. */ +#define AUE_FSYNC 43069 +#define AUE_NMOUNT 43070 /* FreeBSD-specific. */ +#define AUE_BDFLUSH 43071 /* Linux-specific. */ +#define AUE_SETFSUID 43072 /* Linux-specific. */ +#define AUE_SETFSGID 43073 /* Linux-specific. */ +#define AUE_PERSONALITY 43074 /* Linux-specific. */ +#define AUE_SCHED_GETSCHEDULER 43075 /* POSIX.1b. */ +#define AUE_SCHED_SETSCHEDULER 43076 /* POSIX.1b. */ +#define AUE_PRCTL 43077 /* Linux-specific. */ +#define AUE_GETCWD 43078 /* FreeBSD/Linux-specific. */ +#define AUE_CAPGET 43079 /* Linux-specific. */ +#define AUE_CAPSET 43080 /* Linux-specific. */ +#define AUE_PIVOT_ROOT 43081 /* Linux-specific. */ +#define AUE_RTPRIO 43082 /* FreeBSD-specific. */ +#define AUE_SCHED_GETPARAM 43083 /* POSIX.1b. */ +#define AUE_SCHED_SETPARAM 43084 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MAX 43085 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MIN 43086 /* POSIX.1b. */ +#define AUE_SCHED_RR_GET_INTERVAL 43087 /* POSIX.1b. */ +#define AUE_ACL_GET_FILE 43088 /* FreeBSD. */ +#define AUE_ACL_SET_FILE 43089 /* FreeBSD. */ +#define AUE_ACL_GET_FD 43090 /* FreeBSD. */ +#define AUE_ACL_SET_FD 43091 /* FreeBSD. */ +#define AUE_ACL_DELETE_FILE 43092 /* FreeBSD. */ +#define AUE_ACL_DELETE_FD 43093 /* FreeBSD. */ +#define AUE_ACL_CHECK_FILE 43094 /* FreeBSD. */ +#define AUE_ACL_CHECK_FD 43095 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 43096 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 43097 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 43098 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 43099 /* FreeBSD. */ +#define AUE_SYSARCH 43100 /* FreeBSD. */ +#define AUE_EXTATTRCTL 43101 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 43102 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 43103 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 43104 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 43105 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 43106 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 43107 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 43108 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 43109 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#11 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#12 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -234,129 +234,190 @@ 267:AUE_GETAUDIT_ADDR:getaudit_addr(2):ad 268:AUE_CLOCK_SETTIME:clock_settime(2):ad 269:AUE_NTP_ADJTIME:ntp_adjtime(2):ad -301:AUE_GETFSSTAT:getfsstat(2):fa -302:AUE_PTRACE:ptrace(2):pc -303:AUE_CHFLAGS:chflags(2):fm -304:AUE_FCHFLAGS:fchflags(2):fm -305:AUE_PROFILE:profil(2):pc -306:AUE_KTRACE:ktrace(2):pc -307:AUE_SETLOGIN:setlogin(2):pc +# +# What follows are deprecated Darwin event numbers that may someday conflict +# with Solaris events. +# +301:AUE_DARWIN_GETFSSTAT:getfsstat(2):fa +302:AUE_DARWIN_PTRACE:ptrace(2):pc +303:AUE_DARWIN_CHFLAGS:chflags(2):fm +304:AUE_DARWIN_FCHFLAGS:fchflags(2):fm +305:AUE_DARWIN_PROFILE:profil(2):pc +306:AUE_DARWIN_KTRACE:ktrace(2):pc +307:AUE_DARWIN_SETLOGIN:setlogin(2):pc 308:AUE_DARWIN_REBOOT:reboot(2):ad -309:AUE_REVOKE:revoke(2):cl -310:AUE_UMASK:umask(2):pc -311:AUE_MPROTECT:mprotect(2):fm +309:AUE_DARWIN_REVOKE:revoke(2):cl +310:AUE_DARWIN_UMASK:umask(2):pc +311:AUE_DARWIN_MPROTECT:mprotect(2):fm 312:AUE_DARWIN_SETPRIORITY:setpriority(2):pc,ot 313:AUE_DARWIN_SETTIMEOFDAY:settimeofday(2):ad 314:AUE_DARWIN_FLOCK:flock(2):fm -315:AUE_MKFIFO:mkfifo(2):fc -316:AUE_POLL:poll(2):no +315:AUE_DARWIN_MKFIFO:mkfifo(2):fc +316:AUE_DARWIN_POLL:poll(2):no 317:AUE_DARWIN_SOCKETPAIR:socketpair(2):nt -318:AUE_FUTIMES:futimes(2):fm -319:AUE_SETSID:setsid(2):pc -320:AUE_SETPRIVEXEC:setprivexec(2):pc +318:AUE_DARWIN_FUTIMES:futimes(2):fm +319:AUE_DARWIN_SETSID:setsid(2):pc +320:AUE_DARWIN_SETPRIVEXEC:setprivexec(2):pc 321:AUE_DARWIN_NFSSVC:nfssvc(2):ad 322:AUE_DARWIN_GETFH:getfh(2):fa 323:AUE_DARWIN_QUOTACTL:quotactl(2):ad -324:AUE_ADDPROFILE:system call:pc -325:AUE_KDEBUGTRACE:system call:pc -326:AUE_FSTAT:fstat(2):fa -327:AUE_FPATHCONF:fpathconf(2):fa -328:AUE_GETDIRENTRIES:getdirentries(2):fr +324:AUE_DARWIN_ADDPROFILE:system call:pc +325:AUE_DARWIN_KDEBUGTRACE:system call:pc +326:AUE_DARWIN_FSTAT:fstat(2):fa +327:AUE_DARWIN_FPATHCONF:fpathconf(2):fa +328:AUE_DARWIN_GETDIRENTRIES:getdirentries(2):fr 329:AUE_DARWIN_TRUNCATE:truncate(2):fw 330:AUE_DARWIN_FTRUNCATE:ftruncate(2):fw -331:AUE_SYSCTL:sysctl(3):ad -332:AUE_MLOCK:mlock(2):pc -333:AUE_MUNLOCK:munlock(2):pc -334:AUE_UNDELETE:undelete(2):fm -335:AUE_GETATTRLIST:getattrlist():fa -336:AUE_SETATTRLIST:setattrlist():fm -337:AUE_GETDIRENTRIESATTR:getdirentriesattr():fa -338:AUE_EXCHANGEDATA:exchangedata():fw -339:AUE_SEARCHFS:searchfs():fa -340:AUE_MINHERIT:minherit(2):pc -341:AUE_SEMCONFIG:semconfig():ip -342:AUE_SEMOPEN:sem_open(2):ip -343:AUE_SEMCLOSE:sem_close(2):ip -344:AUE_SEMUNLINK:sem_unlink(2):ip -345:AUE_SHMOPEN:shm_open(2):ip -346:AUE_SHMUNLINK:shm_unlink(2):ip -347:AUE_LOADSHFILE:load_shared_file():fr -348:AUE_RESETSHFILE:reset_shared_file():ot -349:AUE_NEWSYSTEMSHREG:new_system_share_regions():ot -350:AUE_PTHREADKILL:pthread_kill(2):pc -351:AUE_PTHREADSIGMASK:pthread_sigmask(2):pc -352:AUE_AUDITCTL:auditctl(2):ad -353:AUE_RFORK:rfork(2):pc -354:AUE_LCHMOD:lchmod(2):fm -355:AUE_SWAPOFF:swapoff():ad -356:AUE_INITPROCESS:init_process():pc -357:AUE_MAPFD:map_fd():fa -358:AUE_TASKFORPID:task_for_pid():pc -359:AUE_PIDFORTASK:pid_for_task():pc -360:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot -361:AUE_COPYFILE:copyfile():fr,fw -362:AUE_LUTIMES:lutimes(2):fm -363:AUE_LCHFLAGS:lchflags(2):fm -364:AUE_SENDFILE:sendfile(2):nt -365:AUE_USELIB:uselib(2):fa -366:AUE_GETRESUID:getresuid(2):pc -367:AUE_SETRESUID:setresuid(2):pc -368:AUE_GETRESGID:getresgid(2):pc -369:AUE_SETRESGID:setresgid(2):pc -370:AUE_WAIT4:wait4(2):pc -371:AUE_LGETFH:lgetfh(2):fa -372:AUE_FHSTATFS:fhstatfs(2):fa -373:AUE_FHOPEN:fhopen(2):fa -374:AUE_FHSTAT:fhstat(2):fa -375:AUE_JAIL:jail(2):pc -376:AUE_EACCESS:eaccess(2):fa -377:AUE_KQUEUE:kqueue(2):no -378:AUE_KEVENT:kevent(2):no -379:AUE_FSYNC:fsync(2):fm -380:AUE_NMOUNT:nmount(2):ad -381:AUE_BDFLUSH:bdflush(2):ad -382:AUE_SETFSUID:setfsuid(2):ot -383:AUE_SETFSGID:setfsgid(2):ot -384:AUE_PERSONALITY:personality(2):pc -385:AUE_SCHED_GETSCHEDULER:getscheduler(2):ad -386:AUE_SCHED_SETSCHEDULER:setscheduler(2):ad -387:AUE_PRCTL:prctl(2):pc -388:AUE_GETCWD:getcwd(2):pc -389:AUE_CAPGET:capget(2):pc -390:AUE_CAPSET:capset(2):pc -391:AUE_PIVOT_ROOT:pivot_root(2):pc -392:AUE_RTPRIO::rtprio(2):pc -393:AUE_SCHED_GETPARAM:sched_getparam(2):ad -394:AUE_SCHED_SETPARAM:sched_setparam(2):ad -395:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad -396:AUE_SCHED_GET_PRIORITY_MIN:sched_get_priority_min(2):ad -397:AUE_SCHED_RR_GET_INTERVAL:sched_rr_get_interval(2):ad -398:AUE_ACL_GET_FILE:acl_get_file(2):fa -399:AUE_ACL_SET_FILE:acl_set_file(2):fm -400:AUE_ACL_GET_FD:acl_get_fd(2):fa -401:AUE_ACL_SET_FD:acl_set_fd(2):fm -402:AUE_ACL_DELETE_FILE:acl_delete_file(2):fm -403:AUE_ACL_DELETE_FD:acl_delete_fd(2):fm -404:AUE_ACL_CHECK_FILE:acl_aclcheck_file(2):fa -405:AUE_ACL_CHECK_FD:acl_aclcheck_fd(2):fa -406:AUE_ACL_GET_LINK:acl_get_link(2):fa -407:AUE_ACL_SET_LINK:acl_set_link(2):fm -408:AUE_ACL_DELETE_LINK:acl_delete_link(2):fm -409:AUE_ACL_CHECK_LINK:acl_aclcheck_link(2):fa -410:AUE_SYSARCH:sysarch(2):na -411:AUE_EXTATTRCTL:extattrctl(2):fm -412:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa -413:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm -414:AUE_EXTATTR_LIST_FILE:extattr_list_file(2):fa -415:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm -416:AUE_EXTATTR_GET_FD:extattr_get_fd(2):fa -417:AUE_EXTATTR_SET_FD:extattr_set_fd(2):fm -418:AUE_EXTATTR_LIST_FD:extattr_list_fd(2):fa -419:AUE_EXTATTR_DELETE_FD:extattr_delete_fd(2):fm -420:AUE_EXTATTR_GET_LINK:extattr_get_link(2):fa -421:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm -422:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa -423:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm +331:AUE_DARWIN_SYSCTL:sysctl(3):ad +332:AUE_DARWIN_MLOCK:mlock(2):pc +333:AUE_DARWIN_MUNLOCK:munlock(2):pc +334:AUE_DARWIN_UNDELETE:undelete(2):fm +335:AUE_DARWIN_GETATTRLIST:getattrlist():fa +336:AUE_DARWIN_SETATTRLIST:setattrlist():fm +337:AUE_DARWIN_GETDIRENTRIESATTR:getdirentriesattr():fa +338:AUE_DARWIN_EXCHANGEDATA:exchangedata():fw +339:AUE_DARWIN_SEARCHFS:searchfs():fa +340:AUE_DARWIN_MINHERIT:minherit(2):pc +341:AUE_DARWIN_SEMCONFIG:semconfig():ip +342:AUE_DARWIN_SEMOPEN:sem_open(2):ip +343:AUE_DARWIN_SEMCLOSE:sem_close(2):ip +344:AUE_DARWIN_SEMUNLINK:sem_unlink(2):ip +345:AUE_DARWIN_SHMOPEN:shm_open(2):ip +346:AUE_DARWIN_SHMUNLINK:shm_unlink(2):ip +347:AUE_DARWIN_LOADSHFILE:load_shared_file():fr +348:AUE_DARWIN_RESETSHFILE:reset_shared_file():ot +349:AUE_DARWIN_NEWSYSTEMSHREG:new_system_share_regions():ot +350:AUE_DARWIN_PTHREADKILL:pthread_kill(2):pc +351:AUE_DARWIN_PTHREADSIGMASK:pthread_sigmask(2):pc +352:AUE_DARWIN_AUDITCTL:auditctl(2):ad +353:AUE_DARWIN_RFORK:rfork(2):pc +354:AUE_DARWIN_LCHMOD:lchmod(2):fm +355:AUE_DARWIN_SWAPOFF:swapoff():ad +356:AUE_DARWIN_INITPROCESS:init_process():pc +357:AUE_DARWIN_MAPFD:map_fd():fa +358:AUE_DARWIN_TASKFORPID:task_for_pid():pc +359:AUE_DARWIN_PIDFORTASK:pid_for_task():pc +360:AUE_DARWIN_SYSCTL_NONADMIN:sysctl() - non-admin:ot +361:AUE_DARWIN_COPYFILE:copyfile():fr,fw +# +# OpenBSM-specific kernel events. +# +43001:AUE_GETFSSTAT:getfsstat(2):fa +43002:AUE_PTRACE:ptrace(2):pc +43003:AUE_CHFLAGS:chflags(2):fm +43004:AUE_FCHFLAGS:fchflags(2):fm +43005:AUE_PROFILE:profil(2):pc +43006:AUE_KTRACE:ktrace(2):pc +43007:AUE_SETLOGIN:setlogin(2):pc +43008:AUE_REVOKE:revoke(2):cl +43009:AUE_UMASK:umask(2):pc +43010:AUE_MPROTECT:mprotect(2):fm +43011:AUE_MKFIFO:mkfifo(2):fc +43012:AUE_POLL:poll(2):no +43013:AUE_FUTIMES:futimes(2):fm +43014:AUE_SETSID:setsid(2):pc +43015:AUE_SETPRIVEXEC:setprivexec(2):pc +43016:AUE_ADDPROFILE:system call:pc +43017:AUE_KDEBUGTRACE:system call:pc +43018:AUE_FSTAT:fstat(2):fa +43019:AUE_FPATHCONF:fpathconf(2):fa +43020:AUE_GETDIRENTRIES:getdirentries(2):fr +43021:AUE_SYSCTL:sysctl(3):ad +43022:AUE_MLOCK:mlock(2):pc +43023:AUE_MUNLOCK:munlock(2):pc +43024:AUE_UNDELETE:undelete(2):fm +43025:AUE_GETATTRLIST:getattrlist():fa +43026:AUE_SETATTRLIST:setattrlist():fm +43027:AUE_GETDIRENTRIESATTR:getdirentriesattr():fa +43028:AUE_EXCHANGEDATA:exchangedata():fw +43029:AUE_SEARCHFS:searchfs():fa +43030:AUE_MINHERIT:minherit(2):pc +43031:AUE_SEMCONFIG:semconfig():ip +43032:AUE_SEMOPEN:sem_open(2):ip +43033:AUE_SEMCLOSE:sem_close(2):ip +43034:AUE_SEMUNLINK:sem_unlink(2):ip +43035:AUE_SHMOPEN:shm_open(2):ip +43036:AUE_SHMUNLINK:shm_unlink(2):ip +43037:AUE_LOADSHFILE:load_shared_file():fr +43038:AUE_RESETSHFILE:reset_shared_file():ot +43039:AUE_NEWSYSTEMSHREG:new_system_share_regions():ot +43040:AUE_PTHREADKILL:pthread_kill(2):pc +43041:AUE_PTHREADSIGMASK:pthread_sigmask(2):pc +43042:AUE_AUDITCTL:auditctl(2):ad +43043:AUE_RFORK:rfork(2):pc +43044:AUE_LCHMOD:lchmod(2):fm +43045:AUE_SWAPOFF:swapoff():ad +43046:AUE_INITPROCESS:init_process():pc +43047:AUE_MAPFD:map_fd():fa +43048:AUE_TASKFORPID:task_for_pid():pc +43049:AUE_PIDFORTASK:pid_for_task():pc +43050:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot +43051:AUE_COPYFILE:copyfile():fr,fw +43052:AUE_LUTIMES:lutimes(2):fm +43053:AUE_LCHFLAGS:lchflags(2):fm +43054:AUE_SENDFILE:sendfile(2):nt +43055:AUE_USELIB:uselib(2):fa +43056:AUE_GETRESUID:getresuid(2):pc +43057:AUE_SETRESUID:setresuid(2):pc +43058:AUE_GETRESGID:getresgid(2):pc +43059:AUE_SETRESGID:setresgid(2):pc +43060:AUE_WAIT4:wait4(2):pc +43061:AUE_LGETFH:lgetfh(2):fa +43062:AUE_FHSTATFS:fhstatfs(2):fa +43063:AUE_FHOPEN:fhopen(2):fa +43064:AUE_FHSTAT:fhstat(2):fa +43065:AUE_JAIL:jail(2):pc +43066:AUE_EACCESS:eaccess(2):fa +43067:AUE_KQUEUE:kqueue(2):no +43068:AUE_KEVENT:kevent(2):no +43069:AUE_FSYNC:fsync(2):fm +43070:AUE_NMOUNT:nmount(2):ad +43071:AUE_BDFLUSH:bdflush(2):ad +43072:AUE_SETFSUID:setfsuid(2):ot +43073:AUE_SETFSGID:setfsgid(2):ot +43074:AUE_PERSONALITY:personality(2):pc +43075:AUE_SCHED_GETSCHEDULER:getscheduler(2):ad +43076:AUE_SCHED_SETSCHEDULER:setscheduler(2):ad +43077:AUE_PRCTL:prctl(2):pc +43078:AUE_GETCWD:getcwd(2):pc +43079:AUE_CAPGET:capget(2):pc +43080:AUE_CAPSET:capset(2):pc +43081:AUE_PIVOT_ROOT:pivot_root(2):pc +43082:AUE_RTPRIO::rtprio(2):pc +43083:AUE_SCHED_GETPARAM:sched_getparam(2):ad +43084:AUE_SCHED_SETPARAM:sched_setparam(2):ad +43085:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad +43086:AUE_SCHED_GET_PRIORITY_MIN:sched_get_priority_min(2):ad +43087:AUE_SCHED_RR_GET_INTERVAL:sched_rr_get_interval(2):ad +43088:AUE_ACL_GET_FILE:acl_get_file(2):fa +43089:AUE_ACL_SET_FILE:acl_set_file(2):fm +43090:AUE_ACL_GET_FD:acl_get_fd(2):fa +43091:AUE_ACL_SET_FD:acl_set_fd(2):fm +43092:AUE_ACL_DELETE_FILE:acl_delete_file(2):fm +43093:AUE_ACL_DELETE_FD:acl_delete_fd(2):fm +43094:AUE_ACL_CHECK_FILE:acl_aclcheck_file(2):fa +43095:AUE_ACL_CHECK_FD:acl_aclcheck_fd(2):fa +43096:AUE_ACL_GET_LINK:acl_get_link(2):fa +43097:AUE_ACL_SET_LINK:acl_set_link(2):fm +43098:AUE_ACL_DELETE_LINK:acl_delete_link(2):fm +43099:AUE_ACL_CHECK_LINK:acl_aclcheck_link(2):fa +43100:AUE_SYSARCH:sysarch(2):na +43101:AUE_EXTATTRCTL:extattrctl(2):fm +43102:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa +43103:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm +43104:AUE_EXTATTR_LIST_FILE:extattr_list_file(2):fa +43105:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm +43106:AUE_EXTATTR_GET_FD:extattr_get_fd(2):fa +43107:AUE_EXTATTR_SET_FD:extattr_set_fd(2):fm +43108:AUE_EXTATTR_LIST_FD:extattr_list_fd(2):fa +43109:AUE_EXTATTR_DELETE_FD:extattr_delete_fd(2):fm +43110:AUE_EXTATTR_GET_LINK:extattr_get_link(2):fa +43111:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm +43112:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa +43113:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm +# +# User space system events. +# 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 13:51:32 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E3A816A4EB for ; Sat, 5 Aug 2006 13:51:32 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA42543D45 for ; Sat, 5 Aug 2006 13:51:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C1EFD46CE8 for ; Sat, 5 Aug 2006 09:51:25 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2374B5621F; Sat, 5 Aug 2006 13:51:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BC8B16A4DF; Sat, 5 Aug 2006 13:51:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B147516A4DD for ; Sat, 5 Aug 2006 13:51:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3844B43D46 for ; Sat, 5 Aug 2006 13:51:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75DpOnJ070197 for ; Sat, 5 Aug 2006 13:51:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75DpNnM070194 for perforce@freebsd.org; Sat, 5 Aug 2006 13:51:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 13:51:23 GMT Message-Id: <200608051351.k75DpNnM070194@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 103243 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 13:51:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=103243 Change 103243 by rwatson@rwatson_fledge on 2006/08/05 13:51:01 De-google-ad, they appear not to be effective and certainly don't make the page prettier. Affected files ... .. //depot/projects/trustedbsd/www/sidebar.xml#7 edit Differences ... ==== //depot/projects/trustedbsd/www/sidebar.xml#7 (text+ko) ==== @@ -15,25 +15,6 @@
  • SEDarwin
  • UFS2
    • -



    -
    - - -
    @@ -51,63 +32,9 @@
  • SEDarwin
  • UFS2
    • -



    -
    - - - - -
    -



    -
    - - -
    @@ -115,57 +42,6 @@
  • Documentation
  • Implementation Papers
    • -



    -
    - - - - - - -
    @@ -173,63 +49,9 @@
  • TrustedBSD Mailing Lists
  • POSIX.1e Mailing Lists
    • -



    -
    - - -
    -



    -
    - - - - -
    From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 14:22:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D3AA16A4DF for ; Sat, 5 Aug 2006 14:22:59 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DFAB43D45 for ; Sat, 5 Aug 2006 14:22:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B15CA46B98 for ; Sat, 5 Aug 2006 10:22:55 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1C30355ED3; Sat, 5 Aug 2006 14:22:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1481616A4DF; Sat, 5 Aug 2006 14:22:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C5C5C16A4DE for ; Sat, 5 Aug 2006 14:22:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 404B343D49 for ; Sat, 5 Aug 2006 14:22:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75EMnUR074026 for ; Sat, 5 Aug 2006 14:22:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75EM3je073355 for perforce@freebsd.org; Sat, 5 Aug 2006 14:22:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 14:22:03 GMT Message-Id: <200608051422.k75EM3je073355@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 103245 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 14:22:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=103245 Change 103245 by rwatson@rwatson_zoo on 2006/08/05 14:21:26 Integrate TrustedBSD base branch from FreeBSD CVS: - OpenSSL 0.9.8b update. - More de-alpha. - powermac nvram driver - libarchive optimization - resolver update - mac_is_present.3 rename - more thread scheduler apis - INET6 more conditionally buildable in userspace - non-mpsafe system calls eliminated, no more mpsafe system call flag - ia64 stack unwinder update - 802.11 raw frame send support - stge(4) - em(4), mpt(4), bridge(4) updates - kern_acl.c split into type-independent kern_acl.c and POSIX.1e-specific subr_acl_posix1e.c. - MTX_DESTROYED, per-thread lock counter, various other debugging things. - pru_close - sosend/soreceive/sopoll _generic versions, all consumers through the functions rather than function pointers - uipc_sockbuf.c - Loop back extattr auditing - bpf multi-descriptor timestamp optimization - inpcb locks init/destroy only when pcb moves in and out of zone cache, not every connection. - Loop back mpo_associate_nfsd_label - Beginning of dtrace hooks - No more debug.mpsafevm - firmware - spibus - much bsnmp Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#41 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#74 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#10 integrate .. //depot/projects/trustedbsd/base/UPDATING#68 integrate .. //depot/projects/trustedbsd/base/bin/dd/Makefile#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/histedit.c#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#16 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#25 integrate .. //depot/projects/trustedbsd/base/bin/test/test.1#7 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/Configure#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FAQ#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/INSTALL#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/LICENSE#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.org#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/NEWS#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/PROBLEMS#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/README#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl.in#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/asn1pars.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ca.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ciphers.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/crl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/der_chop#7 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dgst.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dh.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dhparam.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dsa.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dsaparam.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/apps/enc.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/engine.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/gendh.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/gendsa.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/genrsa.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ocsp.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.cnf#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/passwd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs12.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/progs.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/progs.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rand.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/req.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsa.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsautl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_apps.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_cb.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_client.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_server.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_socket.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_time.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/sess_id.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/smime.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/speed.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/spkac.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/timeouts.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/apps/verify.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/version.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/x509.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/bugs/VC16.bug#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/ICE-CA.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/ICE-root.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/ICE-user.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/ICE.crl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/RegTP-4R.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/argena.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/argeng.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/ca-cert.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/ca-cert.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/dsa-ca.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/dsa-pca.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/nortelCA.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/pca-cert.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/timCA.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/tjhCA.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/demo/vsigntca.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/dsa-ca.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/dsa-pca.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/expired/RegTP-4R.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/expired/factory.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/expired/rsa-cca.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/expired/vsign2.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/factory.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/nortelCA.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/pca-cert.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/rsa-cca.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/timCA.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/tjhCA.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/vsign2.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/vsigntca.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/wellsfgo.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/comm.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/comms.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/config#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_nyi.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_unix.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_vms.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_win.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_win32.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/LPdir_wince.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_cbc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_cfb.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_core.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/asm/aes-586.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/asm/aes-ia64.S#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bitstr.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bool.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bytes.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_d2i_fp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_digest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_dup.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_enum.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_gentm.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_hdr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_i2d_fp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_int.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_mbstr.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_meth.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_object.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_octet.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_print.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_set.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_sign.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_strex.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_type.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_utctm.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_verify.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_gen.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_mac.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_par.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1t.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn_moid.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn_pack.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_pr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_pu.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/evp_asn1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_pr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_pu.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/n_pkey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p5_pbe.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p5_pbev2.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_bitst.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_crl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_pkey.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_req.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_spki.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_x509.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_dec.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_fre.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_new.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_typ.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_utl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_bignum.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_crl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_long.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_name.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_pkey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_pubkey.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_x509.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_x509a.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bf_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bf_opts.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bfspeed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bftest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_dump.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_print.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_sock.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bf_nbio.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_lcl.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_acpt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_conn.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_dgram.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_fd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_file.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_log.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_sock.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.s#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.s.works#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/add.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/div.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/add.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/div.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/mul.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/sqr.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/alpha/sub.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/bn-586.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/bn-alpha.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/ca.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/co-alpha.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/mips1.s#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/pa-risc.s#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/ppc.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/r3000.s#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/sparcv8plus.S#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_add.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_asm.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_blind.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_const.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_ctx.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_depr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_div.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_exp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_exp2.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_gcd.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_gf2m.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_kron.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_lcl.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mod.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mont.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mpi.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mul.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_nist.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_prime.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_prime.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_print.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_rand.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_recp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_shift.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_sqr.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_sqrt.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_word.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bntest.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/expspeed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/exptest.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/buf_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/buffer.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/buffer.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/cast.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/cast_lcl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/cast_spd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/castopts.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/casttest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/c_zlib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/comp.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/comp_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/comp_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_def.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_mod.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cpt_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/crypto.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cversion.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/FILES0#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/asm/des_enc.m4#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cfb64ede.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cfb_enc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_old.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_old.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_opts.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/destest.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ecb3_enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ede_cbcm_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/fcrypt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/read2pwd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/set_key.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/speed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/str2key.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_check.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_depr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_err.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_gen.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_key.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dhtest.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_depr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_gen.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_key.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_ossl.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_sign.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_vrf.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsatest.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_dl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_dlfcn.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_null.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ebcdic.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec2_mult.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec2_smpl.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec2_smpt.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_asn1.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_check.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_curve.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_cvt.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_key.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_lcl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_mult.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_print.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_mont.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_nist.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_recp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_smpl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ectest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ecdh.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ecdhtest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_key.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_locl.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdh/ech_ossl.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecdsa.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecdsatest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_asn1.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_locl.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_ossl.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_sign.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ecdsa/ecs_vrf.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_all.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_cnf.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_cryptodev.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_ctrl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_dyn.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_fat.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_init.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_int.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_list.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_openssl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_padlock.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_pkey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_table.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/engine.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/enginetest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw.ec#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_4758_cca.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_4758_cca_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_4758_cca_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_aep.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_aep_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_aep_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_atalla.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_atalla_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_atalla_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cryptodev.c#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cswift.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cswift_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cswift_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ncipher.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ncipher_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ncipher_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_nuron.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_nuron_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_nuron_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_sureware.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_sureware_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_sureware_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ubsec.c#3 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ubsec_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ubsec_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_cipher.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_dh.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_digest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_dsa.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_ecdh.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_ecdsa.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_rand.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_rsa.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_store.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/aep.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/atalla.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/cswift.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/sureware.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err_all.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err_prn.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/openssl.ec#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_b64.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_enc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_md.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_ok.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_all.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_alld.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/digest.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_aes.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_bf.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cast.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_des.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_des3.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_idea.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_null.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_old.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_rc2.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_rc4.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_rc5.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_xcbc_d.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/encode.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_key.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_pbe.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_pkey.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evptests.txt#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_dss.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_dss1.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_ecdsa.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_md2.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_md4.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_md5.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_mdc2.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_null.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_ripemd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_sha.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_sha1.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/names.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p5_crpt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p5_crpt2.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_dec.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_open.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_seal.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_verify.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ex_data.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/hmac.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/hmac.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ia64cpuid.S#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/i_skey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/idea.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/idea_spd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/ideatest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/krb5/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/krb5/krb5_asn.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/lhash.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/lhash.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2_dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2test.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md32_common.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4_dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5_dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5_locl.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/mdc2.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/mdc2_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/mdc2dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/mdc2test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mem.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mem_clr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mem_dbg.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_dir.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_dir.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_dir_test.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_str.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_str.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/o_names.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.pl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_mac.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_mac.num#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/objects.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/objects.txt#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_cl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_ext.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_prn.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslconf.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslconf.h.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslv.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ossl_typ.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_all.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_info.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_lib.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_oth.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_pk8.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_pkey.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_seal.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_xaux.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/alpha.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/cbc.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86asm.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86ms.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86nasm.pl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86unix.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_add.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_crpt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_crt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_decr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_init.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_key.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_kiss.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_mutl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_npas.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/pk12err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/pkcs12.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/bio_ber.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/example.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_asn1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_attr.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_doit.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_mime.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_smime.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pkcs7.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pkcs7err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pqueue/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pqueue/pq_compat.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pqueue/pq_test.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pqueue/pqueue.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pqueue/pqueue.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/md_rand.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_egd.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_nw.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_unix.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_vms.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_win.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/randfile.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/randtest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/rc2.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/rc2_skey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/rc2speed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/rc2test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/asm/rc4-586.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/asm/rc4-ia64.S#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4_skey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4speed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/rc4test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/rc5.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/rc5_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/rc5speed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/ripemd.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/rmd_dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/rmd_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/rmd_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/rmdtest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_asn1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_chk.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_depr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_eay.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_gen.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_lib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_null.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_oaep.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_pss.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_saos.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_sign.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_test.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_x931.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/asm/sha1-586.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/asm/sha1-ia64.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/asm/sha512-ia64.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/asm/sha512-sse2.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha1_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha1dgst.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha1test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha256.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha256t.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha512.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha512t.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha_dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha_locl.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha_one.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/shatest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sparccpuid.S#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/safestack.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/stack.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/stack.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/store.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/str_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/str_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/str_locl.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/str_mem.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/store/str_meth.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/symhacks.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/threads/mttest.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/threads/th-lock.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/tmdiff.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/tmdiff.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/txt_db.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/txt_db.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/ui_util.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/uid.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/by_dir.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/by_file.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_att.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_cmp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_lu.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_r2x.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_req.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_trs.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_txt.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_v3.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vfy.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vfy.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vpm.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509cset.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509name.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509spki.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509type.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x_all.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/ext_dat.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_cache.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_data.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_int.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_map.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_node.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/pcy_tree.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_akey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_alt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_bitst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_conf.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_cpols.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_extku.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_ia5.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_info.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_int.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_ncons.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pci.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pcia.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pcons.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_pmaps.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_prn.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_purp.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_skey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_sxnet.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_utl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/x509v3.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x86_64cpuid.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x86cpuid.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/easy_tls/easy-tls.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/engines/zencod/hw_zencod.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/ssltest-ecc/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/ssltest-ecc/ssltest.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/autoungunk.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/cb.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/configure.in#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/test.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/tunala.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/tunala/tunala.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/HOWTO/certificates.txt#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/HOWTO/keys.txt#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/HOWTO/proxy_certificates.txt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/CA.pl.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/asn1parse.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/ca.pod#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/config.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/dgst.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/ec.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/ecparam.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/enc.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/errstr.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/req.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/s_client.pod#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/s_server.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/x509.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/x509v3_config.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BIO_f_base64.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BN_BLINDING_new.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BN_add_word.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BN_new.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ERR_error_string.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ERR_set_mark.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_DigestInit.pod#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_SealInit.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_SignInit.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/OPENSSL_Applink.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/OPENSSL_config.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/PKCS12_create.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/PKCS7_sign.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/PKCS7_verify.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/RSA_sign.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/blowfish.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/bn.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/bn_internal.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/d2i_X509.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/des_modes.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/ecdsa.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/engine.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/hmac.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/threads.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/x509.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/fingerprints.txt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/openssl.txt#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_ciphers.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_current_cipher.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_default_timeout.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_error.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_fd.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_session.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_verify_result.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_version.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_pending.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_set_shutdown.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_shutdown.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_state_string.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_want.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/ssl.pod#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssleay.txt#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/standards.txt#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/e_os.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/e_os2.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/engines/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/axp.opt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_4758cca.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_4758cca.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_4758cca_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_4758cca_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_aep.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_aep.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_aep_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_aep_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_atalla.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_atalla.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_atalla_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_atalla_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_chil.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_chil.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_chil_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_chil_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_cswift.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_cswift.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_cswift_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_cswift_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_gmp.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_gmp.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_gmp_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_gmp_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_nuron.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_nuron.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_nuron_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_nuron_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_sureware.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_sureware.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_sureware_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_sureware_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_ubsec.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_ubsec.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_ubsec_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/e_ubsec_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/engine_vector.mar#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vax.opt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/aep.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/atalla.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/cswift.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/hw_4758_cca.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/hw_ubsec.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/hwcryptohook.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/engines/vendor_defns/sureware.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/openssl.spec#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/bio_ssl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_both.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_clnt.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_enc.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_meth.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_pkt.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_srvr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/dtls1.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/kssl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/kssl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_clnt.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_meth.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_srvr.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_clnt.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_enc.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_lib.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_meth.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_srvr.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_both.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_clnt.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_enc.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_lib.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_meth.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_pkt.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_srvr.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl3.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_algs.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_asn1.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_cert.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_ciph.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_err.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_lib.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_locl.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_rsa.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_sess.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_txt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssltest.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/t1_clnt.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 14:33:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD4A316A55D for ; Sat, 5 Aug 2006 14:33:04 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 52DFB43D53 for ; Sat, 5 Aug 2006 14:33:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6906346B92 for ; Sat, 5 Aug 2006 10:33:03 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CF5625683A; Sat, 5 Aug 2006 14:33:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C803B16A4E1; Sat, 5 Aug 2006 14:33:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8879916A4DF for ; Sat, 5 Aug 2006 14:33:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10ACC43D53 for ; Sat, 5 Aug 2006 14:33: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.6/8.13.6) with ESMTP id k75EX1sK082623 for ; Sat, 5 Aug 2006 14:33:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75EX1O1082610 for perforce@freebsd.org; Sat, 5 Aug 2006 14:33:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 14:33:01 GMT Message-Id: <200608051433.k75EX1O1082610@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 103246 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 14:33:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=103246 Change 103246 by rwatson@rwatson_fledge on 2006/08/05 14:32:56 Combine UFS2/EA links into a single link, since they are a single section. Affected files ... .. //depot/projects/trustedbsd/www/components.page#6 edit .. //depot/projects/trustedbsd/www/sidebar.xml#8 edit Differences ... ==== //depot/projects/trustedbsd/www/components.page#6 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/components.page#5 $ + $P4: //depot/projects/trustedbsd/www/components.page#6 $ @@ -117,7 +117,6 @@ -

    Extended Attributes and UFS2

    ==== //depot/projects/trustedbsd/www/sidebar.xml#8 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,7 +21,7 @@ From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 14:40:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C41516A4E5 for ; Sat, 5 Aug 2006 14:40:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AE2443D46 for ; Sat, 5 Aug 2006 14:40:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D9F2246BB0 for ; Sat, 5 Aug 2006 10:40:55 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8F88D5573B; Sat, 5 Aug 2006 14:40:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8787D16A4E0; Sat, 5 Aug 2006 14:40:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6447E16A4DD for ; Sat, 5 Aug 2006 14:40:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B05943D4C for ; Sat, 5 Aug 2006 14:40: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.6/8.13.6) with ESMTP id k75EeAvY088477 for ; Sat, 5 Aug 2006 14:40:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75EeAYd088474 for perforce@freebsd.org; Sat, 5 Aug 2006 14:40:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 14:40:10 GMT Message-Id: <200608051440.k75EeAYd088474@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 103247 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 14:40:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=103247 Change 103247 by rwatson@rwatson_fledge on 2006/08/05 14:39:45 Update mailing list web page for new posix.1e mailing list and archive location, match formatting for other mailing lists. Affected files ... .. //depot/projects/trustedbsd/www/mailinglists.page#3 edit Differences ... ==== //depot/projects/trustedbsd/www/mailinglists.page#3 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/mailinglists.page#2 $ + $P4: //depot/projects/trustedbsd/www/mailinglists.page#3 $ @@ -123,18 +123,14 @@ href="http://wt.xpilot.org/publications/posix.1e">http://wt.xpilot.org/publications/posix.1e, where a draft may also be downloaded.

    -

    The mailing list can be subscribed to by sending email to posix1e-request@cyrus.watson.org - with a body of:

    +
    +
    posix1e
    -
    - 
    subscribe
    -
    +

    POSIX.1e mailing list, intended for discussion of the now + defunct POSIX.1e draft standard. Web mailing list archives are available.

    +
    +
    -

    Mailing list archives will be available in the near future; in the - mean time, they may be accessed via the web-based mailing list - archives at securityfocus.com.

    From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 15:00:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 815DE16A4E0 for ; Sat, 5 Aug 2006 15:00:38 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3DDE43D49 for ; Sat, 5 Aug 2006 15:00:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 14F1A46BC0 for ; Sat, 5 Aug 2006 11:00:35 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6121355F90; Sat, 5 Aug 2006 15:00:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A1DC16A4E0; Sat, 5 Aug 2006 15:00:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F22F216A4DA for ; Sat, 5 Aug 2006 15:00:18 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6334843D45 for ; Sat, 5 Aug 2006 15:00:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75F0IDs090127 for ; Sat, 5 Aug 2006 15:00:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75Exacu089525 for perforce@freebsd.org; Sat, 5 Aug 2006 14:59:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 14:59:36 GMT Message-Id: <200608051459.k75Exacu089525@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 103249 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 15:00:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=103249 Change 103249 by rwatson@rwatson_zoo on 2006/08/05 14:59:29 Integrate TrustedBSD audit3 from TrustedBSD base branch. See change set @103245 for a complete description of merged changes. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#11 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#11 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#6 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#12 integrate .. //depot/projects/trustedbsd/audit3/bin/dd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/histedit.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/parser.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/sh.1#8 integrate .. //depot/projects/trustedbsd/audit3/bin/test/test.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/texinfo/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/CHANGES#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/Configure#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/FAQ#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/INSTALL#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/LICENSE#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/NEWS#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/PROBLEMS#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/README#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/CA.pl.in#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/apps.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/apps.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/asn1pars.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/ca.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/ciphers.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/crl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/der_chop#3 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/dgst.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/dh.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/dhparam.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/dsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/dsaparam.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/gendh.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/gendsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/genrsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/openssl.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/openssl.cnf#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/passwd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/progs.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/rand.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/req.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/rsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/rsautl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_apps.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_cb.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_client.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_socket.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/s_time.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/sess_id.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/smime.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/timeouts.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/version.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/apps/x509.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/bugs/VC16.bug#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/ICE-CA.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/ICE-root.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/ICE-user.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/ICE.crl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/RegTP-4R.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/argena.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/argeng.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/ca-cert.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/ca-cert.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/dsa-ca.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/dsa-pca.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/nortelCA.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/pca-cert.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/timCA.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/tjhCA.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/demo/vsigntca.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/dsa-ca.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/dsa-pca.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/expired/RegTP-4R.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/expired/factory.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/expired/rsa-cca.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/expired/vsign2.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/factory.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/nortelCA.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/pca-cert.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/rsa-cca.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/timCA.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/tjhCA.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/vsign2.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/vsigntca.pem#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/certs/wellsfgo.pem#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/comm.txt#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/comms.txt#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/config#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_nyi.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_unix.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_vms.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_win.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_win32.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/LPdir_wince.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/aes.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/aes_cfb.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/aes_core.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/aes_locl.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/asm/aes-586.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/aes/asm/aes-ia64.S#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_bitstr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_bool.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_bytes.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_d2i_fp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_digest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_dup.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_enum.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_gentm.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_hdr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_i2d_fp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_int.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_meth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_object.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_octet.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_print.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_set.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_sign.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_strex.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_type.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_utctm.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/a_verify.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1_gen.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1_mac.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1_par.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn1t.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/asn_pack.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/d2i_pr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/d2i_pu.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/evp_asn1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/i2d_pr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/i2d_pu.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/n_pkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/p5_pbe.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/p5_pbev2.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_bitst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_crl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_pkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_req.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_spki.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/t_x509.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_fre.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_new.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_typ.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/tasn_utl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_bignum.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_crl.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_name.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_pkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_pubkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_x509.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/asn1/x_x509a.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bf/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bf/bf_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bf/bf_opts.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bf/bfspeed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bf/bftest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/b_print.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/b_sock.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bf_nbio.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bio.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bio_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bio_lcl.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bio_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_acpt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_conn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_dgram.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_fd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_file.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_log.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bio/bss_sock.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.s#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.s.works#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/add.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/div.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/add.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/div.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/mul.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/sqr.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/alpha/sub.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/bn-586.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/bn-alpha.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/ca.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/co-alpha.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/mips1.s#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/pa-risc.s#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/ppc.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/r3000.s#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/sparcv8plus.S#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_add.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_asm.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_blind.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_const.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_ctx.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_depr.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_div.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_exp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_exp2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_gcd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_gf2m.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_kron.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_lcl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_mod.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_mont.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_mpi.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_mul.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_nist.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_prime.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_prime.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_rand.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_recp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_shift.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_sqr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_sqrt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bn_word.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/bntest.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/expspeed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/bn/exptest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/buffer/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/buffer/buf_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/buffer/buffer.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/buffer/buffer.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/cast.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/cast_lcl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/cast_spd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/castopts.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cast/casttest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/comp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/comp/c_zlib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/comp/comp.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/comp/comp_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/comp/comp_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/conf.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/conf_def.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/conf_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/conf_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cpt_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cryptlib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cryptlib.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/crypto.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/cversion.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/FILES0#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/asm/des_enc.m4#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/cfb64ede.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/cfb_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des_enc.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des_old.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des_old.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/des_opts.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/destest.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/ecb3_enc.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/ede_cbcm_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/fcrypt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/read2pwd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/set_key.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/speed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/des/str2key.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh_check.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh_depr.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh_gen.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dh_key.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dh/dhtest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_depr.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_gen.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_key.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_ossl.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_sign.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsa_vrf.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dsa/dsatest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso_dl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso_dlfcn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/dso/dso_null.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ebcdic.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec2_mult.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec2_smpl.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec2_smpt.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_asn1.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_check.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_curve.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_cvt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_key.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_lcl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_mult.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ec_print.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ecp_mont.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ecp_nist.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ecp_recp.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ec/ectest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ecdh.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ecdhtest.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ech_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ech_key.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ech_lib.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ech_locl.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdh/ech_ossl.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecdsa.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecdsatest.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_asn1.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_lib.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_locl.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_ossl.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_sign.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ecdsa/ecs_vrf.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_all.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_cnf.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_cryptodev.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_dyn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_init.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_int.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_list.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_openssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_padlock.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_pkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/eng_table.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/engine.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/enginetest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw.ec#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_4758_cca.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_4758_cca_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_4758_cca_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_aep.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_aep_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_aep_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_atalla.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_atalla_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_atalla_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_cryptodev.c#3 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_cswift.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_cswift_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_cswift_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ncipher.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ncipher_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ncipher_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_nuron.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_nuron_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_nuron_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_sureware.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_sureware_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_sureware_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ubsec.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ubsec_err.c#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/hw_ubsec_err.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_cipher.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_dh.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_digest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_dsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_ecdh.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_ecdsa.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_rand.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_rsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/tb_store.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/aep.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/atalla.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/cswift.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/engine/vendor_defns/sureware.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/err.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/err.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/err_all.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/err_prn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/err/openssl.ec#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/bio_b64.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/bio_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/bio_md.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/bio_ok.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/c_all.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/c_alld.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/digest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_aes.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_bf.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_cast.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_des.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_des3.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_idea.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_null.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_old.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_rc2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_rc4.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_rc5.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/e_xcbc_d.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/encode.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_key.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_lib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_pbe.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_pkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evp_test.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/evptests.txt#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_dss.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_dss1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_ecdsa.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_md2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_md4.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_mdc2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_null.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_ripemd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_sha.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/m_sha1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/names.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p5_crpt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p5_crpt2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_dec.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_open.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_seal.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/evp/p_verify.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ex_data.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/hmac/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/hmac/hmac.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/hmac/hmac.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ia64cpuid.S#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/idea/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/idea/i_skey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/idea/idea.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/idea/idea_spd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/idea/ideatest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/krb5/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/krb5/krb5_asn.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/lhash/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/lhash/lhash.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/lhash/lhash.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md2/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md2/md2.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md2/md2_dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md2/md2_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md2/md2test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md32_common.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/md4.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/md4_dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/md4_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/md4_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md4/md4test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/md5.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/md5_dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/md5_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/md5_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/md5/md5test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mdc2/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mdc2/mdc2.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mdc2/mdc2_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mdc2/mdc2dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mdc2/mdc2test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mem.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mem_clr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/mem_dbg.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/o_dir.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/o_dir.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/o_dir_test.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/o_str.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/o_str.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/o_names.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_dat.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_dat.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/obj_mac.num#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/objects.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp_cl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ocsp/ocsp_prn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/opensslconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/opensslconf.h.in#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ossl_typ.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_all.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_info.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_oth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_pk8.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_pkey.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_seal.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pem/pem_xaux.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/alpha.pl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/cbc.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/x86asm.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/x86ms.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/x86nasm.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/perlasm/x86unix.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_add.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_crpt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_crt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_decr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_init.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_key.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_kiss.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_mutl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/p12_npas.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/pk12err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs12/pkcs12.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/bio_ber.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/example.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_asn1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_attr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_doit.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pk7_smime.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pkcs7.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pkcs7/pkcs7err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pqueue/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pqueue/pq_compat.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pqueue/pq_test.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pqueue/pqueue.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/pqueue/pqueue.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/md_rand.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_egd.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_err.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_lib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_nw.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_vms.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/rand_win.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/randfile.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rand/randtest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc2/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc2/rc2.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc2/rc2_skey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc2/rc2speed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc2/rc2test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/asm/rc4-586.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/asm/rc4-ia64.S#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4_skey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4speed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc4/rc4test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc5/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc5/rc5.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc5/rc5_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rc5/rc5speed.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/ripemd.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/rmd_dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/rmd_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/rmd_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ripemd/rmdtest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_asn1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_chk.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_depr.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_gen.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_null.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_oaep.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_pss.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_saos.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_sign.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/rsa/rsa_x931.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/asm/sha1-ia64.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/asm/sha512-ia64.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/asm/sha512-sse2.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha1_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha1dgst.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha1test.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha256.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha256t.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha512.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha512t.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha_dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/sha_one.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sha/shatest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/sparccpuid.S#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/stack/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/stack/safestack.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/stack/stack.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/stack/stack.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/README#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/store.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/str_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/str_lib.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/str_locl.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/str_mem.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/store/str_meth.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/symhacks.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/threads/mttest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/threads/th-lock.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/tmdiff.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/tmdiff.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/txt_db/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/txt_db/txt_db.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/txt_db/txt_db.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/ui/ui_util.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/uid.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/by_file.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_att.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_cmp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_lu.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_r2x.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_req.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_trs.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_txt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_v3.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_vfy.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_vfy.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509_vpm.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509cset.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509name.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509spki.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509/x_all.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/ext_dat.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_cache.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_data.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_int.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_lib.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_map.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_node.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/pcy_tree.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_akey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_alt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_bitst.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_conf.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_cpols.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_extku.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_ia5.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_info.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_int.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_ncons.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_pci.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_pcia.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_pcons.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_pmaps.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_prn.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_purp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_skey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_sxnet.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/v3err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x509v3/x509v3.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x86_64cpuid.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/crypto/x86cpuid.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/easy_tls/easy-tls.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/engines/zencod/hw_zencod.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/ssltest-ecc/README#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/ssltest-ecc/ssltest.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/autoungunk.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/cb.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/configure.in#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/test.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/tunala.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/demos/tunala/tunala.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/HOWTO/certificates.txt#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/HOWTO/keys.txt#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/HOWTO/proxy_certificates.txt#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/CA.pl.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/asn1parse.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/ca.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/dgst.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/ec.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/ecparam.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/enc.pod#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/errstr.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/req.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/s_client.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/s_server.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/x509.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/apps/x509v3_config.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/BN_BLINDING_new.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/BN_add_word.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/BN_new.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/ERR_error_string.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/ERR_set_mark.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/EVP_DigestInit.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/EVP_SealInit.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/EVP_SignInit.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/OPENSSL_Applink.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/OPENSSL_config.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/PKCS12_create.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/PKCS7_sign.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/PKCS7_verify.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/RSA_sign.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/blowfish.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/bn.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/bn_internal.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/d2i_X509.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/des_modes.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/ecdsa.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/engine.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/hmac.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/threads.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/crypto/x509.pod#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/fingerprints.txt#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/openssl.txt#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_ciphers.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_current_cipher.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_default_timeout.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_error.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_fd.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_session.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_verify_result.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_get_version.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_pending.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_set_shutdown.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_shutdown.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_state_string.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/SSL_want.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssl/ssl.pod#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/ssleay.txt#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/doc/standards.txt#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/e_os.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/e_os2.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/axp.opt#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_4758cca.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_4758cca.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_4758cca_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_4758cca_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_aep.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_aep.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_aep_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_aep_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_atalla.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_atalla.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_atalla_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_atalla_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_chil.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_chil.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_chil_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_chil_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_cswift.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_cswift.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_cswift_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_cswift_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_gmp.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_gmp.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_gmp_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_gmp_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_nuron.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_nuron.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_nuron_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_nuron_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_sureware.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_sureware.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_sureware_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_sureware_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_ubsec.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_ubsec.ec#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_ubsec_err.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/e_ubsec_err.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/engine_vector.mar#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vax.opt#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/aep.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/atalla.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/cswift.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/hw_4758_cca.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/hw_ubsec.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/hwcryptohook.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/engines/vendor_defns/sureware.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/openssl.spec#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/bio_ssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_both.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_clnt.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_enc.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_lib.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_meth.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_pkt.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/d1_srvr.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/dtls1.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/kssl.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s23_clnt.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s23_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s23_meth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s23_srvr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s2_clnt.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s2_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s2_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s2_meth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s2_srvr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_both.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_clnt.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_enc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_meth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl3.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_algs.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_asn1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_cert.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_ciph.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_err.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_lib.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_locl.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_rsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_sess.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssl_txt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/ssltest.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/t1_clnt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/t1_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/t1_meth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/t1_srvr.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/ssl/tls1.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/CAss.cnf#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/P1ss.cnf#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/P2ss.cnf#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/Uss.cnf#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/bctest#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/evptests.txt#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/tcrl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testca#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testenc#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testfipsssl#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testgen#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testss#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testssl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/testsslproxy#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/tpkcs7#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/tpkcs7d#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/treq#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/trsa#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/tsid#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/test/tx509#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/tools/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/util/ck_errf.pl#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/util/copy.pl#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssl/util/domd#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssl/util/extract-section.pl#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 15:09:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D24C16A55F for ; Sat, 5 Aug 2006 15:09:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92DD443D4C for ; Sat, 5 Aug 2006 15:09:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9551C46BB6 for ; Sat, 5 Aug 2006 11:09:32 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0BE8F55BE0; Sat, 5 Aug 2006 15:09:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 05B2416A4E1; Sat, 5 Aug 2006 15:09:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA20716A4DD for ; Sat, 5 Aug 2006 15:09:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8DFD43D55 for ; Sat, 5 Aug 2006 15:09: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.6/8.13.6) with ESMTP id k75F9UJA099121 for ; Sat, 5 Aug 2006 15:09:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75F9UQx099105 for perforce@freebsd.org; Sat, 5 Aug 2006 15:09:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 15:09:30 GMT Message-Id: <200608051509.k75F9UQx099105@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 103251 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 15:09:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=103251 Change 103251 by rwatson@rwatson_zoo on 2006/08/05 15:09:00 Merge additional OpenBSM 1.0a8 to audit3 branch: new token version, audit event ID assignments. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#23 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#19 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#8 (text+ko) ==== @@ -5,6 +5,11 @@ - Arguments to au_to_exec_args() and au_to_exec_env() no longer const. - Add kernel versions of au_to_exec_args() and au_to_exec_env(). - Fix exec argument type that is printed for env strings from 'arg' to 'env'. +- New OpenBSM token version number assigned, constants added for other + commonly seen version numbers. +- OpenBSM-specific events assigned numbers in the 43xxx range to avoid future + collisions with Solaris. Darwin events renamed to AUE_DARWIN_foo, as they + are now deprecated numberings. OpenBSM 1.0 alpha 7 @@ -183,4 +188,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#7 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#8 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#11 $ */ #include @@ -88,7 +88,7 @@ * Free our local list of directory names. */ static void -free_dir_q() +free_dir_q(void) { struct dir_ent *dirent; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#23 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#22 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#23 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -273,134 +273,200 @@ #define AUE_NTP_ADJTIME 288 /* - * Events not present in OpenSolaris BSM, generally derived from Apple Darwin - * BSM or added in OpenBSM. This start a little too close to the top end of - * the OpenSolaris event list for my comfort. + * Events added for Apple Darwin that potentially collide with future Solaris + * BSM events. These are assigned AUE_DARWIN prefixes, and are deprecated in + * new trails. Systems generating these events should switch to the new + * identifiers that avoid colliding with the Solaris identifier space. */ -#define AUE_GETFSSTAT 301 -#define AUE_PTRACE 302 -#define AUE_CHFLAGS 303 -#define AUE_FCHFLAGS 304 -#define AUE_PROFILE 305 -#define AUE_KTRACE 306 -#define AUE_SETLOGIN 307 +#define AUE_DARWIN_GETFSSTAT 301 +#define AUE_DARWIN_PTRACE 302 +#define AUE_DARWIN_CHFLAGS 303 +#define AUE_DARWIN_FCHFLAGS 304 +#define AUE_DARWIN_PROFILE 305 +#define AUE_DARWIN_KTRACE 306 +#define AUE_DARWIN_SETLOGIN 307 #define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */ -#define AUE_REVOKE 309 -#define AUE_UMASK 310 -#define AUE_MPROTECT 311 +#define AUE_DARWIN_REVOKE 309 +#define AUE_DARWIN_UMASK 310 +#define AUE_DARWIN_MPROTECT 311 #define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */ #define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */ #define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */ -#define AUE_MKFIFO 315 -#define AUE_POLL 316 +#define AUE_DARWIN_MKFIFO 315 +#define AUE_DARWIN_POLL 316 #define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ -#define AUE_FUTIMES 318 -#define AUE_SETSID 319 -#define AUE_SETPRIVEXEC 320 /* Darwin-specific. */ +#define AUE_DARWIN_FUTIMES 318 +#define AUE_DARWIN_SETSID 319 +#define AUE_DARWIN_SETPRIVEXEC 320 /* Darwin-specific. */ #define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ #define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ #define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ -#define AUE_ADDPROFILE 324 /* Darwin-specific. */ -#define AUE_KDEBUGTRACE 325 /* Darwin-specific. */ -#define AUE_KDBUGTRACE AUE_KDEBUGTRACE -#define AUE_FSTAT 326 -#define AUE_FPATHCONF 327 -#define AUE_GETDIRENTRIES 328 +#define AUE_DARWIN_ADDPROFILE 324 /* Darwin-specific. */ +#define AUE_DARWIN_KDEBUGTRACE 325 /* Darwin-specific. */ +#define AUE_DARWIN_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_DARWIN_FSTAT 326 +#define AUE_DARWIN_FPATHCONF 327 +#define AUE_DARWIN_GETDIRENTRIES 328 #define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */ #define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */ -#define AUE_SYSCTL 331 -#define AUE_MLOCK 332 -#define AUE_MUNLOCK 333 -#define AUE_UNDELETE 334 -#define AUE_GETATTRLIST 335 /* Darwin-specific. */ -#define AUE_SETATTRLIST 336 /* Darwin-specific. */ -#define AUE_GETDIRENTRIESATTR 337 /* Darwin-specific. */ -#define AUE_EXCHANGEDATA 338 /* Darwin-specific. */ -#define AUE_SEARCHFS 339 /* Darwin-specific. */ -#define AUE_MINHERIT 340 -#define AUE_SEMCONFIG 341 -#define AUE_SEMOPEN 342 -#define AUE_SEMCLOSE 343 -#define AUE_SEMUNLINK 344 -#define AUE_SHMOPEN 345 -#define AUE_SHMUNLINK 346 -#define AUE_LOADSHFILE 347 /* Darwin-specific. */ -#define AUE_RESETSHFILE 348 /* Darwin-specific. */ -#define AUE_NEWSYSTEMSHREG 349 /* Darwin-specific. */ -#define AUE_PTHREADKILL 350 /* Darwin-specific. */ -#define AUE_PTHREADSIGMASK 351 /* Darwin-specific. */ -#define AUE_AUDITCTL 352 -#define AUE_RFORK 353 -#define AUE_LCHMOD 354 -#define AUE_SWAPOFF 355 -#define AUE_INITPROCESS 356 /* Darwin-specific. */ -#define AUE_MAPFD 357 /* Darwin-specific. */ -#define AUE_TASKFORPID 358 /* Darwin-specific. */ -#define AUE_PIDFORTASK 359 /* Darwin-specific. */ -#define AUE_SYSCTL_NONADMIN 360 -#define AUE_COPYFILE 361 /* Darwin-specific. */ -#define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 363 /* FreeBSD-specific. */ -#define AUE_SENDFILE 364 /* BSD/Linux-specific. */ -#define AUE_USELIB 365 /* Linux-specific. */ -#define AUE_GETRESUID 366 -#define AUE_SETRESUID 367 -#define AUE_GETRESGID 368 -#define AUE_SETRESGID 369 -#define AUE_WAIT4 370 /* FreeBSD-specific. */ -#define AUE_LGETFH 371 /* FreeBSD-specific. */ -#define AUE_FHSTATFS 372 /* FreeBSD-specific. */ -#define AUE_FHOPEN 373 /* FreeBSD-specific. */ -#define AUE_FHSTAT 374 /* FreeBSD-specific. */ -#define AUE_JAIL 375 /* FreeBSD-specific. */ -#define AUE_EACCESS 376 /* FreeBSD-specific. */ -#define AUE_KQUEUE 377 /* FreeBSD-specific. */ -#define AUE_KEVENT 378 /* FreeBSD-specific. */ -#define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD-specific. */ -#define AUE_BDFLUSH 381 /* Linux-specific. */ -#define AUE_SETFSUID 382 /* Linux-specific. */ -#define AUE_SETFSGID 383 /* Linux-specific. */ -#define AUE_PERSONALITY 384 /* Linux-specific. */ -#define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ -#define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ -#define AUE_PRCTL 387 /* Linux-specific. */ -#define AUE_GETCWD 388 /* FreeBSD/Linux-specific. */ -#define AUE_CAPGET 389 /* Linux-specific. */ -#define AUE_CAPSET 390 /* Linux-specific. */ -#define AUE_PIVOT_ROOT 391 /* Linux-specific. */ -#define AUE_RTPRIO 392 /* FreeBSD-specific. */ -#define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ -#define AUE_SCHED_SETPARAM 394 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ -#define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ -#define AUE_ACL_GET_FILE 398 /* FreeBSD. */ -#define AUE_ACL_SET_FILE 399 /* FreeBSD. */ -#define AUE_ACL_GET_FD 400 /* FreeBSD. */ -#define AUE_ACL_SET_FD 401 /* FreeBSD. */ -#define AUE_ACL_DELETE_FILE 402 /* FreeBSD. */ -#define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ -#define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ -#define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ -#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ -#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ -#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ -#define AUE_SYSARCH 410 /* FreeBSD. */ -#define AUE_EXTATTRCTL 411 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ -#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ -#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ +#define AUE_DARWIN_SYSCTL 331 +#define AUE_DARWIN_MLOCK 332 +#define AUE_DARWIN_MUNLOCK 333 +#define AUE_DARWIN_UNDELETE 334 +#define AUE_DARWIN_GETATTRLIST 335 /* Darwin-specific. */ +#define AUE_DARWIN_SETATTRLIST 336 /* Darwin-specific. */ +#define AUE_DARWIN_GETDIRENTRIESATTR 337 /* Darwin-specific. */ +#define AUE_DARWIN_EXCHANGEDATA 338 /* Darwin-specific. */ +#define AUE_DARWIN_SEARCHFS 339 /* Darwin-specific. */ +#define AUE_DARWIN_MINHERIT 340 +#define AUE_DARWIN_SEMCONFIG 341 +#define AUE_DARWIN_SEMOPEN 342 +#define AUE_DARWIN_SEMCLOSE 343 +#define AUE_DARWIN_SEMUNLINK 344 +#define AUE_DARWIN_SHMOPEN 345 +#define AUE_DARWIN_SHMUNLINK 346 +#define AUE_DARWIN_LOADSHFILE 347 /* Darwin-specific. */ +#define AUE_DARWIN_RESETSHFILE 348 /* Darwin-specific. */ +#define AUE_DARWIN_NEWSYSTEMSHREG 349 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADKILL 350 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADSIGMASK 351 /* Darwin-specific. */ +#define AUE_DARWIN_AUDITCTL 352 +#define AUE_DARWIN_RFORK 353 +#define AUE_DARWIN_LCHMOD 354 +#define AUE_DARWIN_SWAPOFF 355 +#define AUE_DARWIN_INITPROCESS 356 /* Darwin-specific. */ +#define AUE_DARWIN_MAPFD 357 /* Darwin-specific. */ +#define AUE_DARWIN_TASKFORPID 358 /* Darwin-specific. */ +#define AUE_DARWIN_PIDFORTASK 359 /* Darwin-specific. */ +#define AUE_DARWIN_SYSCTL_NONADMIN 360 +#define AUE_DARWIN_COPYFILE 361 /* Darwin-specific. */ + +/* + * Audit event identifiers added as part of OpenBSM, generally corresponding + * to events in FreeBSD, Darwin, and Linux that were not present in Solaris. + * These often duplicate events added to the Solaris set by Darwin, but use + * event identifiers in a higher range in order to avoid colliding with + * future Solaris additions. + */ +#define AUE_GETFSSTAT 43001 +#define AUE_PTRACE 43002 +#define AUE_CHFLAGS 43003 +#define AUE_FCHFLAGS 43004 +#define AUE_PROFILE 43005 +#define AUE_KTRACE 43006 +#define AUE_SETLOGIN 43007 +#define AUE_REVOKE 43008 +#define AUE_UMASK 43009 +#define AUE_MPROTECT 43010 +#define AUE_MKFIFO 43011 +#define AUE_POLL 43012 +#define AUE_FUTIMES 43013 +#define AUE_SETSID 43014 +#define AUE_SETPRIVEXEC 43015 /* Darwin-specific. */ +#define AUE_ADDPROFILE 43016 /* Darwin-specific. */ +#define AUE_KDEBUGTRACE 43017 /* Darwin-specific. */ +#define AUE_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_FSTAT 43018 +#define AUE_FPATHCONF 43019 +#define AUE_GETDIRENTRIES 43020 +#define AUE_SYSCTL 43021 +#define AUE_MLOCK 43022 +#define AUE_MUNLOCK 43023 +#define AUE_UNDELETE 43024 +#define AUE_GETATTRLIST 43025 /* Darwin-specific. */ +#define AUE_SETATTRLIST 43026 /* Darwin-specific. */ +#define AUE_GETDIRENTRIESATTR 43027 /* Darwin-specific. */ +#define AUE_EXCHANGEDATA 43028 /* Darwin-specific. */ +#define AUE_SEARCHFS 43029 /* Darwin-specific. */ +#define AUE_MINHERIT 43030 +#define AUE_SEMCONFIG 43031 +#define AUE_SEMOPEN 43032 +#define AUE_SEMCLOSE 43033 +#define AUE_SEMUNLINK 43034 +#define AUE_SHMOPEN 43035 +#define AUE_SHMUNLINK 43036 +#define AUE_LOADSHFILE 43037 /* Darwin-specific. */ +#define AUE_RESETSHFILE 43038 /* Darwin-specific. */ +#define AUE_NEWSYSTEMSHREG 43039 /* Darwin-specific. */ +#define AUE_PTHREADKILL 43040 /* Darwin-specific. */ +#define AUE_PTHREADSIGMASK 43041 /* Darwin-specific. */ +#define AUE_AUDITCTL 43042 +#define AUE_RFORK 43043 +#define AUE_LCHMOD 43044 +#define AUE_SWAPOFF 43045 +#define AUE_INITPROCESS 43046 /* Darwin-specific. */ +#define AUE_MAPFD 43047 /* Darwin-specific. */ +#define AUE_TASKFORPID 43048 /* Darwin-specific. */ +#define AUE_PIDFORTASK 43049 /* Darwin-specific. */ +#define AUE_SYSCTL_NONADMIN 43050 +#define AUE_COPYFILE 43051 /* Darwin-specific. */ + +/* + * Events added to OpenBSM for FreeBSD and Linux; may also be used by Darwin + * in the future. + */ +#define AUE_LUTIMES 43052 +#define AUE_LCHFLAGS 43053 /* FreeBSD-specific. */ +#define AUE_SENDFILE 43054 /* BSD/Linux-specific. */ +#define AUE_USELIB 43055 /* Linux-specific. */ +#define AUE_GETRESUID 43056 +#define AUE_SETRESUID 43057 +#define AUE_GETRESGID 43058 +#define AUE_SETRESGID 43059 +#define AUE_WAIT4 43060 /* FreeBSD-specific. */ +#define AUE_LGETFH 43061 /* FreeBSD-specific. */ +#define AUE_FHSTATFS 43062 /* FreeBSD-specific. */ +#define AUE_FHOPEN 43063 /* FreeBSD-specific. */ +#define AUE_FHSTAT 43064 /* FreeBSD-specific. */ +#define AUE_JAIL 43065 /* FreeBSD-specific. */ +#define AUE_EACCESS 43066 /* FreeBSD-specific. */ +#define AUE_KQUEUE 43067 /* FreeBSD-specific. */ +#define AUE_KEVENT 43068 /* FreeBSD-specific. */ +#define AUE_FSYNC 43069 +#define AUE_NMOUNT 43070 /* FreeBSD-specific. */ +#define AUE_BDFLUSH 43071 /* Linux-specific. */ +#define AUE_SETFSUID 43072 /* Linux-specific. */ +#define AUE_SETFSGID 43073 /* Linux-specific. */ +#define AUE_PERSONALITY 43074 /* Linux-specific. */ +#define AUE_SCHED_GETSCHEDULER 43075 /* POSIX.1b. */ +#define AUE_SCHED_SETSCHEDULER 43076 /* POSIX.1b. */ +#define AUE_PRCTL 43077 /* Linux-specific. */ +#define AUE_GETCWD 43078 /* FreeBSD/Linux-specific. */ +#define AUE_CAPGET 43079 /* Linux-specific. */ +#define AUE_CAPSET 43080 /* Linux-specific. */ +#define AUE_PIVOT_ROOT 43081 /* Linux-specific. */ +#define AUE_RTPRIO 43082 /* FreeBSD-specific. */ +#define AUE_SCHED_GETPARAM 43083 /* POSIX.1b. */ +#define AUE_SCHED_SETPARAM 43084 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MAX 43085 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MIN 43086 /* POSIX.1b. */ +#define AUE_SCHED_RR_GET_INTERVAL 43087 /* POSIX.1b. */ +#define AUE_ACL_GET_FILE 43088 /* FreeBSD. */ +#define AUE_ACL_SET_FILE 43089 /* FreeBSD. */ +#define AUE_ACL_GET_FD 43090 /* FreeBSD. */ +#define AUE_ACL_SET_FD 43091 /* FreeBSD. */ +#define AUE_ACL_DELETE_FILE 43092 /* FreeBSD. */ +#define AUE_ACL_DELETE_FD 43093 /* FreeBSD. */ +#define AUE_ACL_CHECK_FILE 43094 /* FreeBSD. */ +#define AUE_ACL_CHECK_FD 43095 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 43096 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 43097 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 43098 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 43099 /* FreeBSD. */ +#define AUE_SYSARCH 43100 /* FreeBSD. */ +#define AUE_EXTATTRCTL 43101 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 43102 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 43103 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 43104 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 43105 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 43106 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 43107 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 43108 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 43109 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#13 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#12 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#13 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -199,9 +199,19 @@ #define PAD_NOTATTR 0x4000 /* nonattributable event */ #define PAD_FAILURE 0x8000 /* fail audit event */ +#define BSM_MAX_GROUPS 16 -#define BSM_MAX_GROUPS 16 -#define HEADER_VERSION 1 +/* + * A number of BSM versions are floating around and defined. Here are + * constants for them. OpenBSM uses the same token types, etc, used in the + * Solaris BSM version, but has a separate version number in order to + * identify a potentially different event identifier name space. + */ +#define BSM_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ +#define BSM_HEADER_VERSION_SOLARIS 2 +#define BSM_HEADER_VERSION_TSOL25 3 +#define BSM_HEADER_VERSION_TSOL 4 +#define BSM_HEADER_VERSION_OPENBSM 10 /* * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#13 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#14 $ # $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.3 2006/06/27 18:09:54 rwatson Exp $ # 0:AUE_NULL:indir system call:no @@ -235,129 +235,190 @@ 267:AUE_GETAUDIT_ADDR:getaudit_addr(2):ad 268:AUE_CLOCK_SETTIME:clock_settime(2):ad 269:AUE_NTP_ADJTIME:ntp_adjtime(2):ad -301:AUE_GETFSSTAT:getfsstat(2):fa -302:AUE_PTRACE:ptrace(2):pc -303:AUE_CHFLAGS:chflags(2):fm -304:AUE_FCHFLAGS:fchflags(2):fm -305:AUE_PROFILE:profil(2):pc -306:AUE_KTRACE:ktrace(2):pc -307:AUE_SETLOGIN:setlogin(2):pc +# +# What follows are deprecated Darwin event numbers that may someday conflict +# with Solaris events. +# +301:AUE_DARWIN_GETFSSTAT:getfsstat(2):fa +302:AUE_DARWIN_PTRACE:ptrace(2):pc +303:AUE_DARWIN_CHFLAGS:chflags(2):fm +304:AUE_DARWIN_FCHFLAGS:fchflags(2):fm +305:AUE_DARWIN_PROFILE:profil(2):pc +306:AUE_DARWIN_KTRACE:ktrace(2):pc +307:AUE_DARWIN_SETLOGIN:setlogin(2):pc 308:AUE_DARWIN_REBOOT:reboot(2):ad -309:AUE_REVOKE:revoke(2):cl -310:AUE_UMASK:umask(2):pc -311:AUE_MPROTECT:mprotect(2):fm +309:AUE_DARWIN_REVOKE:revoke(2):cl +310:AUE_DARWIN_UMASK:umask(2):pc +311:AUE_DARWIN_MPROTECT:mprotect(2):fm 312:AUE_DARWIN_SETPRIORITY:setpriority(2):pc,ot 313:AUE_DARWIN_SETTIMEOFDAY:settimeofday(2):ad 314:AUE_DARWIN_FLOCK:flock(2):fm -315:AUE_MKFIFO:mkfifo(2):fc -316:AUE_POLL:poll(2):no +315:AUE_DARWIN_MKFIFO:mkfifo(2):fc +316:AUE_DARWIN_POLL:poll(2):no 317:AUE_DARWIN_SOCKETPAIR:socketpair(2):nt -318:AUE_FUTIMES:futimes(2):fm -319:AUE_SETSID:setsid(2):pc -320:AUE_SETPRIVEXEC:setprivexec(2):pc +318:AUE_DARWIN_FUTIMES:futimes(2):fm +319:AUE_DARWIN_SETSID:setsid(2):pc +320:AUE_DARWIN_SETPRIVEXEC:setprivexec(2):pc 321:AUE_DARWIN_NFSSVC:nfssvc(2):ad 322:AUE_DARWIN_GETFH:getfh(2):fa 323:AUE_DARWIN_QUOTACTL:quotactl(2):ad -324:AUE_ADDPROFILE:system call:pc -325:AUE_KDEBUGTRACE:system call:pc -326:AUE_FSTAT:fstat(2):fa -327:AUE_FPATHCONF:fpathconf(2):fa -328:AUE_GETDIRENTRIES:getdirentries(2):fr +324:AUE_DARWIN_ADDPROFILE:system call:pc +325:AUE_DARWIN_KDEBUGTRACE:system call:pc +326:AUE_DARWIN_FSTAT:fstat(2):fa +327:AUE_DARWIN_FPATHCONF:fpathconf(2):fa +328:AUE_DARWIN_GETDIRENTRIES:getdirentries(2):fr 329:AUE_DARWIN_TRUNCATE:truncate(2):fw 330:AUE_DARWIN_FTRUNCATE:ftruncate(2):fw -331:AUE_SYSCTL:sysctl(3):ad -332:AUE_MLOCK:mlock(2):pc -333:AUE_MUNLOCK:munlock(2):pc -334:AUE_UNDELETE:undelete(2):fm -335:AUE_GETATTRLIST:getattrlist():fa -336:AUE_SETATTRLIST:setattrlist():fm -337:AUE_GETDIRENTRIESATTR:getdirentriesattr():fa -338:AUE_EXCHANGEDATA:exchangedata():fw -339:AUE_SEARCHFS:searchfs():fa -340:AUE_MINHERIT:minherit(2):pc -341:AUE_SEMCONFIG:semconfig():ip -342:AUE_SEMOPEN:sem_open(2):ip -343:AUE_SEMCLOSE:sem_close(2):ip -344:AUE_SEMUNLINK:sem_unlink(2):ip -345:AUE_SHMOPEN:shm_open(2):ip -346:AUE_SHMUNLINK:shm_unlink(2):ip -347:AUE_LOADSHFILE:load_shared_file():fr -348:AUE_RESETSHFILE:reset_shared_file():ot -349:AUE_NEWSYSTEMSHREG:new_system_share_regions():ot -350:AUE_PTHREADKILL:pthread_kill(2):pc -351:AUE_PTHREADSIGMASK:pthread_sigmask(2):pc -352:AUE_AUDITCTL:auditctl(2):ad -353:AUE_RFORK:rfork(2):pc -354:AUE_LCHMOD:lchmod(2):fm -355:AUE_SWAPOFF:swapoff():ad -356:AUE_INITPROCESS:init_process():pc -357:AUE_MAPFD:map_fd():fa -358:AUE_TASKFORPID:task_for_pid():pc -359:AUE_PIDFORTASK:pid_for_task():pc -360:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot -361:AUE_COPYFILE:copyfile():fr,fw -362:AUE_LUTIMES:lutimes(2):fm -363:AUE_LCHFLAGS:lchflags(2):fm -364:AUE_SENDFILE:sendfile(2):nt -365:AUE_USELIB:uselib(2):fa -366:AUE_GETRESUID:getresuid(2):pc -367:AUE_SETRESUID:setresuid(2):pc -368:AUE_GETRESGID:getresgid(2):pc -369:AUE_SETRESGID:setresgid(2):pc -370:AUE_WAIT4:wait4(2):pc -371:AUE_LGETFH:lgetfh(2):fa -372:AUE_FHSTATFS:fhstatfs(2):fa -373:AUE_FHOPEN:fhopen(2):fa -374:AUE_FHSTAT:fhstat(2):fa -375:AUE_JAIL:jail(2):pc -376:AUE_EACCESS:eaccess(2):fa -377:AUE_KQUEUE:kqueue(2):no -378:AUE_KEVENT:kevent(2):no -379:AUE_FSYNC:fsync(2):fm -380:AUE_NMOUNT:nmount(2):ad -381:AUE_BDFLUSH:bdflush(2):ad -382:AUE_SETFSUID:setfsuid(2):ot -383:AUE_SETFSGID:setfsgid(2):ot -384:AUE_PERSONALITY:personality(2):pc -385:AUE_SCHED_GETSCHEDULER:getscheduler(2):ad -386:AUE_SCHED_SETSCHEDULER:setscheduler(2):ad -387:AUE_PRCTL:prctl(2):pc -388:AUE_GETCWD:getcwd(2):pc -389:AUE_CAPGET:capget(2):pc -390:AUE_CAPSET:capset(2):pc -391:AUE_PIVOT_ROOT:pivot_root(2):pc -392:AUE_RTPRIO::rtprio(2):pc -393:AUE_SCHED_GETPARAM:sched_getparam(2):ad -394:AUE_SCHED_SETPARAM:sched_setparam(2):ad -395:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad -396:AUE_SCHED_GET_PRIORITY_MIN:sched_get_priority_min(2):ad -397:AUE_SCHED_RR_GET_INTERVAL:sched_rr_get_interval(2):ad -398:AUE_ACL_GET_FILE:acl_get_file(2):fa -399:AUE_ACL_SET_FILE:acl_set_file(2):fm -400:AUE_ACL_GET_FD:acl_get_fd(2):fa -401:AUE_ACL_SET_FD:acl_set_fd(2):fm -402:AUE_ACL_DELETE_FILE:acl_delete_file(2):fm -403:AUE_ACL_DELETE_FD:acl_delete_fd(2):fm -404:AUE_ACL_CHECK_FILE:acl_aclcheck_file(2):fa -405:AUE_ACL_CHECK_FD:acl_aclcheck_fd(2):fa -406:AUE_ACL_GET_LINK:acl_get_link(2):fa -407:AUE_ACL_SET_LINK:acl_set_link(2):fm -408:AUE_ACL_DELETE_LINK:acl_delete_link(2):fm -409:AUE_ACL_CHECK_LINK:acl_aclcheck_link(2):fa -410:AUE_SYSARCH:sysarch(2):na -411:AUE_EXTATTRCTL:extattrctl(2):fm -412:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa -413:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm -414:AUE_EXTATTR_LIST_FILE:extattr_list_file(2):fa -415:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm -416:AUE_EXTATTR_GET_FD:extattr_get_fd(2):fa -417:AUE_EXTATTR_SET_FD:extattr_set_fd(2):fm -418:AUE_EXTATTR_LIST_FD:extattr_list_fd(2):fa -419:AUE_EXTATTR_DELETE_FD:extattr_delete_fd(2):fm -420:AUE_EXTATTR_GET_LINK:extattr_get_link(2):fa -421:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm -422:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa -423:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm +331:AUE_DARWIN_SYSCTL:sysctl(3):ad +332:AUE_DARWIN_MLOCK:mlock(2):pc +333:AUE_DARWIN_MUNLOCK:munlock(2):pc +334:AUE_DARWIN_UNDELETE:undelete(2):fm +335:AUE_DARWIN_GETATTRLIST:getattrlist():fa +336:AUE_DARWIN_SETATTRLIST:setattrlist():fm +337:AUE_DARWIN_GETDIRENTRIESATTR:getdirentriesattr():fa +338:AUE_DARWIN_EXCHANGEDATA:exchangedata():fw +339:AUE_DARWIN_SEARCHFS:searchfs():fa +340:AUE_DARWIN_MINHERIT:minherit(2):pc +341:AUE_DARWIN_SEMCONFIG:semconfig():ip +342:AUE_DARWIN_SEMOPEN:sem_open(2):ip +343:AUE_DARWIN_SEMCLOSE:sem_close(2):ip +344:AUE_DARWIN_SEMUNLINK:sem_unlink(2):ip +345:AUE_DARWIN_SHMOPEN:shm_open(2):ip +346:AUE_DARWIN_SHMUNLINK:shm_unlink(2):ip +347:AUE_DARWIN_LOADSHFILE:load_shared_file():fr +348:AUE_DARWIN_RESETSHFILE:reset_shared_file():ot +349:AUE_DARWIN_NEWSYSTEMSHREG:new_system_share_regions():ot +350:AUE_DARWIN_PTHREADKILL:pthread_kill(2):pc +351:AUE_DARWIN_PTHREADSIGMASK:pthread_sigmask(2):pc +352:AUE_DARWIN_AUDITCTL:auditctl(2):ad +353:AUE_DARWIN_RFORK:rfork(2):pc +354:AUE_DARWIN_LCHMOD:lchmod(2):fm +355:AUE_DARWIN_SWAPOFF:swapoff():ad +356:AUE_DARWIN_INITPROCESS:init_process():pc +357:AUE_DARWIN_MAPFD:map_fd():fa +358:AUE_DARWIN_TASKFORPID:task_for_pid():pc +359:AUE_DARWIN_PIDFORTASK:pid_for_task():pc +360:AUE_DARWIN_SYSCTL_NONADMIN:sysctl() - non-admin:ot +361:AUE_DARWIN_COPYFILE:copyfile():fr,fw +# +# OpenBSM-specific kernel events. +# +43001:AUE_GETFSSTAT:getfsstat(2):fa +43002:AUE_PTRACE:ptrace(2):pc +43003:AUE_CHFLAGS:chflags(2):fm +43004:AUE_FCHFLAGS:fchflags(2):fm +43005:AUE_PROFILE:profil(2):pc +43006:AUE_KTRACE:ktrace(2):pc +43007:AUE_SETLOGIN:setlogin(2):pc +43008:AUE_REVOKE:revoke(2):cl +43009:AUE_UMASK:umask(2):pc +43010:AUE_MPROTECT:mprotect(2):fm +43011:AUE_MKFIFO:mkfifo(2):fc +43012:AUE_POLL:poll(2):no +43013:AUE_FUTIMES:futimes(2):fm +43014:AUE_SETSID:setsid(2):pc +43015:AUE_SETPRIVEXEC:setprivexec(2):pc +43016:AUE_ADDPROFILE:system call:pc +43017:AUE_KDEBUGTRACE:system call:pc +43018:AUE_FSTAT:fstat(2):fa +43019:AUE_FPATHCONF:fpathconf(2):fa +43020:AUE_GETDIRENTRIES:getdirentries(2):fr +43021:AUE_SYSCTL:sysctl(3):ad +43022:AUE_MLOCK:mlock(2):pc +43023:AUE_MUNLOCK:munlock(2):pc +43024:AUE_UNDELETE:undelete(2):fm +43025:AUE_GETATTRLIST:getattrlist():fa +43026:AUE_SETATTRLIST:setattrlist():fm +43027:AUE_GETDIRENTRIESATTR:getdirentriesattr():fa +43028:AUE_EXCHANGEDATA:exchangedata():fw +43029:AUE_SEARCHFS:searchfs():fa +43030:AUE_MINHERIT:minherit(2):pc +43031:AUE_SEMCONFIG:semconfig():ip +43032:AUE_SEMOPEN:sem_open(2):ip +43033:AUE_SEMCLOSE:sem_close(2):ip +43034:AUE_SEMUNLINK:sem_unlink(2):ip +43035:AUE_SHMOPEN:shm_open(2):ip +43036:AUE_SHMUNLINK:shm_unlink(2):ip +43037:AUE_LOADSHFILE:load_shared_file():fr +43038:AUE_RESETSHFILE:reset_shared_file():ot +43039:AUE_NEWSYSTEMSHREG:new_system_share_regions():ot +43040:AUE_PTHREADKILL:pthread_kill(2):pc +43041:AUE_PTHREADSIGMASK:pthread_sigmask(2):pc +43042:AUE_AUDITCTL:auditctl(2):ad +43043:AUE_RFORK:rfork(2):pc +43044:AUE_LCHMOD:lchmod(2):fm +43045:AUE_SWAPOFF:swapoff():ad +43046:AUE_INITPROCESS:init_process():pc +43047:AUE_MAPFD:map_fd():fa +43048:AUE_TASKFORPID:task_for_pid():pc +43049:AUE_PIDFORTASK:pid_for_task():pc +43050:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot +43051:AUE_COPYFILE:copyfile():fr,fw +43052:AUE_LUTIMES:lutimes(2):fm +43053:AUE_LCHFLAGS:lchflags(2):fm +43054:AUE_SENDFILE:sendfile(2):nt +43055:AUE_USELIB:uselib(2):fa +43056:AUE_GETRESUID:getresuid(2):pc +43057:AUE_SETRESUID:setresuid(2):pc +43058:AUE_GETRESGID:getresgid(2):pc +43059:AUE_SETRESGID:setresgid(2):pc +43060:AUE_WAIT4:wait4(2):pc +43061:AUE_LGETFH:lgetfh(2):fa +43062:AUE_FHSTATFS:fhstatfs(2):fa +43063:AUE_FHOPEN:fhopen(2):fa +43064:AUE_FHSTAT:fhstat(2):fa +43065:AUE_JAIL:jail(2):pc +43066:AUE_EACCESS:eaccess(2):fa +43067:AUE_KQUEUE:kqueue(2):no +43068:AUE_KEVENT:kevent(2):no +43069:AUE_FSYNC:fsync(2):fm +43070:AUE_NMOUNT:nmount(2):ad +43071:AUE_BDFLUSH:bdflush(2):ad +43072:AUE_SETFSUID:setfsuid(2):ot +43073:AUE_SETFSGID:setfsgid(2):ot +43074:AUE_PERSONALITY:personality(2):pc +43075:AUE_SCHED_GETSCHEDULER:getscheduler(2):ad +43076:AUE_SCHED_SETSCHEDULER:setscheduler(2):ad +43077:AUE_PRCTL:prctl(2):pc +43078:AUE_GETCWD:getcwd(2):pc +43079:AUE_CAPGET:capget(2):pc +43080:AUE_CAPSET:capset(2):pc +43081:AUE_PIVOT_ROOT:pivot_root(2):pc +43082:AUE_RTPRIO::rtprio(2):pc +43083:AUE_SCHED_GETPARAM:sched_getparam(2):ad +43084:AUE_SCHED_SETPARAM:sched_setparam(2):ad +43085:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad +43086:AUE_SCHED_GET_PRIORITY_MIN:sched_get_priority_min(2):ad +43087:AUE_SCHED_RR_GET_INTERVAL:sched_rr_get_interval(2):ad +43088:AUE_ACL_GET_FILE:acl_get_file(2):fa +43089:AUE_ACL_SET_FILE:acl_set_file(2):fm +43090:AUE_ACL_GET_FD:acl_get_fd(2):fa +43091:AUE_ACL_SET_FD:acl_set_fd(2):fm +43092:AUE_ACL_DELETE_FILE:acl_delete_file(2):fm +43093:AUE_ACL_DELETE_FD:acl_delete_fd(2):fm +43094:AUE_ACL_CHECK_FILE:acl_aclcheck_file(2):fa +43095:AUE_ACL_CHECK_FD:acl_aclcheck_fd(2):fa +43096:AUE_ACL_GET_LINK:acl_get_link(2):fa +43097:AUE_ACL_SET_LINK:acl_set_link(2):fm +43098:AUE_ACL_DELETE_LINK:acl_delete_link(2):fm +43099:AUE_ACL_CHECK_LINK:acl_aclcheck_link(2):fa +43100:AUE_SYSARCH:sysarch(2):na +43101:AUE_EXTATTRCTL:extattrctl(2):fm +43102:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa +43103:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm +43104:AUE_EXTATTR_LIST_FILE:extattr_list_file(2):fa +43105:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm +43106:AUE_EXTATTR_GET_FD:extattr_get_fd(2):fa +43107:AUE_EXTATTR_SET_FD:extattr_set_fd(2):fm +43108:AUE_EXTATTR_LIST_FD:extattr_list_fd(2):fa +43109:AUE_EXTATTR_DELETE_FD:extattr_delete_fd(2):fm +43110:AUE_EXTATTR_GET_LINK:extattr_get_link(2):fa +43111:AUE_EXTATTR_SET_LINK:extattr_set_link(2):fm +43112:AUE_EXTATTR_LIST_LINK:extattr_list_link(2):fa +43113:AUE_EXTATTR_DELETE_LINK:extattr_delete_link(2):fm +# +# User space system events. +# 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#19 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#18 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#19 $ */ #include @@ -1155,7 +1155,7 @@ ADD_U_CHAR(dptr, AUT_HEADER32); ADD_U_INT32(dptr, rec_size); - ADD_U_CHAR(dptr, HEADER_VERSION); + ADD_U_CHAR(dptr, BSM_HEADER_VERSION_OPENBSM); ADD_U_INT16(dptr, e_type); ADD_U_INT16(dptr, e_mod); From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 15:10:35 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51AE316A4E5 for ; Sat, 5 Aug 2006 15:10:35 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 916DA43D46 for ; Sat, 5 Aug 2006 15:10:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 87DDB46C1B for ; Sat, 5 Aug 2006 11:10:33 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 108D355C44; Sat, 5 Aug 2006 15:10:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 09A8116A4E1; Sat, 5 Aug 2006 15:10:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB58916A4DD for ; Sat, 5 Aug 2006 15:10:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B7E843D46 for ; Sat, 5 Aug 2006 15:10:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75FAWS3000474 for ; Sat, 5 Aug 2006 15:10:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75FAWqM000470 for perforce@freebsd.org; Sat, 5 Aug 2006 15:10:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 15:10:32 GMT Message-Id: <200608051510.k75FAWqM000470@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 103252 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 15:10:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=103252 Change 103252 by rwatson@rwatson_zoo on 2006/08/05 15:09:50 Merge OpenBSM 1.0a8 changes from user space to kernel in audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#30 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#25 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#18 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#22 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#30 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#29 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#30 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.4 2006/06/05 12:55:45 rwatson Exp $ */ @@ -164,6 +164,7 @@ /* * Audit policy controls. */ +#ifdef OLD_WORLD_ORDER #define AUDIT_CNT 0x0001 #define AUDIT_AHLT 0x0002 #define AUDIT_ARGV 0x0004 @@ -175,6 +176,22 @@ #define AUDIT_GROUP 0x0100 #define AUDIT_TRAIL 0x0200 #define AUDIT_PATH 0x0400 +#else /* !OLD_WORLD_ORDER */ +#define AUDIT_CNT 0x0001 +#define AUDIT_AHLT 0x0002 +#define AUDIT_ARGV 0x0004 +#define AUDIT_ARGE 0x0008 +#define AUDIT_SEQ 0x0010 +#define AUDIT_WINDATA 0x0020 +#define AUDIT_USER 0x0040 +#define AUDIT_GROUP 0x0080 +#define AUDIT_TRAIL 0x0100 +#define AUDIT_PATH 0x0200 +#define AUDIT_SCNT 0x0400 +#define AUDIT_PUBLIC 0x0800 +#define AUDIT_ZONENAME 0x1000 +#define AUDIT_PERZONE 0x2000 +#endif /* !OLD_WORLD_ORDER */ /* * Audit queue control parameters ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#25 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#24 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#25 $ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.6 2006/07/03 14:45:43 rwatson Exp $ */ @@ -274,134 +274,200 @@ #define AUE_NTP_ADJTIME 288 /* - * Events not present in OpenSolaris BSM, generally derived from Apple Darwin - * BSM or added in OpenBSM. This start a little too close to the top end of - * the OpenSolaris event list for my comfort. + * Events added for Apple Darwin that potentially collide with future Solaris + * BSM events. These are assigned AUE_DARWIN prefixes, and are deprecated in + * new trails. Systems generating these events should switch to the new + * identifiers that avoid colliding with the Solaris identifier space. */ -#define AUE_GETFSSTAT 301 -#define AUE_PTRACE 302 -#define AUE_CHFLAGS 303 -#define AUE_FCHFLAGS 304 -#define AUE_PROFILE 305 -#define AUE_KTRACE 306 -#define AUE_SETLOGIN 307 +#define AUE_DARWIN_GETFSSTAT 301 +#define AUE_DARWIN_PTRACE 302 +#define AUE_DARWIN_CHFLAGS 303 +#define AUE_DARWIN_FCHFLAGS 304 +#define AUE_DARWIN_PROFILE 305 +#define AUE_DARWIN_KTRACE 306 +#define AUE_DARWIN_SETLOGIN 307 #define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */ -#define AUE_REVOKE 309 -#define AUE_UMASK 310 -#define AUE_MPROTECT 311 +#define AUE_DARWIN_REVOKE 309 +#define AUE_DARWIN_UMASK 310 +#define AUE_DARWIN_MPROTECT 311 #define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */ #define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */ #define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */ -#define AUE_MKFIFO 315 -#define AUE_POLL 316 +#define AUE_DARWIN_MKFIFO 315 +#define AUE_DARWIN_POLL 316 #define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ -#define AUE_FUTIMES 318 -#define AUE_SETSID 319 -#define AUE_SETPRIVEXEC 320 /* Darwin-specific. */ +#define AUE_DARWIN_FUTIMES 318 +#define AUE_DARWIN_SETSID 319 +#define AUE_DARWIN_SETPRIVEXEC 320 /* Darwin-specific. */ #define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ #define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ #define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ -#define AUE_ADDPROFILE 324 /* Darwin-specific. */ -#define AUE_KDEBUGTRACE 325 /* Darwin-specific. */ -#define AUE_KDBUGTRACE AUE_KDEBUGTRACE -#define AUE_FSTAT 326 -#define AUE_FPATHCONF 327 -#define AUE_GETDIRENTRIES 328 +#define AUE_DARWIN_ADDPROFILE 324 /* Darwin-specific. */ +#define AUE_DARWIN_KDEBUGTRACE 325 /* Darwin-specific. */ +#define AUE_DARWIN_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_DARWIN_FSTAT 326 +#define AUE_DARWIN_FPATHCONF 327 +#define AUE_DARWIN_GETDIRENTRIES 328 #define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */ #define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */ -#define AUE_SYSCTL 331 -#define AUE_MLOCK 332 -#define AUE_MUNLOCK 333 -#define AUE_UNDELETE 334 -#define AUE_GETATTRLIST 335 /* Darwin-specific. */ -#define AUE_SETATTRLIST 336 /* Darwin-specific. */ -#define AUE_GETDIRENTRIESATTR 337 /* Darwin-specific. */ -#define AUE_EXCHANGEDATA 338 /* Darwin-specific. */ -#define AUE_SEARCHFS 339 /* Darwin-specific. */ -#define AUE_MINHERIT 340 -#define AUE_SEMCONFIG 341 -#define AUE_SEMOPEN 342 -#define AUE_SEMCLOSE 343 -#define AUE_SEMUNLINK 344 -#define AUE_SHMOPEN 345 -#define AUE_SHMUNLINK 346 -#define AUE_LOADSHFILE 347 /* Darwin-specific. */ -#define AUE_RESETSHFILE 348 /* Darwin-specific. */ -#define AUE_NEWSYSTEMSHREG 349 /* Darwin-specific. */ -#define AUE_PTHREADKILL 350 /* Darwin-specific. */ -#define AUE_PTHREADSIGMASK 351 /* Darwin-specific. */ -#define AUE_AUDITCTL 352 -#define AUE_RFORK 353 -#define AUE_LCHMOD 354 -#define AUE_SWAPOFF 355 -#define AUE_INITPROCESS 356 /* Darwin-specific. */ -#define AUE_MAPFD 357 /* Darwin-specific. */ -#define AUE_TASKFORPID 358 /* Darwin-specific. */ -#define AUE_PIDFORTASK 359 /* Darwin-specific. */ -#define AUE_SYSCTL_NONADMIN 360 -#define AUE_COPYFILE 361 /* Darwin-specific. */ -#define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 363 /* FreeBSD-specific. */ -#define AUE_SENDFILE 364 /* BSD/Linux-specific. */ -#define AUE_USELIB 365 /* Linux-specific. */ -#define AUE_GETRESUID 366 -#define AUE_SETRESUID 367 -#define AUE_GETRESGID 368 -#define AUE_SETRESGID 369 -#define AUE_WAIT4 370 /* FreeBSD-specific. */ -#define AUE_LGETFH 371 /* FreeBSD-specific. */ -#define AUE_FHSTATFS 372 /* FreeBSD-specific. */ -#define AUE_FHOPEN 373 /* FreeBSD-specific. */ -#define AUE_FHSTAT 374 /* FreeBSD-specific. */ -#define AUE_JAIL 375 /* FreeBSD-specific. */ -#define AUE_EACCESS 376 /* FreeBSD-specific. */ -#define AUE_KQUEUE 377 /* FreeBSD-specific. */ -#define AUE_KEVENT 378 /* FreeBSD-specific. */ -#define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD-specific. */ -#define AUE_BDFLUSH 381 /* Linux-specific. */ -#define AUE_SETFSUID 382 /* Linux-specific. */ -#define AUE_SETFSGID 383 /* Linux-specific. */ -#define AUE_PERSONALITY 384 /* Linux-specific. */ -#define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ -#define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ -#define AUE_PRCTL 387 /* Linux-specific. */ -#define AUE_GETCWD 388 /* FreeBSD/Linux-specific. */ -#define AUE_CAPGET 389 /* Linux-specific. */ -#define AUE_CAPSET 390 /* Linux-specific. */ -#define AUE_PIVOT_ROOT 391 /* Linux-specific. */ -#define AUE_RTPRIO 392 /* FreeBSD-specific. */ -#define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ -#define AUE_SCHED_SETPARAM 394 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ -#define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ -#define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ -#define AUE_ACL_GET_FILE 398 /* FreeBSD. */ -#define AUE_ACL_SET_FILE 399 /* FreeBSD. */ -#define AUE_ACL_GET_FD 400 /* FreeBSD. */ -#define AUE_ACL_SET_FD 401 /* FreeBSD. */ -#define AUE_ACL_DELETE_FILE 402 /* FreeBSD. */ -#define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ -#define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ -#define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ -#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ -#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ -#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ -#define AUE_SYSARCH 410 /* FreeBSD. */ -#define AUE_EXTATTRCTL 411 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ -#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ -#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ -#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ -#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ -#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ +#define AUE_DARWIN_SYSCTL 331 +#define AUE_DARWIN_MLOCK 332 +#define AUE_DARWIN_MUNLOCK 333 +#define AUE_DARWIN_UNDELETE 334 +#define AUE_DARWIN_GETATTRLIST 335 /* Darwin-specific. */ +#define AUE_DARWIN_SETATTRLIST 336 /* Darwin-specific. */ +#define AUE_DARWIN_GETDIRENTRIESATTR 337 /* Darwin-specific. */ +#define AUE_DARWIN_EXCHANGEDATA 338 /* Darwin-specific. */ +#define AUE_DARWIN_SEARCHFS 339 /* Darwin-specific. */ +#define AUE_DARWIN_MINHERIT 340 +#define AUE_DARWIN_SEMCONFIG 341 +#define AUE_DARWIN_SEMOPEN 342 +#define AUE_DARWIN_SEMCLOSE 343 +#define AUE_DARWIN_SEMUNLINK 344 +#define AUE_DARWIN_SHMOPEN 345 +#define AUE_DARWIN_SHMUNLINK 346 +#define AUE_DARWIN_LOADSHFILE 347 /* Darwin-specific. */ +#define AUE_DARWIN_RESETSHFILE 348 /* Darwin-specific. */ +#define AUE_DARWIN_NEWSYSTEMSHREG 349 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADKILL 350 /* Darwin-specific. */ +#define AUE_DARWIN_PTHREADSIGMASK 351 /* Darwin-specific. */ +#define AUE_DARWIN_AUDITCTL 352 +#define AUE_DARWIN_RFORK 353 +#define AUE_DARWIN_LCHMOD 354 +#define AUE_DARWIN_SWAPOFF 355 +#define AUE_DARWIN_INITPROCESS 356 /* Darwin-specific. */ +#define AUE_DARWIN_MAPFD 357 /* Darwin-specific. */ +#define AUE_DARWIN_TASKFORPID 358 /* Darwin-specific. */ +#define AUE_DARWIN_PIDFORTASK 359 /* Darwin-specific. */ +#define AUE_DARWIN_SYSCTL_NONADMIN 360 +#define AUE_DARWIN_COPYFILE 361 /* Darwin-specific. */ + +/* + * Audit event identifiers added as part of OpenBSM, generally corresponding + * to events in FreeBSD, Darwin, and Linux that were not present in Solaris. + * These often duplicate events added to the Solaris set by Darwin, but use + * event identifiers in a higher range in order to avoid colliding with + * future Solaris additions. + */ +#define AUE_GETFSSTAT 43001 +#define AUE_PTRACE 43002 +#define AUE_CHFLAGS 43003 +#define AUE_FCHFLAGS 43004 +#define AUE_PROFILE 43005 +#define AUE_KTRACE 43006 +#define AUE_SETLOGIN 43007 +#define AUE_REVOKE 43008 +#define AUE_UMASK 43009 +#define AUE_MPROTECT 43010 +#define AUE_MKFIFO 43011 +#define AUE_POLL 43012 +#define AUE_FUTIMES 43013 +#define AUE_SETSID 43014 +#define AUE_SETPRIVEXEC 43015 /* Darwin-specific. */ +#define AUE_ADDPROFILE 43016 /* Darwin-specific. */ +#define AUE_KDEBUGTRACE 43017 /* Darwin-specific. */ +#define AUE_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_FSTAT 43018 +#define AUE_FPATHCONF 43019 +#define AUE_GETDIRENTRIES 43020 +#define AUE_SYSCTL 43021 +#define AUE_MLOCK 43022 +#define AUE_MUNLOCK 43023 +#define AUE_UNDELETE 43024 +#define AUE_GETATTRLIST 43025 /* Darwin-specific. */ +#define AUE_SETATTRLIST 43026 /* Darwin-specific. */ +#define AUE_GETDIRENTRIESATTR 43027 /* Darwin-specific. */ +#define AUE_EXCHANGEDATA 43028 /* Darwin-specific. */ +#define AUE_SEARCHFS 43029 /* Darwin-specific. */ +#define AUE_MINHERIT 43030 +#define AUE_SEMCONFIG 43031 +#define AUE_SEMOPEN 43032 +#define AUE_SEMCLOSE 43033 +#define AUE_SEMUNLINK 43034 +#define AUE_SHMOPEN 43035 +#define AUE_SHMUNLINK 43036 +#define AUE_LOADSHFILE 43037 /* Darwin-specific. */ +#define AUE_RESETSHFILE 43038 /* Darwin-specific. */ +#define AUE_NEWSYSTEMSHREG 43039 /* Darwin-specific. */ +#define AUE_PTHREADKILL 43040 /* Darwin-specific. */ +#define AUE_PTHREADSIGMASK 43041 /* Darwin-specific. */ +#define AUE_AUDITCTL 43042 +#define AUE_RFORK 43043 +#define AUE_LCHMOD 43044 +#define AUE_SWAPOFF 43045 +#define AUE_INITPROCESS 43046 /* Darwin-specific. */ +#define AUE_MAPFD 43047 /* Darwin-specific. */ +#define AUE_TASKFORPID 43048 /* Darwin-specific. */ +#define AUE_PIDFORTASK 43049 /* Darwin-specific. */ +#define AUE_SYSCTL_NONADMIN 43050 +#define AUE_COPYFILE 43051 /* Darwin-specific. */ + +/* + * Events added to OpenBSM for FreeBSD and Linux; may also be used by Darwin + * in the future. + */ +#define AUE_LUTIMES 43052 +#define AUE_LCHFLAGS 43053 /* FreeBSD-specific. */ +#define AUE_SENDFILE 43054 /* BSD/Linux-specific. */ +#define AUE_USELIB 43055 /* Linux-specific. */ +#define AUE_GETRESUID 43056 +#define AUE_SETRESUID 43057 +#define AUE_GETRESGID 43058 +#define AUE_SETRESGID 43059 +#define AUE_WAIT4 43060 /* FreeBSD-specific. */ +#define AUE_LGETFH 43061 /* FreeBSD-specific. */ +#define AUE_FHSTATFS 43062 /* FreeBSD-specific. */ +#define AUE_FHOPEN 43063 /* FreeBSD-specific. */ +#define AUE_FHSTAT 43064 /* FreeBSD-specific. */ +#define AUE_JAIL 43065 /* FreeBSD-specific. */ +#define AUE_EACCESS 43066 /* FreeBSD-specific. */ +#define AUE_KQUEUE 43067 /* FreeBSD-specific. */ +#define AUE_KEVENT 43068 /* FreeBSD-specific. */ +#define AUE_FSYNC 43069 +#define AUE_NMOUNT 43070 /* FreeBSD-specific. */ +#define AUE_BDFLUSH 43071 /* Linux-specific. */ +#define AUE_SETFSUID 43072 /* Linux-specific. */ +#define AUE_SETFSGID 43073 /* Linux-specific. */ +#define AUE_PERSONALITY 43074 /* Linux-specific. */ +#define AUE_SCHED_GETSCHEDULER 43075 /* POSIX.1b. */ +#define AUE_SCHED_SETSCHEDULER 43076 /* POSIX.1b. */ +#define AUE_PRCTL 43077 /* Linux-specific. */ +#define AUE_GETCWD 43078 /* FreeBSD/Linux-specific. */ +#define AUE_CAPGET 43079 /* Linux-specific. */ +#define AUE_CAPSET 43080 /* Linux-specific. */ +#define AUE_PIVOT_ROOT 43081 /* Linux-specific. */ +#define AUE_RTPRIO 43082 /* FreeBSD-specific. */ +#define AUE_SCHED_GETPARAM 43083 /* POSIX.1b. */ +#define AUE_SCHED_SETPARAM 43084 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MAX 43085 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MIN 43086 /* POSIX.1b. */ +#define AUE_SCHED_RR_GET_INTERVAL 43087 /* POSIX.1b. */ +#define AUE_ACL_GET_FILE 43088 /* FreeBSD. */ +#define AUE_ACL_SET_FILE 43089 /* FreeBSD. */ +#define AUE_ACL_GET_FD 43090 /* FreeBSD. */ +#define AUE_ACL_SET_FD 43091 /* FreeBSD. */ +#define AUE_ACL_DELETE_FILE 43092 /* FreeBSD. */ +#define AUE_ACL_DELETE_FD 43093 /* FreeBSD. */ +#define AUE_ACL_CHECK_FILE 43094 /* FreeBSD. */ +#define AUE_ACL_CHECK_FD 43095 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 43096 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 43097 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 43098 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 43099 /* FreeBSD. */ +#define AUE_SYSARCH 43100 /* FreeBSD. */ +#define AUE_EXTATTRCTL 43101 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 43102 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 43103 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 43104 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 43105 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 43106 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 43107 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 43108 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 43109 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#18 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#17 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#18 $ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.3 2006/07/03 14:44:13 rwatson Exp $ */ @@ -200,9 +200,19 @@ #define PAD_NOTATTR 0x4000 /* nonattributable event */ #define PAD_FAILURE 0x8000 /* fail audit event */ +#define BSM_MAX_GROUPS 16 -#define BSM_MAX_GROUPS 16 -#define HEADER_VERSION 1 +/* + * A number of BSM versions are floating around and defined. Here are + * constants for them. OpenBSM uses the same token types, etc, used in the + * Solaris BSM version, but has a separate version number in order to + * identify a potentially different event identifier name space. + */ +#define BSM_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ +#define BSM_HEADER_VERSION_SOLARIS 2 +#define BSM_HEADER_VERSION_TSOL25 3 +#define BSM_HEADER_VERSION_TSOL 4 +#define BSM_HEADER_VERSION_OPENBSM 10 /* * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#22 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#21 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#22 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.4 2006/06/17 13:53:04 wsalamon Exp $ */ @@ -1166,7 +1166,7 @@ ADD_U_CHAR(dptr, AUT_HEADER32); ADD_U_INT32(dptr, rec_size); - ADD_U_CHAR(dptr, HEADER_VERSION); + ADD_U_CHAR(dptr, BSM_HEADER_VERSION_OPENBSM); ADD_U_INT16(dptr, e_type); ADD_U_INT16(dptr, e_mod); From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 15:51:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E69416A4DD for ; Sat, 5 Aug 2006 15:51:28 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B24343D5C for ; Sat, 5 Aug 2006 15:51:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9867446D46 for ; Sat, 5 Aug 2006 11:51:27 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8787355850; Sat, 5 Aug 2006 15:51:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 810CB16A4E2; Sat, 5 Aug 2006 15:51:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5395F16A4E0 for ; Sat, 5 Aug 2006 15:51:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CEE343D5C for ; Sat, 5 Aug 2006 15:51:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75FpOxG009399 for ; Sat, 5 Aug 2006 15:51:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75FpO09009396 for perforce@freebsd.org; Sat, 5 Aug 2006 15:51:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 15:51:24 GMT Message-Id: <200608051551.k75FpO09009396@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 103254 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 15:51:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=103254 Change 103254 by rwatson@rwatson_zoo on 2006/08/05 15:50:28 Also back up/remove new systrace argument file, as with other .c files. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/Makefile#3 (text+ko) ==== @@ -15,6 +15,7 @@ ../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master -mv -f init_sysent.c init_sysent.c.bak -mv -f syscalls.c syscalls.c.bak + -mv -f systrace_args.c systrace_args.c.bak -mv -f ../sys/syscall.h ../sys/syscall.h.bak -mv -f ../sys/syscall.mk ../sys/syscall.mk.bak -mv -f ../sys/sysproto.h ../sys/sysproto.h.bak From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 15:56:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFF9F16A4DD for ; Sat, 5 Aug 2006 15:56:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DC2D43D62 for ; Sat, 5 Aug 2006 15:56:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3473146D2C for ; Sat, 5 Aug 2006 11:56:35 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CD71755432; Sat, 5 Aug 2006 15:56:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C709E16A4E1; Sat, 5 Aug 2006 15:56:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57DD716A4DA for ; Sat, 5 Aug 2006 15:56:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FA9843D60 for ; Sat, 5 Aug 2006 15:56:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75FuVqG009702 for ; Sat, 5 Aug 2006 15:56:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75FuVG2009699 for perforce@freebsd.org; Sat, 5 Aug 2006 15:56:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 15:56:31 GMT Message-Id: <200608051556.k75FuVG2009699@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 103255 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 15:56:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=103255 Change 103255 by rwatson@rwatson_zoo on 2006/08/05 15:55:50 Regenerate. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#13 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#13 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#13 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.78 2006/07/28 19:08:36 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.76 2006/07/28 19:05:27 jhb Exp */ @@ -11,10 +11,7 @@ #include #include -#include -#include #include - #include struct proc; ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#13 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.72 2006/07/28 19:08:36 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.76 2006/07/28 19:05:27 jhb Exp */ ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#17 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.79 2006/07/28 19:08:36 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.76 2006/07/28 19:05:27 jhb Exp */ @@ -19,315 +19,315 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { #define nosys linux_nosys - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = setup */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ - { 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ - { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ - { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ - { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ - { 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ - { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ - { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ - { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ - { AS(linux_fstat_args), (sy_call_t *)linux_fstat, AUE_FSTAT }, /* 28 = linux_fstat */ - { 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ - { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = stty */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = gtty */ - { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ - { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = ftime */ - { 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ - { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ - { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ - { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ - { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ - { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ - { 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ - { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ - { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ - { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ - { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 58 = ulimit */ - { 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ - { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ - { 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ - { 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ - { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ - { 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ - { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ - { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ - { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ - { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ - { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ - { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ - { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ - { AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 77 = getrusage */ - { AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL }, /* 78 = gettimeofday */ - { AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY }, /* 79 = settimeofday */ - { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ - { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ - { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ - { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ - { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_USELIB }, /* 86 = linux_uselib */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ - { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ - { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ - { 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 */ - { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ - { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ - { 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ - { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL }, /* 110 = linux_iopl */ - { 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = idle */ - { 0, (sy_call_t *)linux_vm86old, AUE_NULL }, /* 113 = linux_vm86old */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ - { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ - { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ - { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ - { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ - { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ - { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ - { AS(linux_modify_ldt_args), (sy_call_t *)linux_modify_ldt, AUE_NULL }, /* 123 = linux_modify_ldt */ - { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ - { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT }, /* 125 = mprotect */ - { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ - { 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ - { 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ - { 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ - { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ - { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ - { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ - { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ - { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 137 = afs_syscall */ - { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ - { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ - { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ - { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ - { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ - { AS(readv_args), (sy_call_t *)readv, AUE_READV }, /* 145 = readv */ - { AS(writev_args), (sy_call_t *)writev, AUE_WRITEV }, /* 146 = writev */ - { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ - { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ - { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ - { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ - { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ - { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ - { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = sched_rr_get_interval */ - { AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 162 = nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ - { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ - { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ - { 0, (sy_call_t *)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 */ - { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ - { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ - { 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ - { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ - { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ - { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ - { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */ - { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ - { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ - { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ - { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ - { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ - { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ - { 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ - { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ - { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = getpmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = putpmsg */ - { 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ - { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ - { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ - { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ - { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ - { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ - { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ - { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ - { 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ - { 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ - { 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ - { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ - { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ - { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ - { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ - { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ - { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ - { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ - { 0, (sy_call_t *)linux_gettid, AUE_NULL }, /* 224 = linux_gettid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 225 = linux_readahead */ - { 0, (sy_call_t *)linux_setxattr, AUE_NULL }, /* 226 = linux_setxattr */ - { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL }, /* 227 = linux_lsetxattr */ - { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL }, /* 228 = linux_fsetxattr */ - { 0, (sy_call_t *)linux_getxattr, AUE_NULL }, /* 229 = linux_getxattr */ - { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL }, /* 230 = linux_lgetxattr */ - { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL }, /* 231 = linux_fgetxattr */ - { 0, (sy_call_t *)linux_listxattr, AUE_NULL }, /* 232 = linux_listxattr */ - { 0, (sy_call_t *)linux_llistxattr, AUE_NULL }, /* 233 = linux_llistxattr */ - { 0, (sy_call_t *)linux_flistxattr, AUE_NULL }, /* 234 = linux_flistxattr */ - { 0, (sy_call_t *)linux_removexattr, AUE_NULL }, /* 235 = linux_removexattr */ - { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL }, /* 236 = linux_lremovexattr */ - { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL }, /* 237 = linux_fremovexattr */ - { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL }, /* 238 = linux_tkill */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 239 = linux_sendfile64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 240 = linux_futex */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 241 = linux_sched_setaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 242 = linux_sched_getaffinity */ - { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL }, /* 243 = linux_set_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 244 = linux_get_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 245 = linux_io_setup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 246 = linux_io_destroy */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 247 = linux_io_getevents */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 248 = linux_io_submit */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ - { 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ - { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)linux_epoll_create, AUE_NULL }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL }, /* 256 = linux_epoll_wait */ - { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL }, /* 257 = linux_remap_file_pages */ - { 0, (sy_call_t *)linux_set_tid_address, AUE_NULL }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)linux_timer_create, AUE_NULL }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)linux_timer_settime, AUE_NULL }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)linux_timer_delete, AUE_NULL }, /* 263 = linux_timer_delete */ - { 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME }, /* 264 = linux_clock_settime */ - { 0, (sy_call_t *)linux_clock_gettime, AUE_NULL }, /* 265 = linux_clock_gettime */ - { 0, (sy_call_t *)linux_clock_getres, AUE_NULL }, /* 266 = linux_clock_getres */ - { 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL }, /* 267 = linux_clock_nanosleep */ - { 0, (sy_call_t *)linux_statfs64, AUE_NULL }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL }, /* 269 = linux_fstatfs64 */ - { 0, (sy_call_t *)linux_tgkill, AUE_NULL }, /* 270 = linux_tgkill */ - { 0, (sy_call_t *)linux_utimes, AUE_NULL }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL }, /* 272 = linux_fadvise64_64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = */ - { 0, (sy_call_t *)linux_mbind, AUE_NULL }, /* 274 = linux_mbind */ - { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL }, /* 275 = linux_get_mempolicy */ - { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL }, /* 276 = linux_set_mempolicy */ - { 0, (sy_call_t *)linux_mq_open, AUE_NULL }, /* 277 = linux_mq_open */ - { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL }, /* 278 = linux_mq_unlink */ - { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL }, /* 279 = linux_mq_timedsend */ - { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL }, /* 280 = linux_mq_timedreceive */ - { 0, (sy_call_t *)linux_mq_notify, AUE_NULL }, /* 281 = linux_mq_notify */ - { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL }, /* 282 = linux_mq_getsetattr */ - { 0, (sy_call_t *)linux_kexec_load, AUE_NULL }, /* 283 = linux_kexec_load */ - { 0, (sy_call_t *)linux_waitid, AUE_NULL }, /* 284 = linux_waitid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = */ - { 0, (sy_call_t *)linux_add_key, AUE_NULL }, /* 286 = linux_add_key */ - { 0, (sy_call_t *)linux_request_key, AUE_NULL }, /* 287 = linux_request_key */ - { 0, (sy_call_t *)linux_keyctl, AUE_NULL }, /* 288 = linux_keyctl */ - { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL }, /* 289 = linux_ioprio_set */ - { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL }, /* 290 = linux_ioprio_get */ - { 0, (sy_call_t *)linux_inotify_init, AUE_NULL }, /* 291 = linux_inotify_init */ - { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL }, /* 292 = linux_inotify_add_watch */ - { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ - { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL }, /* 294 = linux_migrate_pages */ - { 0, (sy_call_t *)linux_openat, AUE_NULL }, /* 295 = linux_openat */ - { 0, (sy_call_t *)linux_mkdirat, AUE_NULL }, /* 296 = linux_mkdirat */ - { 0, (sy_call_t *)linux_mknodat, AUE_NULL }, /* 297 = linux_mknodat */ - { 0, (sy_call_t *)linux_fchownat, AUE_NULL }, /* 298 = linux_fchownat */ - { 0, (sy_call_t *)linux_futimesat, AUE_NULL }, /* 299 = linux_futimesat */ - { 0, (sy_call_t *)linux_fstatat64, AUE_NULL }, /* 300 = linux_fstatat64 */ - { 0, (sy_call_t *)linux_unlinkat, AUE_NULL }, /* 301 = linux_unlinkat */ - { 0, (sy_call_t *)linux_renameat, AUE_NULL }, /* 302 = linux_renameat */ - { 0, (sy_call_t *)linux_linkat, AUE_NULL }, /* 303 = linux_linkat */ - { 0, (sy_call_t *)linux_symlinkat, AUE_NULL }, /* 304 = linux_symlinkat */ - { 0, (sy_call_t *)linux_readlinkat, AUE_NULL }, /* 305 = linux_readlinkat */ - { 0, (sy_call_t *)linux_fchmodat, AUE_NULL }, /* 306 = linux_fchmodat */ - { 0, (sy_call_t *)linux_faccessat, AUE_NULL }, /* 307 = linux_faccessat */ - { 0, (sy_call_t *)linux_pselect6, AUE_NULL }, /* 308 = linux_pselect6 */ - { 0, (sy_call_t *)linux_ppoll, AUE_NULL }, /* 309 = linux_ppoll */ - { 0, (sy_call_t *)linux_unshare, AUE_NULL }, /* 310 = linux_unshare */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = setup */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ + { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0 }, /* 2 = linux_fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0 }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 }, /* 4 = write */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ + { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = linux_chdir */ + { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0 }, /* 13 = linux_time */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = linux_chmod */ + { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0 }, /* 16 = linux_lchown16 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ + { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0 }, /* 18 = linux_stat */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 19 = linux_lseek */ + { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = linux_oldumount */ + { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0 }, /* 23 = linux_setuid16 */ + { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0 }, /* 24 = linux_getuid16 */ + { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 25 = linux_stime */ + { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = linux_ptrace */ + { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0 }, /* 27 = linux_alarm */ + { AS(linux_fstat_args), (sy_call_t *)linux_fstat, AUE_FSTAT, NULL, 0, 0 }, /* 28 = linux_fstat */ + { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0 }, /* 29 = linux_pause */ + { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0 }, /* 30 = linux_utime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 31 = stty */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 32 = gtty */ + { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = linux_access */ + { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0 }, /* 34 = linux_nice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 35 = ftime */ + { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ + { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0 }, /* 37 = linux_kill */ + { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0 }, /* 38 = linux_rename */ + { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 39 = linux_mkdir */ + { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 40 = linux_rmdir */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ + { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = linux_pipe */ + { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0 }, /* 43 = linux_times */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 44 = prof */ + { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0 }, /* 45 = linux_brk */ + { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0 }, /* 46 = linux_setgid16 */ + { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0 }, /* 47 = linux_getgid16 */ + { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0 }, /* 48 = linux_signal */ + { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0 }, /* 49 = linux_geteuid16 */ + { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0 }, /* 50 = linux_getegid16 */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0 }, /* 52 = linux_umount */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 53 = lock */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = linux_ioctl */ + { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 55 = linux_fcntl */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 56 = mpx */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 57 = setpgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 58 = ulimit */ + { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0 }, /* 59 = linux_olduname */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ + { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL, NULL, 0, 0 }, /* 62 = linux_ustat */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 63 = dup2 */ + { 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0 }, /* 64 = getppid */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 65 = getpgrp */ + { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 }, /* 66 = setsid */ + { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL, NULL, 0, 0 }, /* 67 = linux_sigaction */ + { 0, (sy_call_t *)linux_sgetmask, AUE_NULL, NULL, 0, 0 }, /* 68 = linux_sgetmask */ + { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL, NULL, 0, 0 }, /* 69 = linux_ssetmask */ + { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID, NULL, 0, 0 }, /* 70 = linux_setreuid16 */ + { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID, NULL, 0, 0 }, /* 71 = linux_setregid16 */ + { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 72 = linux_sigsuspend */ + { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL, NULL, 0, 0 }, /* 73 = linux_sigpending */ + { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL, NULL, 0, 0 }, /* 74 = linux_sethostname */ + { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 75 = linux_setrlimit */ + { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 76 = linux_old_getrlimit */ + { AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE, NULL, 0, 0 }, /* 77 = getrusage */ + { AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL, NULL, 0, 0 }, /* 78 = gettimeofday */ + { AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 79 = settimeofday */ + { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS, NULL, 0, 0 }, /* 80 = linux_getgroups16 */ + { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS, NULL, 0, 0 }, /* 81 = linux_setgroups16 */ + { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT, NULL, 0, 0 }, /* 82 = linux_old_select */ + { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 83 = linux_symlink */ + { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT, NULL, 0, 0 }, /* 84 = linux_lstat */ + { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK, NULL, 0, 0 }, /* 85 = linux_readlink */ + { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_USELIB, NULL, 0, 0 }, /* 86 = linux_uselib */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS, NULL, 0, 0 }, /* 89 = linux_readdir */ + { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */ + { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */ + { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 93 = linux_ftruncate */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0 }, /* 94 = fchmod */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0 }, /* 95 = fchown */ + { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 96 = linux_getpriority */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 97 = setpriority */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 98 = profil */ + { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS, NULL, 0, 0 }, /* 99 = linux_statfs */ + { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 100 = linux_fstatfs */ + { AS(linux_ioperm_args), (sy_call_t *)linux_ioperm, AUE_NULL, NULL, 0, 0 }, /* 101 = linux_ioperm */ + { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL, NULL, 0, 0 }, /* 102 = linux_socketcall */ + { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL, NULL, 0, 0 }, /* 103 = linux_syslog */ + { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 104 = linux_setitimer */ + { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 105 = linux_getitimer */ + { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT, NULL, 0, 0 }, /* 106 = linux_newstat */ + { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0 }, /* 107 = linux_newlstat */ + { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0 }, /* 108 = linux_newfstat */ + { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0 }, /* 109 = linux_uname */ + { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0 }, /* 110 = linux_iopl */ + { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0 }, /* 111 = linux_vhangup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 112 = idle */ + { 0, (sy_call_t *)linux_vm86old, AUE_NULL, NULL, 0, 0 }, /* 113 = linux_vm86old */ + { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4, NULL, 0, 0 }, /* 114 = linux_wait4 */ + { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF, NULL, 0, 0 }, /* 115 = linux_swapoff */ + { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL, NULL, 0, 0 }, /* 116 = linux_sysinfo */ + { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL, NULL, 0, 0 }, /* 117 = linux_ipc */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 118 = fsync */ + { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 119 = linux_sigreturn */ + { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0 }, /* 120 = linux_clone */ + { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = setdomainname */ + { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0 }, /* 122 = linux_newuname */ + { AS(linux_modify_ldt_args), (sy_call_t *)linux_modify_ldt, AUE_NULL, NULL, 0, 0 }, /* 123 = linux_modify_ldt */ + { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0 }, /* 124 = linux_adjtimex */ + { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 125 = mprotect */ + { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 126 = linux_sigprocmask */ + { 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0 }, /* 127 = linux_create_module */ + { 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0 }, /* 128 = linux_init_module */ + { 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0 }, /* 129 = linux_delete_module */ + { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0 }, /* 130 = linux_get_kernel_syms */ + { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0 }, /* 131 = linux_quotactl */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 132 = getpgid */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 133 = fchdir */ + { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH, NULL, 0, 0 }, /* 134 = linux_bdflush */ + { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL, NULL, 0, 0 }, /* 135 = linux_sysfs */ + { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY, NULL, 0, 0 }, /* 136 = linux_personality */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 137 = afs_syscall */ + { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */ + { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */ + { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS, NULL, 0, 0 }, /* 141 = linux_getdents */ + { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */ + { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */ + { AS(readv_args), (sy_call_t *)readv, AUE_READV, NULL, 0, 0 }, /* 145 = readv */ + { AS(writev_args), (sy_call_t *)writev, AUE_WRITEV, NULL, 0, 0 }, /* 146 = writev */ + { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID, NULL, 0, 0 }, /* 147 = linux_getsid */ + { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL, NULL, 0, 0 }, /* 148 = linux_fdatasync */ + { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 149 = linux_sysctl */ + { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 150 = mlock */ + { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 151 = munlock */ + { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 152 = mlockall */ + { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 153 = munlockall */ + { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM, NULL, 0, 0 }, /* 154 = sched_setparam */ + { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM, NULL, 0, 0 }, /* 155 = sched_getparam */ + { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER, NULL, 0, 0 }, /* 156 = linux_sched_setscheduler */ + { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER, NULL, 0, 0 }, /* 157 = linux_sched_getscheduler */ + { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0 }, /* 158 = sched_yield */ + { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX, NULL, 0, 0 }, /* 159 = linux_sched_get_priority_max */ + { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN, NULL, 0, 0 }, /* 160 = linux_sched_get_priority_min */ + { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL, NULL, 0, 0 }, /* 161 = sched_rr_get_interval */ + { AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0 }, /* 162 = nanosleep */ + { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0 }, /* 163 = linux_mremap */ + { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0 }, /* 164 = linux_setresuid16 */ + { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0 }, /* 165 = linux_getresuid16 */ + { 0, (sy_call_t *)linux_vm86, AUE_NULL, NULL, 0, 0 }, /* 166 = linux_vm86 */ + { 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0 }, /* 167 = linux_query_module */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 168 = poll */ + { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0 }, /* 169 = linux_nfsservctl */ + { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0 }, /* 170 = linux_setresgid16 */ + { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0 }, /* 171 = linux_getresgid16 */ + { 0, (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ + { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0 }, /* 173 = linux_rt_sigreturn */ + { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ + { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ + { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0 }, /* 176 = linux_rt_sigpending */ + { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ + { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ + { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 179 = linux_rt_sigsuspend */ + { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0 }, /* 180 = linux_pread */ + { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 181 = linux_pwrite */ + { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0 }, /* 182 = linux_chown16 */ + { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 183 = linux_getcwd */ + { 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 }, /* 184 = linux_capget */ + { 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 }, /* 185 = linux_capset */ + { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0 }, /* 186 = linux_sigaltstack */ + { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 187 = linux_sendfile */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 188 = getpmsg */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 189 = putpmsg */ + { 0, (sy_call_t *)linux_vfork, AUE_VFORK, NULL, 0, 0 }, /* 190 = linux_vfork */ + { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 191 = linux_getrlimit */ + { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP, NULL, 0, 0 }, /* 192 = linux_mmap2 */ + { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE, NULL, 0, 0 }, /* 193 = linux_truncate64 */ + { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE, NULL, 0, 0 }, /* 194 = linux_ftruncate64 */ + { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT, NULL, 0, 0 }, /* 195 = linux_stat64 */ + { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT, NULL, 0, 0 }, /* 196 = linux_lstat64 */ + { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT, NULL, 0, 0 }, /* 197 = linux_fstat64 */ + { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 198 = linux_lchown */ + { 0, (sy_call_t *)linux_getuid, AUE_GETUID, NULL, 0, 0 }, /* 199 = linux_getuid */ + { 0, (sy_call_t *)linux_getgid, AUE_GETGID, NULL, 0, 0 }, /* 200 = linux_getgid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 201 = geteuid */ + { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 202 = getegid */ + { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0 }, /* 203 = setreuid */ + { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0 }, /* 204 = setregid */ + { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 205 = linux_getgroups */ + { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 206 = linux_setgroups */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL, NULL, 0, 0 }, /* 207 = fchown */ + { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 208 = setresuid */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 209 = getresuid */ + { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 210 = setresgid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 211 = getresgid */ + { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN, NULL, 0, 0 }, /* 212 = linux_chown */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 213 = setuid */ + { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0 }, /* 214 = setgid */ + { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID, NULL, 0, 0 }, /* 215 = linux_setfsuid */ + { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0 }, /* 216 = linux_setfsgid */ + { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */ + { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS, NULL, 0, 0 }, /* 220 = linux_getdents64 */ + { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */ + { 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0 }, /* 224 = linux_gettid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 225 = linux_readahead */ + { 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0 }, /* 226 = linux_setxattr */ + { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL, NULL, 0, 0 }, /* 227 = linux_lsetxattr */ + { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL, NULL, 0, 0 }, /* 228 = linux_fsetxattr */ + { 0, (sy_call_t *)linux_getxattr, AUE_NULL, NULL, 0, 0 }, /* 229 = linux_getxattr */ + { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL, NULL, 0, 0 }, /* 230 = linux_lgetxattr */ + { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL, NULL, 0, 0 }, /* 231 = linux_fgetxattr */ + { 0, (sy_call_t *)linux_listxattr, AUE_NULL, NULL, 0, 0 }, /* 232 = linux_listxattr */ + { 0, (sy_call_t *)linux_llistxattr, AUE_NULL, NULL, 0, 0 }, /* 233 = linux_llistxattr */ + { 0, (sy_call_t *)linux_flistxattr, AUE_NULL, NULL, 0, 0 }, /* 234 = linux_flistxattr */ + { 0, (sy_call_t *)linux_removexattr, AUE_NULL, NULL, 0, 0 }, /* 235 = linux_removexattr */ + { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL, NULL, 0, 0 }, /* 236 = linux_lremovexattr */ + { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL, NULL, 0, 0 }, /* 237 = linux_fremovexattr */ + { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL, NULL, 0, 0 }, /* 238 = linux_tkill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_futex */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ + { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 247 = linux_io_getevents */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 248 = linux_io_submit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 249 = linux_io_cancel */ + { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0 }, /* 250 = linux_fadvise64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 251 = */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 252 = exit_group */ + { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ + { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ + { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ + { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ + { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ + { 0, (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0 }, /* 258 = linux_set_tid_address */ + { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0 }, /* 259 = linux_timer_create */ + { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0 }, /* 260 = linux_timer_settime */ + { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0 }, /* 261 = linux_timer_gettime */ + { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0 }, /* 262 = linux_timer_getoverrun */ + { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0 }, /* 263 = linux_timer_delete */ + { 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 264 = linux_clock_settime */ + { 0, (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ + { 0, (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ + { 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ + { 0, (sy_call_t *)linux_statfs64, AUE_NULL, NULL, 0, 0 }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ + { 0, (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ + { 0, (sy_call_t *)linux_utimes, AUE_NULL, NULL, 0, 0 }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = */ + { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0 }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)linux_mq_open, AUE_NULL, NULL, 0, 0 }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL, NULL, 0, 0 }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL, NULL, 0, 0 }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL, NULL, 0, 0 }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0 }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0 }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0 }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0 }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 285 = */ + { 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0 }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0 }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)linux_keyctl, AUE_NULL, NULL, 0, 0 }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL, NULL, 0, 0 }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL, NULL, 0, 0 }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)linux_inotify_init, AUE_NULL, NULL, 0, 0 }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0 }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ + { 0, (sy_call_t *)linux_openat, AUE_NULL, NULL, 0, 0 }, /* 295 = linux_openat */ + { 0, (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ + { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ + { 0, (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ + { 0, (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ + { 0, (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ + { 0, (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ + { 0, (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ + { 0, (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ + { 0, (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ + { 0, (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ + { 0, (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ + { 0, (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 }, /* 310 = linux_unshare */ }; From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 16:41:31 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 91E9B16A4E1 for ; Sat, 5 Aug 2006 16:41:31 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1B7743D45 for ; Sat, 5 Aug 2006 16:41:30 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 044A146CA7 for ; Sat, 5 Aug 2006 12:41:30 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5A1FF56C6F; Sat, 5 Aug 2006 16:41:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 54ED516A4E6; Sat, 5 Aug 2006 16:41:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 158D716A4E1 for ; Sat, 5 Aug 2006 16:41:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C21FC43D45 for ; Sat, 5 Aug 2006 16:41:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75GfSjI013241 for ; Sat, 5 Aug 2006 16:41:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75GfSop013238 for perforce@freebsd.org; Sat, 5 Aug 2006 16:41:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 16:41:28 GMT Message-Id: <200608051641.k75GfSop013238@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 103256 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 16:41:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=103256 Change 103256 by rwatson@rwatson_zoo on 2006/08/05 16:41:24 Fix one mis-numbering. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#40 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#40 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#39 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#40 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -466,7 +466,7 @@ #define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ #define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ #define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 16:43:33 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B273716A55B for ; Sat, 5 Aug 2006 16:43:33 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33C7E43D53 for ; Sat, 5 Aug 2006 16:43:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B682E46CF6 for ; Sat, 5 Aug 2006 12:43:32 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4BC5055C14; Sat, 5 Aug 2006 16:43:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 46A2D16A4DE; Sat, 5 Aug 2006 16:43:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DD6116A4DA for ; Sat, 5 Aug 2006 16:43:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAB5243D55 for ; Sat, 5 Aug 2006 16:43:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75GhVMn013360 for ; Sat, 5 Aug 2006 16:43:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75GhVCP013357 for perforce@freebsd.org; Sat, 5 Aug 2006 16:43:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 16:43:31 GMT Message-Id: <200608051643.k75GhVCP013357@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 103257 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 16:43:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=103257 Change 103257 by rwatson@rwatson_zoo on 2006/08/05 16:42:31 Merge event fix to audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#24 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#24 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#23 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#24 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -466,7 +466,7 @@ #define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ #define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ #define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 17:40:20 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C422816A4E5 for ; Sat, 5 Aug 2006 17:40:20 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14B3443D46 for ; Sat, 5 Aug 2006 17:40:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3A1AE46B98 for ; Sat, 5 Aug 2006 13:40:19 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1AA9E557E3; Sat, 5 Aug 2006 17:36:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 16BB416A4DE; Sat, 5 Aug 2006 17:36:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E565716A4DA for ; Sat, 5 Aug 2006 17:36:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55A8343D79 for ; Sat, 5 Aug 2006 17:36:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75Haf7d026246 for ; Sat, 5 Aug 2006 17:36:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75HafPN026243 for perforce@freebsd.org; Sat, 5 Aug 2006 17:36:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 17:36:41 GMT Message-Id: <200608051736.k75HafPN026243@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 103262 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 17:40:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=103262 Change 103262 by rwatson@rwatson_zoo on 2006/08/05 17:36:14 Merge event renumbering to kernel. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#26 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#26 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#25 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#26 $ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.6 2006/07/03 14:45:43 rwatson Exp $ */ @@ -467,7 +467,7 @@ #define AUE_EXTATTR_GET_LINK 43110 /* FreeBSD. */ #define AUE_EXTATTR_SET_LINK 43111 /* FreeBSD. */ #define AUE_EXTATTR_LIST_LINK 43112 /* FreeBSD. */ -#define AUE_EXTATTR_DELETE_LINK 43111 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 43113 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 22:09:29 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D30516A4E6 for ; Sat, 5 Aug 2006 22:09:29 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EBF943D88 for ; Sat, 5 Aug 2006 22:09:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E350A46BA3 for ; Sat, 5 Aug 2006 18:09:09 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DC6595B485; Sat, 5 Aug 2006 22:09:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D590B16A4E1; Sat, 5 Aug 2006 22:09:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5EF8F16A4DA for ; Sat, 5 Aug 2006 22:09:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3400B43D62 for ; Sat, 5 Aug 2006 22:08:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75M8p5i055230 for ; Sat, 5 Aug 2006 22:08:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75M8h7p055221 for perforce@freebsd.org; Sat, 5 Aug 2006 22:08:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 22:08:43 GMT Message-Id: <200608052208.k75M8h7p055221@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 103285 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 22:09:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=103285 Change 103285 by rwatson@rwatson_zoo on 2006/08/05 22:07:53 Integrate mac2 branch. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spiio.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/files.at91#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/std.at91#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/conf/KB920X#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files#3 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.amd64#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.arm#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.i386#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.ia64#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.pc98#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.powerpc#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.amd64#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.arm#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.i386#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.pc98#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src.diff#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/ddb/db_command.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_output.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_ps.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/db_thread.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ddb/ddb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/amr/amr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/asr/MAINTAINER#2 delete .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bktr/CHANGELOG.TXT#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/README#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mii/gentbi.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/mii/ip1000phy.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/mii/miidevs#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pci/pci.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/random/probe.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/re/if_re.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sio/sio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/driver.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spi.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spibus.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spibus_if.m#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/spibus/spibusvar.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/stge/if_stge.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/stge/if_stgereg.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/dev/streams/streams.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/doc/Doxyfile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/Makefile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Dependencies#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-cam#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-crypto#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-dev_pci#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-dev_sound#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-dev_usb#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-geom#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-i4b#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-kern#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-libkern#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-linux#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-net80211#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netgraph#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netinet#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netinet6#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-netipsec#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-opencrypto#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Doxyfile-vm#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/Makefile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/README#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/common-Doxyfile#2 delete .. //depot/projects/trustedbsd/mac2/sys/doc/subsys/notreviewed.dox#2 delete .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/geom.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/emu10k1.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/conf/PAE#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_poll.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/include/i4b_ioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/isa/isahint.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/bus_if.m#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/init_sysent.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_acl.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_environment.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_intr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_linker.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_lock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_prot.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_resource.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_sx.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_tc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_thr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_time.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/link_elf.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_acl_posix1e.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_bus.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_hints.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_prf.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_rman.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/sys_generic.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/sys_socket.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.master#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/systrace_args.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_sem.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/Makefile#3 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/agp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/asr/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1000/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1040/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1040_it/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1080/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_1080_it/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_12160/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_12160_it/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2100/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2200/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2300/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/isp_2322/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/ispfw/ispfw/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/mii/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/osf1/Makefile#2 delete .. //depot/projects/trustedbsd/mac2/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/stge/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/net/bpf.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/bridgestp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/bridgestp.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/net/if.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_bridge.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_clone.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_clone.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_disc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_enc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_faith.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_gif.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_gre.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_loop.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_ppp.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_stf.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_tap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_vlan.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/net_osdep.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/rtsock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatm/atm_aal5.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_gif.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/README#2 delete .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_aesxcbcmac.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ah_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_aesctr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/frag6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipcomp_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipcomp_input.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipcomp_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/mld6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/nd6.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netipsec/keysock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netkey/key.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netkey/keydb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netkey/keysock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netnatm/natm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pci/ncr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/posix4/ksched.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/posix4/posix4.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/powerpc/psim/sio_iobus.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/_label.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/bufobj.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/bus.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/extattr.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/kernel.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/libkern.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/mbuf.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/mutex.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/param.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/protosw.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/socket.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/socketvar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sockio.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/stat.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscall.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscall.mk#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysctl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysent.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysproto.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/systm.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/thr.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/time.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/types.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/unpcb.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/swap_pager.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/uma_core.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_fault.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_map.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_meter.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_object.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_object.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_page.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_pageout.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/db_trace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $"); #include #include @@ -390,16 +390,14 @@ long *argp; db_expr_t offset; c_db_sym_t sym; - int narg, quit; + int narg; boolean_t first; if (count == -1) count = 1024; first = TRUE; - quit = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - while (count-- && !quit) { + while (count-- && !db_pager_quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $"); #include "opt_cpu.h" @@ -296,8 +296,8 @@ "\034RDTSCP" /* RDTSCP */ "\035" /* Undefined */ "\036LM" /* 64 bit long mode */ - "\0373DNow+" /* AMD 3DNow! Extensions */ - "\0403DNow" /* AMD 3DNow! */ + "\0373DNow!+" /* AMD 3DNow! Extensions */ + "\0403DNow!" /* AMD 3DNow! */ ); } @@ -306,8 +306,8 @@ "\020" "\001LAHF" /* LAHF/SAHF in long mode */ "\002CMP" /* CMP legacy */ - "\003" - "\004" + "\003SVM" /* Secure Virtual Mode */ + "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ "\006" "\007" ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $ */ /* @@ -338,16 +338,14 @@ DB_SHOW_COMMAND(irqs, db_show_irqs) { struct intsrc **isrc; - int i, quit, verbose; + int i, verbose; - quit = 0; if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; isrc = interrupt_sources; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) + for (i = 0; i < NUM_IO_INTS && !db_pager_quit; i++, isrc++) if (*isrc != NULL) db_dump_intr_event((*isrc)->is_event, verbose); } ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.25 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -755,18 +755,16 @@ DB_SHOW_COMMAND(apic, db_show_apic) { struct intsrc *isrc; - int quit, i, verbose; + int i, verbose; u_int irq; - quit = 0; if (strcmp(modif, "vv") == 0) verbose = 2; else if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < APIC_NUM_IOINTS + 1 && !quit; i++) { + for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) { irq = ioint_irqs[i]; if (irq != 0 && irq != IRQ_SYSCALL) { db_printf("vec 0x%2x -> ", i + APIC_IO_INTS); ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.651 2006/07/27 19:47:22 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -947,17 +947,17 @@ if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) Maxmem = atop(physmem_tunable); + /* + * Don't allow MAXMEM or hw.physmem to extend the amount of memory + * in the system. + */ + if (Maxmem > atop(physmap[physmap_idx + 1])) + Maxmem = atop(physmap[physmap_idx + 1]); + if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) printf("Physical memory use set to %ldK\n", Maxmem * 4); - /* - * If Maxmem has been increased beyond what the system has detected, - * extend the last memory segment to the new limit. - */ - if (atop(physmap[physmap_idx + 1]) < Maxmem) - physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem); - /* call pmap initialization to make new kernel address space */ pmap_bootstrap(&first); ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.564 2006/07/05 07:04:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.568 2006/08/01 19:06:04 alc Exp $"); /* * Manages physical address maps. @@ -207,7 +207,6 @@ static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); -static void pmap_clear_write(vm_page_t m); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); @@ -1627,6 +1626,7 @@ int idx, field, bit; mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); pv_entry_count--; @@ -2015,8 +2015,8 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; pmap_unuse_pt(pmap, pv->pv_va, ptepde); + free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); - free_pv_entry(pmap, pv); } vm_page_flag_clear(m, PG_WRITEABLE); } @@ -2971,8 +2971,8 @@ /* * Clear the write and modified bits in each of the given page's mappings. */ -static __inline void -pmap_clear_write(vm_page_t m) +void +pmap_remove_write(vm_page_t m) { pv_entry_t pv; pmap_t pmap; @@ -3002,23 +3002,6 @@ } /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - if ((prot & VM_PROT_WRITE) == 0) { - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_clear_write(m); - } else { - pmap_remove_all(m); - } - } -} - -/* * pmap_ts_referenced: * * Return a count of reference bits for a page, clearing those bits. @@ -3050,14 +3033,12 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); - if (pte != NULL && (*pte & PG_A) != 0) { + if ((*pte & PG_A) != 0) { atomic_clear_long(pte, PG_A); pmap_invalidate_page(pmap, pv->pv_va); rtval++; - if (rtval > 4) { - PMAP_UNLOCK(pmap); - break; - } + if (rtval > 4) + pvn = NULL; } PMAP_UNLOCK(pmap); } while ((pv = pvn) != NULL && pv != pvf); ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.304 2006/06/20 12:44:21 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.307 2006/07/28 20:22:57 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -145,9 +145,7 @@ SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW, &panic_on_nmi, 0, "Panic on NMI"); -#ifdef WITNESS extern char *syscallnames[]; -#endif /* * Exception, fault, and trap interface to the FreeBSD kernel. @@ -780,7 +778,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware @@ -814,17 +812,9 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - if ((callp->sy_narg & SYF_MPSAFE) == 0) { - mtx_lock(&Giant); - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - mtx_unlock(&Giant); - } else { - AUDIT_SYSCALL_ENTER(code, td); - error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(error, td); - } + AUDIT_SYSCALL_ENTER(code, td); + error = (*callp->sy_call)(td, argp); + AUDIT_SYSCALL_EXIT(error, td); } switch (error) { @@ -874,6 +864,19 @@ } /* + * Check for misbehavior. + */ + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); + KASSERT(td->td_critnest == 0, + ("System call %s returning in a critical section", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???")); + KASSERT(td->td_locks == 0, + ("System call %s returning with %d locks held", + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???", + td->td_locks)); + + /* * Handle reschedule and other end-of-syscall issues */ userret(td, &frame); @@ -894,9 +897,4 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); - mtx_assert(&sched_lock, MA_NOTOWNED); - mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/vm_machdep.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.250 2005/10/24 20:53:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.251 2006/07/24 12:24:56 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -328,7 +328,6 @@ td->td_frame->tf_rsp = ((register_t)stack->ss_sp + stack->ss_size) & ~0x0f; td->td_frame->tf_rsp -= 8; - td->td_frame->tf_rbp = 0; td->td_frame->tf_rip = (register_t)entry; /* ==== //depot/projects/trustedbsd/mac2/sys/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.463 2006/07/05 02:32:55 davidxu Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.464 2006/07/09 16:39:21 mjacob Exp $ cpu HAMMER ident GENERIC @@ -251,6 +251,7 @@ device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) +device firmware # firmware assist module # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! ==== //depot/projects/trustedbsd/mac2/sys/amd64/conf/NOTES#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 23:30:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9759016A4E6 for ; Sat, 5 Aug 2006 23:30:44 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E400343D4C for ; Sat, 5 Aug 2006 23:30:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 564C346BA9 for ; Sat, 5 Aug 2006 19:30:43 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 94769557B5; Sat, 5 Aug 2006 23:30:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CB1116A4E0; Sat, 5 Aug 2006 23:30:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54D4F16A4DA for ; Sat, 5 Aug 2006 23:30:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C47143D45 for ; Sat, 5 Aug 2006 23: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.6/8.13.6) with ESMTP id k75NUfxK065426 for ; Sat, 5 Aug 2006 23:30:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75NUff2065422 for perforce@freebsd.org; Sat, 5 Aug 2006 23:30:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:30:41 GMT Message-Id: <200608052330.k75NUff2065422@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 103295 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:30:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=103295 Change 103295 by rwatson@rwatson_zoo on 2006/08/05 23:30:23 opt_devfs.h no longer used. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#5 (text+ko) ==== @@ -40,7 +40,6 @@ * mkdir: want it ? */ -#include "opt_devfs.h" #include "opt_mac.h" #include From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 23:40:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0DA5D16A50E for ; Sat, 5 Aug 2006 23:40:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85C7243D49 for ; Sat, 5 Aug 2006 23:40:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id F094546CAD for ; Sat, 5 Aug 2006 19:40:56 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 805F9555CB; Sat, 5 Aug 2006 23:40:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 785D416A4DF; Sat, 5 Aug 2006 23:40:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5367316A4DD for ; Sat, 5 Aug 2006 23:40:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07AA743D49 for ; Sat, 5 Aug 2006 23:40:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75NeslQ067262 for ; Sat, 5 Aug 2006 23:40:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75NesOP067259 for perforce@freebsd.org; Sat, 5 Aug 2006 23:40:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:40:54 GMT Message-Id: <200608052340.k75NesOP067259@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 103296 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:40:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=103296 Change 103296 by rwatson@rwatson_zoo on 2006/08/05 23:40:38 Add mac_audit.c from SEDarwin8 to TrustedBSD audit3 branch. Not yet hooked up to the build, made to build on FreeBSD, etc. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 23:41:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EEC8216A563 for ; Sat, 5 Aug 2006 23:41:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FFC443D49 for ; Sat, 5 Aug 2006 23:41:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id DB0B246B95 for ; Sat, 5 Aug 2006 19:41:57 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 595AE5589C; Sat, 5 Aug 2006 23:41:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5171816A4DD; Sat, 5 Aug 2006 23:41:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17A5816A4DF for ; Sat, 5 Aug 2006 23:41:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C176043D49 for ; Sat, 5 Aug 2006 23:41: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.6/8.13.6) with ESMTP id k75NfuH7067353 for ; Sat, 5 Aug 2006 23:41:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75Nfudo067350 for perforce@freebsd.org; Sat, 5 Aug 2006 23:41:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:41:56 GMT Message-Id: <200608052341.k75Nfudo067350@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 103297 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:41:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=103297 Change 103297 by rwatson@rwatson_zoo on 2006/08/05 23:41:56 Update new instance of a MAC Framework invocation for mac2 world order. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#5 (text+ko) ==== @@ -623,7 +623,7 @@ if (error) goto fail; #ifdef MAC - error = mac_check_vnode_chroot(td->td_ucred, vp); + error = mac_vnode_check_chroot(td->td_ucred, vp); if (error) goto fail; #endif From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 23:48:08 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E64016A4FD for ; Sat, 5 Aug 2006 23:48:08 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6324F43D46 for ; Sat, 5 Aug 2006 23:48:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8833D46C12 for ; Sat, 5 Aug 2006 19:48:06 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E56685686F; Sat, 5 Aug 2006 23:48:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DD60916A4E0; Sat, 5 Aug 2006 23:48:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA61516A4DD for ; Sat, 5 Aug 2006 23:48:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6611143D45 for ; Sat, 5 Aug 2006 23:48:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75Nm5ZF067641 for ; Sat, 5 Aug 2006 23:48:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75Nm5Ej067638 for perforce@freebsd.org; Sat, 5 Aug 2006 23:48:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:48:05 GMT Message-Id: <200608052348.k75Nm5Ej067638@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 103298 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:48:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=103298 Change 103298 by rwatson@rwatson_zoo on 2006/08/05 23:47:29 Restyle/etc for FreeBSD: - General white space, line wrap, etc, cleanup. - Avoid assignments in local variable declaration. - mac_audit.c is only built on FreeBSD if AUDIT is compiled in, so drop all the ifdefs for it. - Extend #if 0 section to cover policy submission of audit records, we're not ready for that yet. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ - /*- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin @@ -33,13 +32,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $FreeBSD$ */ #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -47,8 +47,6 @@ #include #include -#ifdef AUDIT - int mac_check_system_audit(struct ucred *cred, void *record, int length) { @@ -73,7 +71,9 @@ mac_check_system_auditctl(struct ucred *cred, struct vnode *vp) { int error; - struct label *vl = vp ? vp->v_label : NULL; + struct label *vl; + + vl = (vp != NULL) ? vp->v_label : NULL; MAC_CHECK(check_system_auditctl, cred, vp, vl); @@ -100,8 +100,8 @@ return (error); } -int -mac_check_proc_getaudit(struct ucred *cred) +int +mac_check_proc_getaudit(struct ucred *cred) { int error; @@ -122,11 +122,9 @@ #if 0 /* - * This is the framework entry point for MAC policies to use to add - * arbitrary data to the current audit record. - * (Currently not supported, as no existing audit viewers would - * display this format) - * + * This is the framework entry point for MAC policies to use to add arbitrary + * data to the current audit record. (Currently not supported, as no + * existing audit viewers display this format) */ int mac_audit_data(int len, u_char *data, struct mac_policy_conf *caller) @@ -143,11 +141,10 @@ bcopy(data, sanitized, len); return (audit_mac_data(MAC_AUDIT_DATA_TYPE, len, sanitized)); } -#endif /* - * This is the entry point a MAC policy will call to add NULL- - * terminated ASCII text to the current audit record. + * This is the entry point a MAC policy will call to add NULL-terminated + * ASCII text to the current audit record. */ int mac_audit_text(char *text, struct mac_policy_conf *caller) @@ -189,16 +186,16 @@ ret = MAC_AUDIT_DEFAULT; LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { if (mpc->mpc_ops->mpo_audit_preselect != NULL) { - error = mpc->mpc_ops->mpo_audit_preselect(cred, syscode, - args); + error = mpc->mpc_ops->mpo_audit_preselect(cred, + syscode, args); ret = (ret > error ? ret : error); } } if ((entrycount = mac_policy_list_conditional_busy()) != 0) { LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { if (mpc->mpc_ops->mpo_audit_preselect != NULL) { - error = mpc->mpc_ops->mpo_audit_preselect(cred, syscode, - args); + error = mpc->mpc_ops->mpo_audit_preselect( + cred, syscode, args); ret = (ret > error ? ret : error); } } @@ -225,16 +222,16 @@ ret = MAC_AUDIT_DEFAULT; LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { if (mpc->mpc_ops->mpo_audit_postselect != NULL) { - mac_error = mpc->mpc_ops->mpo_audit_postselect(cred, syscode, - args, error, retval); + mac_error = mpc->mpc_ops->mpo_audit_postselect(cred, + syscode, args, error, retval); ret = (ret > mac_error ? ret : mac_error); } } if ((entrycount = mac_policy_list_conditional_busy()) != 0) { LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { if (mpc->mpc_ops->mpo_audit_postselect != NULL) { - mac_error = mpc->mpc_ops->mpo_audit_postselect(cred, syscode, - args, error, retval); + mac_error = mpc->mpc_ops->mpo_audit_postselect( + cred, syscode, args, error, retval); ret = (ret > mac_error ? ret : mac_error); } } @@ -243,82 +240,4 @@ return (ret); } - -#else /* AUDIT */ - -/* - * Function stubs for when AUDIT isn't defined. - */ - -int -mac_check_system_audit(struct ucred *cred, void *record, int length) -{ - - return (0); -} - -int -mac_check_system_auditon(struct ucred *cred, int cmd) -{ - - return (0); -} - -int -mac_check_system_auditctl(struct ucred *cred, struct vnode *vp) -{ - - return (0); -} - -int -mac_check_proc_getauid(struct ucred *cred) -{ - - return (0); -} - -int -mac_check_proc_setauid(struct ucred *cred, uid_t auid) -{ - - return (0); -} - -int -mac_check_proc_getaudit(struct ucred *cred) -{ - - return (0); -} - -int -mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai) -{ - - return (0); -} - -int -mac_audit_preselect(struct ucred *cred, unsigned short syscode, - void *args) -{ - - return (MAC_AUDIT_DEFAULT); -} - -int -mac_audit_postselect(struct ucred *cred, unsigned short syscode, - void *args, int error, int retval, int mac_forced) -{ - - return (MAC_AUDIT_DEFAULT); -} - -int -mac_audit(int len, u_char *data) -{ - - return (0); -} -#endif /* !AUDIT */ +#endif From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 23:49:09 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 979AE16A500 for ; Sat, 5 Aug 2006 23:49:09 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A06D43D45 for ; Sat, 5 Aug 2006 23:49:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 52B6F46C12 for ; Sat, 5 Aug 2006 19:49:08 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A39885631D; Sat, 5 Aug 2006 23:49:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BB8216A4DE; Sat, 5 Aug 2006 23:49:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6200516A4DA for ; Sat, 5 Aug 2006 23:49:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2ED2B43D45 for ; Sat, 5 Aug 2006 23:49:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75Nn791067681 for ; Sat, 5 Aug 2006 23:49:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75Nn6XS067678 for perforce@freebsd.org; Sat, 5 Aug 2006 23:49:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:49:06 GMT Message-Id: <200608052349.k75Nn6XS067678@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 103299 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:49:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=103299 Change 103299 by rwatson@rwatson_zoo on 2006/08/05 23:48:14 Optionally compile mac_audit.c into the kernel if both MAC and AUDIT. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/conf/files#24 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/conf/files#24 (text+ko) ==== @@ -1906,6 +1906,7 @@ security/audit/audit_syscalls.c standard security/audit/audit_trigger.c optional audit security/audit/audit_worker.c optional audit +security/mac/mac_audit.c optional mac audit security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 23:51:14 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 355D516A4E0 for ; Sat, 5 Aug 2006 23:51:14 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46BD943D46 for ; Sat, 5 Aug 2006 23:51:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5C9FB46C9A for ; Sat, 5 Aug 2006 19:51:11 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9AFCD57837; Sat, 5 Aug 2006 23:51:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 935D216A4E0; Sat, 5 Aug 2006 23:51:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E3DE16A4DD for ; Sat, 5 Aug 2006 23:51:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A08543D46 for ; Sat, 5 Aug 2006 23:51:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75NpAKk067894 for ; Sat, 5 Aug 2006 23:51:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75Np9uK067891 for perforce@freebsd.org; Sat, 5 Aug 2006 23:51:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:51:09 GMT Message-Id: <200608052351.k75Np9uK067891@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 103300 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:51:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=103300 Change 103300 by rwatson@rwatson_zoo on 2006/08/05 23:50:53 FreeBSD include files. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#3 (text+ko) ==== @@ -36,16 +36,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include + +#include + +#include int mac_check_system_audit(struct ucred *cred, void *record, int length) From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 23:59:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7494016A4E1 for ; Sat, 5 Aug 2006 23:59:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD1B543D5E for ; Sat, 5 Aug 2006 23:59:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5403946C9B for ; Sat, 5 Aug 2006 19:59:24 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D1AFE732A9; Sat, 5 Aug 2006 23:59:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C9A6316A4E1; Sat, 5 Aug 2006 23:59:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CEC316A4DD for ; Sat, 5 Aug 2006 23:59:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E82243D70 for ; Sat, 5 Aug 2006 23:59:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75NxLAB068213 for ; Sat, 5 Aug 2006 23:59:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75NxLPd068210 for perforce@freebsd.org; Sat, 5 Aug 2006 23:59:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:59:21 GMT Message-Id: <200608052359.k75NxLPd068210@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 103302 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:59:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=103302 Change 103302 by rwatson@rwatson_zoo on 2006/08/05 23:59:01 One more include. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#4 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 5 23:59:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9234E16A4DE for ; Sat, 5 Aug 2006 23:59:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3683143D6E for ; Sat, 5 Aug 2006 23:59:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8135546CF0 for ; Sat, 5 Aug 2006 19:59:28 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0062874340; Sat, 5 Aug 2006 23:59:28 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id ECB6116A4DD; Sat, 5 Aug 2006 23:59:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CA4916A4E0 for ; Sat, 5 Aug 2006 23:59:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CA8443D6E for ; Sat, 5 Aug 2006 23:59:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k75NxKeh068207 for ; Sat, 5 Aug 2006 23:59:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k75NxKEX068204 for perforce@freebsd.org; Sat, 5 Aug 2006 23:59:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 5 Aug 2006 23:59:20 GMT Message-Id: <200608052359.k75NxKEX068204@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 103301 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 23:59:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=103301 Change 103301 by rwatson@rwatson_zoo on 2006/08/05 23:58:51 Audit entry point prototypes and mpo field. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/sys/mac.h#7 edit .. //depot/projects/trustedbsd/audit3/sys/sys/mac_policy.h#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/sys/mac.h#7 (text+ko) ==== @@ -110,6 +110,7 @@ /* * Kernel functions to manage and evaluate labels. */ +struct auditinfo; struct bpf_d; struct cdev; struct componentname; @@ -466,6 +467,18 @@ void mac_associate_nfsd_label(struct ucred *cred); /* + * XXXRW: Audit checks should be above, but list them here to make a more + * sensible diff for now. + */ +int mac_check_system_audit(struct ucred *cred, void *record, int length); +int mac_check_system_auditon(struct ucred *cred, int cmd); +int mac_check_system_auditctl(struct ucred *cred, struct vnode *vp); +int mac_check_proc_getauid(struct ucred *cred); +int mac_check_proc_setauid(struct ucred *cred, uid_t auid); +int mac_check_proc_getaudit(struct ucred *cred); +int mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai); + +/* * Calls to help various file systems implement labeling functionality * using their existing EA implementation. */ ==== //depot/projects/trustedbsd/audit3/sys/sys/mac_policy.h#7 (text+ko) ==== @@ -591,6 +591,21 @@ struct label *label); typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); +/* + * XXXRW: Audit checks should be above, but list them here to make a more + * sensible diff for now. + */ +typedef int (*mpo_check_system_audit_t)(struct ucred *cred, void *record, + int length); +typedef int (*mpo_check_system_auditon_t)(struct ucred *cred, int cmd); +typedef int (*mpo_check_system_auditctl_t)(struct ucred *cred, + struct vnode *vp, struct label *vplabel); +typedef int (*mpo_check_proc_getauid_t)(struct ucred *cred); +typedef int (*mpo_check_proc_setauid_t)(struct ucred *cred, uid_t auid); +typedef int (*mpo_check_proc_getaudit_t)(struct ucred *cred); +typedef int (*mpo_check_proc_setaudit_t)(struct ucred *cred, + struct auditinfo *ai); + struct mac_policy_ops { /* * Policy module operations. @@ -879,6 +894,18 @@ mpo_check_vnode_stat_t mpo_check_vnode_stat; mpo_check_vnode_write_t mpo_check_vnode_write; mpo_associate_nfsd_label_t mpo_associate_nfsd_label; + + /* + * XXXRW: Audit checks should be above, but list them here to make a + * more sensible diff for now. + */ + mpo_check_system_audit_t mpo_check_system_audit; + mpo_check_system_auditon_t mpo_check_system_auditon; + mpo_check_system_auditctl_t mpo_check_system_auditctl; + mpo_check_proc_getauid_t mpo_check_proc_getauid; + mpo_check_proc_setauid_t mpo_check_proc_setauid; + mpo_check_proc_getaudit_t mpo_check_proc_getaudit; + mpo_check_proc_setaudit_t mpo_check_proc_setaudit; }; /* From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 6 10:18:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A37CD16A4E0 for ; Sun, 6 Aug 2006 10:18:37 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18F4643D58 for ; Sun, 6 Aug 2006 10:18:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3205146CD1 for ; Sun, 6 Aug 2006 06:18:35 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8881355565; Sun, 6 Aug 2006 10:18:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 83FAB16A4E1; Sun, 6 Aug 2006 10:18:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5ECE516A4DE for ; Sun, 6 Aug 2006 10:18:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 060DA43D53 for ; Sun, 6 Aug 2006 10:18:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k76AIXXP037508 for ; Sun, 6 Aug 2006 10:18:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76AIVDj037505 for perforce@freebsd.org; Sun, 6 Aug 2006 10:18:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 Aug 2006 10:18:31 GMT Message-Id: <200608061018.k76AIVDj037505@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 103317 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 10:18:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=103317 Change 103317 by rwatson@rwatson_zoo on 2006/08/06 10:17:32 Initial placement of MAC checks in audit system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#19 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#19 (text+ko) ==== @@ -29,7 +29,17 @@ * $FreeBSD: src/sys/security/audit/audit_syscalls.c,v 1.4 2006/06/05 22:36:12 rwatson Exp $ */ +/* + * XXXRW: The MAC checks here vary in location based on when the arguments + * they need have been copied in. Probably, we should universally adopt the + * order: (1) copy in arguments (2) audit arguments (3) MAC check + * (4) suser() check. + */ + +#include "opt_mac.h" + #include +#include #include #include #include @@ -112,6 +122,12 @@ goto free_out; } +#ifdef MAC + error = mac_check_system_audit(td->td_ucred, rec, uap->length); + if (error) + goto free_out; +#endif + /* * Attach the user audit record to the kernel audit record. Because * this system call is an auditable event, we will write the user @@ -148,6 +164,13 @@ struct proc *tp; AUDIT_ARG(cmd, uap->cmd); + +#ifdef MAC + error = mac_check_system_auditon(td->td_ucred, uap->cmd); + if (error) + return (error); +#endif + error = suser(td); if (error) return (error); @@ -394,6 +417,12 @@ int error; au_id_t id; +#ifdef MAC + error = mac_check_proc_getauid(td->td_ucred); + if (error) + return (error); +#endif + error = suser(td); if (error) return (error); @@ -426,6 +455,12 @@ audit_arg_auid(id); +#ifdef MAC + error = mac_check_proc_setauid(td->td_ucred, id); + if (error) + return (error); +#endif + /* * XXX: Integer write on static pointer dereference: doesn't need * locking? @@ -454,6 +489,12 @@ struct auditinfo ai; int error; +#ifdef MAC + error = mac_check_proc_getaudit(td->td_ucred); + if (error) + return (error); +#endif + error = suser(td); if (error) return (error); @@ -483,6 +524,12 @@ audit_arg_auditinfo(&ai); +#ifdef MAC + error = mac_check_proc_setaudit(td->td_ucred, &ai); + if (error) + return (error); +#endif + /* * XXXRW: Test privilege while holding the proc lock? */ @@ -500,6 +547,12 @@ { int error; +#ifdef MAC + error = mac_check_proc_getaudit(td->td_ucred); + if (error) + return (error); +#endif + error = suser(td); if (error) return (error); @@ -516,6 +569,13 @@ error = suser(td); if (error) return (error); + +#ifdef MAC + error = mac_check_proc_setaudit(td->td_ucred, NULL); + if (error) + return (error); +#endif + return (ENOSYS); } From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 6 11:01:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 975CD16A4DA for ; Sun, 6 Aug 2006 11:01:38 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1643243D53 for ; Sun, 6 Aug 2006 11:01:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7969346CEB for ; Sun, 6 Aug 2006 07:01:37 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CB703558FA; Sun, 6 Aug 2006 11:01:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C897E16A4E6; Sun, 6 Aug 2006 11:01:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3ECD16A4DD for ; Sun, 6 Aug 2006 11:01:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5290843D45 for ; Sun, 6 Aug 2006 11:01:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k76B1Z1S041169 for ; Sun, 6 Aug 2006 11:01:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76B1ZBJ041166 for perforce@freebsd.org; Sun, 6 Aug 2006 11:01:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 Aug 2006 11:01:35 GMT Message-Id: <200608061101.k76B1ZBJ041166@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 103326 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 11:01:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=103326 Change 103326 by rwatson@rwatson_zoo on 2006/08/06 11:01:27 In FreeBSD, assert the vnode lock when accessing MAC labels on vnodes. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#5 (text+ko) ==== @@ -71,6 +71,8 @@ int error; struct label *vl; + ASSERT_VOP_LOCKED(vp, "mac_check_system_auditctl"); + vl = (vp != NULL) ? vp->v_label : NULL; MAC_CHECK(check_system_auditctl, cred, vp, vl); From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 6 11:05:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F6E916A4E5 for ; Sun, 6 Aug 2006 11:05:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F33943D5D for ; Sun, 6 Aug 2006 11:05:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 81CD646CC9 for ; Sun, 6 Aug 2006 07:05:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 849A663078; Sun, 6 Aug 2006 11:04:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E5BF716A4DE; Sun, 6 Aug 2006 11:04:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFEAB16A4DA for ; Sun, 6 Aug 2006 11:04:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8671043D46 for ; Sun, 6 Aug 2006 11:04:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k76B4dcw042624 for ; Sun, 6 Aug 2006 11:04:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76B4ddh042621 for perforce@freebsd.org; Sun, 6 Aug 2006 11:04:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 Aug 2006 11:04:39 GMT Message-Id: <200608061104.k76B4ddh042621@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 103327 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 11:05:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=103327 Change 103327 by rwatson@rwatson_zoo on 2006/08/06 11:03:57 Audit path/vnode argument to auditctl(). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#20 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#20 (text+ko) ==== @@ -612,8 +612,8 @@ if (uap->path == NULL) return (EINVAL); - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE, UIO_USERSPACE, - uap->path, td); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, + UIO_USERSPACE, uap->path, td); flags = AUDIT_OPEN_FLAGS; error = vn_open(&nd, &flags, 0, -1); if (error) From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 6 13:19:51 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF33D16A504 for ; Sun, 6 Aug 2006 13:19:51 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 288B743D46 for ; Sun, 6 Aug 2006 13:19:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A10F246B40 for ; Sun, 6 Aug 2006 09:19:50 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C8B7C5CEFC; Sun, 6 Aug 2006 13:19:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C458B16A4DE; Sun, 6 Aug 2006 13:19:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 937A116A4DA for ; Sun, 6 Aug 2006 13:19:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AF9C43D45 for ; Sun, 6 Aug 2006 13:19:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k76DJYx1059995 for ; Sun, 6 Aug 2006 13:19:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76DJYia059992 for perforce@freebsd.org; Sun, 6 Aug 2006 13:19:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 Aug 2006 13:19:34 GMT Message-Id: <200608061319.k76DJYia059992@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 103334 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 13:19:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=103334 Change 103334 by rwatson@rwatson_peppercorn on 2006/08/06 13:19:15 Audit ia32 system calls on ia64. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/ia64/ia32/ia32_trap.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/ia64/ia32/ia32_trap.c#6 (text+ko) ==== @@ -46,6 +46,8 @@ #include #include +#include + extern char *syscallnames[]; static void @@ -122,7 +124,9 @@ PTRACESTOP_SC(p, td, S_PT_SCE); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args64); + AUDIT_SYSCALL_EXIT(error, td); } switch (error) { From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 6 13:21:39 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B544216A4E0 for ; Sun, 6 Aug 2006 13:21:39 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C73D43D45 for ; Sun, 6 Aug 2006 13:21:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A49CC46D90 for ; Sun, 6 Aug 2006 09:21:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 08C705CEFC; Sun, 6 Aug 2006 13:21:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 058F616A4E5; Sun, 6 Aug 2006 13:21:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D351316A4E1 for ; Sun, 6 Aug 2006 13:21:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90BB043D4C for ; Sun, 6 Aug 2006 13:21:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k76DLbbu060229 for ; Sun, 6 Aug 2006 13:21:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76DLbRE060226 for perforce@freebsd.org; Sun, 6 Aug 2006 13:21:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 Aug 2006 13:21:37 GMT Message-Id: <200608061321.k76DLbRE060226@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 103335 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 13:21:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=103335 Change 103335 by rwatson@rwatson_peppercorn on 2006/08/06 13:21:12 Audit IA64 system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/trap.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/ia64/ia64/trap.c#10 (text+ko) ==== @@ -72,6 +72,8 @@ #include #endif +#include + #include static int print_usertrap = 0; @@ -1016,7 +1018,9 @@ PTRACESTOP_SC(p, td, S_PT_SCE); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); + AUDIT_SYSCALL_EXIT(error, td); if (error != EJUSTRETURN) { /* From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 6 13:23:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E64F416A4DA for ; Sun, 6 Aug 2006 13:23:07 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EEED43D45 for ; Sun, 6 Aug 2006 13:23:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B881246CB5 for ; Sun, 6 Aug 2006 09:23:06 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 99C945CEFC; Sun, 6 Aug 2006 13:22:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 95DA816A4E0; Sun, 6 Aug 2006 13:22:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 567D916A4DA for ; Sun, 6 Aug 2006 13:22:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D84443D46 for ; Sun, 6 Aug 2006 13:22:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k76DMfFN060291 for ; Sun, 6 Aug 2006 13:22:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76DMefE060288 for perforce@freebsd.org; Sun, 6 Aug 2006 13:22:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 Aug 2006 13:22:40 GMT Message-Id: <200608061322.k76DMefE060288@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 103336 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 13:23:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=103336 Change 103336 by rwatson@rwatson_peppercorn on 2006/08/06 13:22:21 Audit PowerPC system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/trap.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/trap.c#8 (text+ko) ==== @@ -55,6 +55,8 @@ #endif #include +#include + #include #include #include @@ -418,7 +420,9 @@ PTRACESTOP_SC(p, td, S_PT_SCE); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, params); + AUDIT_SYSCALL_EXIT(error, td); CTR3(KTR_SYSC, "syscall: p=%s %s ret=%x", p->p_comm, syscallnames[code], td->td_retval[0]); From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 6 13:33:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 174D416A4DF for ; Sun, 6 Aug 2006 13:33:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AD3D43D68 for ; Sun, 6 Aug 2006 13:33:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B351446CD3 for ; Sun, 6 Aug 2006 09:33:20 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2212B736A5; Sun, 6 Aug 2006 13:32:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E5DF16A4E0; Sun, 6 Aug 2006 13:32:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E66F416A4DA for ; Sun, 6 Aug 2006 13:32:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4762F43D53 for ; Sun, 6 Aug 2006 13:32: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.6/8.13.6) with ESMTP id k76DWUSg061989 for ; Sun, 6 Aug 2006 13:32:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76DVrDl061498 for perforce@freebsd.org; Sun, 6 Aug 2006 13:31:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 Aug 2006 13:31:53 GMT Message-Id: <200608061331.k76DVrDl061498@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 103338 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 13:33:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=103338 Change 103338 by rwatson@rwatson_zoo on 2006/08/06 13:30:53 Integrate trustedbsd_mac. See @103245 for a detailed list of changes merged. Of particular note: - All syscalls now MPSAFE. This conflicted with changes to add MAC framework entry points for system calls, now believed to be resolved but possibly requiring further fixing. - NFSd associate entry point looped back. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#34 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#67 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#8 integrate .. //depot/projects/trustedbsd/mac/UPDATING#57 integrate .. //depot/projects/trustedbsd/mac/bin/dd/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/histedit.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#16 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#24 integrate .. //depot/projects/trustedbsd/mac/bin/test/test.1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/Configure#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/INSTALL#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/LICENSE#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/PROBLEMS#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/README#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl.in#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/apps.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/apps.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/asn1pars.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ca.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ciphers.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/crl.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/der_chop#7 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dgst.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dh.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dhparam.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dsa.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dsaparam.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/enc.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/engine.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/gendh.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/gendsa.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/genrsa.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ocsp.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.cnf#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/passwd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs12.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/progs.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/progs.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rand.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/req.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsa.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsautl.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_apps.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_cb.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_client.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_server.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_socket.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_time.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/sess_id.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/smime.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/speed.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/spkac.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/timeouts.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/verify.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/version.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/x509.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/bugs/VC16.bug#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/ICE-CA.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/ICE-root.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/ICE-user.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/ICE.crl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/RegTP-4R.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/argena.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/argeng.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/ca-cert.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/demo/ca-cert.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/demo/dsa-ca.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/demo/dsa-pca.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/demo/nortelCA.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/demo/pca-cert.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/demo/timCA.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/demo/tjhCA.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/demo/vsigntca.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/dsa-ca.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/dsa-pca.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/expired/RegTP-4R.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/expired/factory.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/expired/rsa-cca.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/expired/vsign2.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/factory.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/nortelCA.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/pca-cert.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/rsa-cca.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/timCA.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/tjhCA.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/vsign2.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/vsigntca.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/wellsfgo.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/comm.txt#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/comms.txt#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/config#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/LPdir_nyi.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/LPdir_unix.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/LPdir_vms.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/LPdir_win.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/LPdir_win32.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/LPdir_wince.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_cbc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_cfb.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_core.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/asm/aes-586.pl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/asm/aes-ia64.S#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_bitstr.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_bool.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_bytes.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_d2i_fp.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_digest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_dup.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_enum.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_gentm.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_hdr.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_i2d_fp.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_int.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_mbstr.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_meth.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_object.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_octet.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_print.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_set.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_sign.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_strex.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_type.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_utctm.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_verify.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_gen.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_lib.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_mac.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_par.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1t.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn_moid.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn_pack.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_pr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_pu.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/evp_asn1.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/i2d_pr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/i2d_pu.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/n_pkey.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p5_pbe.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p5_pbev2.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_bitst.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_crl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_pkey.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_req.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_spki.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_x509.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_dec.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_fre.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_new.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_typ.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_utl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_bignum.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_crl.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_long.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_name.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_pkey.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_pubkey.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_x509.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_x509a.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/bf_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/bf_opts.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/bfspeed.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/bftest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_dump.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_print.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_sock.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bf_nbio.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio_lcl.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_acpt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_conn.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_dgram.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_fd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_file.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_log.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_sock.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.s#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.s.works#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.works/add.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.works/div.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha/add.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha/div.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha/mul.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha/sqr.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/alpha/sub.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/bn-586.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/bn-alpha.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/ca.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/co-alpha.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/mips1.s#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/pa-risc.s#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/ppc.pl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/r3000.s#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/sparcv8plus.S#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_add.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_asm.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_blind.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_const.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_ctx.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_depr.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_div.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_exp.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_exp2.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_gcd.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_gf2m.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_kron.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_lcl.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_lib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mod.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mont.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mpi.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mul.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_nist.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_prime.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_prime.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_print.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_rand.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_recp.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_shift.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_sqr.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_sqrt.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_word.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bntest.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/expspeed.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/exptest.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/buf_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/buffer.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/buffer.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/cast.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/cast_lcl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/cast_spd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/castopts.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/casttest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/c_zlib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/comp.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/comp_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/comp_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_def.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_mod.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cpt_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cryptlib.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cryptlib.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/crypto.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cversion.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/FILES0#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/asm/des_enc.m4#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/cfb64ede.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/cfb_enc.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_enc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_old.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_old.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_opts.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/destest.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/ecb3_enc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/ede_cbcm_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/fcrypt.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/read2pwd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/set_key.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/speed.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/str2key.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_check.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_depr.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_err.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_gen.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_key.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dhtest.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_depr.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_gen.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_key.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_lib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_ossl.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_sign.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_vrf.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsatest.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_dl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_dlfcn.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_lib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_null.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ebcdic.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec2_mult.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec2_smpl.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec2_smpt.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_asn1.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_check.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_curve.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_cvt.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_key.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_lcl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_mult.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_print.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ecp_mont.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ecp_nist.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ecp_recp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ecp_smpl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ectest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdh/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdh/ecdh.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdh/ecdhtest.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdh/ech_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdh/ech_key.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdh/ech_lib.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdh/ech_locl.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdh/ech_ossl.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdsa/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdsa/ecdsa.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdsa/ecdsatest.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdsa/ecs_asn1.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdsa/ecs_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdsa/ecs_lib.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdsa/ecs_locl.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdsa/ecs_ossl.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdsa/ecs_sign.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ecdsa/ecs_vrf.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_all.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_cnf.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_cryptodev.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_ctrl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_dyn.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_fat.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_init.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_int.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_list.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_openssl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_padlock.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_pkey.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_table.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/engine.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/enginetest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw.ec#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_4758_cca.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_4758_cca_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_4758_cca_err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_aep.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_aep_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_aep_err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_atalla.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_atalla_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_atalla_err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_cryptodev.c#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_cswift.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_cswift_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_cswift_err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ncipher.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ncipher_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ncipher_err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_nuron.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_nuron_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_nuron_err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_sureware.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_sureware_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_sureware_err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ubsec.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ubsec_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ubsec_err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/tb_cipher.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/tb_dh.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/tb_digest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/tb_dsa.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/tb_ecdh.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/tb_ecdsa.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/tb_rand.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/tb_rsa.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/tb_store.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/vendor_defns/aep.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/vendor_defns/atalla.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/vendor_defns/cswift.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/vendor_defns/sureware.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err_all.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err_prn.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/openssl.ec#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/bio_b64.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/bio_enc.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/bio_md.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/bio_ok.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/c_all.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/c_alld.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/digest.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_aes.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_bf.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cast.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_des.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_des3.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_idea.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_null.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_old.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_rc2.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_rc4.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_rc5.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_xcbc_d.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/encode.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_enc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_err.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_key.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_lib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_pbe.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_pkey.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_test.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evptests.txt#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/m_dss.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/m_dss1.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/m_ecdsa.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/m_md2.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/m_md4.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/m_md5.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/m_mdc2.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/m_null.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/m_ripemd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/m_sha.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/m_sha1.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/names.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/p5_crpt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/p5_crpt2.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/p_dec.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/p_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/p_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/p_open.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/p_seal.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/p_verify.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ex_data.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/hmac/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/hmac/hmac.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/hmac/hmac.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ia64cpuid.S#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/i_skey.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/idea.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/idea_spd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/ideatest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/krb5/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/krb5/krb5_asn.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/lhash/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/lhash/lhash.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/lhash/lhash.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/md2.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/md2_dgst.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/md2_one.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/md2test.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md32_common.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md4/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md4/md4.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md4/md4_dgst.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md4/md4_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md4/md4_one.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md4/md4test.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/md5.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/md5_dgst.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/md5_locl.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/md5_one.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/md5test.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mdc2/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mdc2/mdc2.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mdc2/mdc2_one.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mdc2/mdc2dgst.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mdc2/mdc2test.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mem.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mem_clr.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mem_dbg.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/o_dir.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/o_dir.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/o_dir_test.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/o_str.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/o_str.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/o_names.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_dat.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_dat.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_dat.pl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_mac.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_mac.num#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/objects.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/objects.txt#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/ocsp.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/ocsp_cl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/ocsp_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/ocsp_ext.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/ocsp_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/ocsp_prn.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslconf.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslconf.h.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslv.h#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ossl_typ.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_all.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_info.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_lib.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_oth.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_pk8.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_pkey.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_seal.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_xaux.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/alpha.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/cbc.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86asm.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86ms.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86nasm.pl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86unix.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/p12_add.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/p12_crpt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/p12_crt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/p12_decr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/p12_init.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/p12_key.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/p12_kiss.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/p12_mutl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/p12_npas.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/pk12err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/pkcs12.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/bio_ber.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/example.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_asn1.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_attr.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_doit.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_mime.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_smime.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pkcs7.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pkcs7err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pqueue/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pqueue/pq_compat.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pqueue/pq_test.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pqueue/pqueue.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pqueue/pqueue.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/md_rand.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_egd.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_err.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_lib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_nw.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_unix.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_vms.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_win.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/randfile.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/randtest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/rc2.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/rc2_skey.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/rc2speed.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/rc2test.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/asm/rc4-586.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/asm/rc4-ia64.S#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/rc4.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/rc4.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/rc4_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/rc4_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/rc4_skey.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/rc4speed.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/rc4test.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc5/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc5/rc5.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc5/rc5_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc5/rc5speed.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/ripemd.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/rmd_dgst.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/rmd_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/rmd_one.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/rmdtest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_asn1.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_chk.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_depr.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_eay.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_err.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_gen.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_lib.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_null.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_oaep.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_pss.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_saos.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_sign.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_test.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_x931.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/asm/sha1-586.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/asm/sha1-ia64.pl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/asm/sha512-ia64.pl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/asm/sha512-sse2.pl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha1_one.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha1dgst.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha1test.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha256.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha256t.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha512.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha512t.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha_dgst.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha_locl.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha_one.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/shatest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sparccpuid.S#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/safestack.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/stack.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/stack.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/store/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/store/README#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/store/store.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/store/str_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/store/str_lib.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/store/str_locl.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/store/str_mem.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/store/str_meth.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/symhacks.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/threads/mttest.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/threads/th-lock.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/tmdiff.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/tmdiff.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/txt_db/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/txt_db/txt_db.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/txt_db/txt_db.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ui/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ui/ui.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ui/ui_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ui/ui_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ui/ui_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ui/ui_util.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/uid.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/by_dir.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/by_file.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_att.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_cmp.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_lu.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_r2x.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_req.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_trs.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_txt.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_v3.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_vfy.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_vfy.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_vpm.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509cset.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509name.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509spki.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509type.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x_all.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/ext_dat.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/pcy_cache.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/pcy_data.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/pcy_int.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/pcy_lib.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/pcy_map.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/pcy_node.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/pcy_tree.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_akey.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_alt.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_bitst.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_conf.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_cpols.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_extku.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_ia5.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_info.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_int.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_lib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_ncons.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_pci.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_pcia.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_pcons.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_pmaps.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_prn.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_purp.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_skey.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_sxnet.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_utl.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/x509v3.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x86_64cpuid.pl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x86cpuid.pl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/easy_tls/easy-tls.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/engines/zencod/hw_zencod.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/ssltest-ecc/README#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/ssltest-ecc/ssltest.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/tunala/autoungunk.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/tunala/cb.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/tunala/configure.in#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/tunala/test.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/tunala/tunala.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/tunala/tunala.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/HOWTO/certificates.txt#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/HOWTO/keys.txt#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/HOWTO/proxy_certificates.txt#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/CA.pl.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/asn1parse.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/ca.pod#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/config.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/dgst.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/ec.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/ecparam.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/enc.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/errstr.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/req.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/s_client.pod#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/s_server.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/x509.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/x509v3_config.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BIO_f_base64.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BN_BLINDING_new.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BN_add_word.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BN_new.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/ERR_error_string.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/ERR_set_mark.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_DigestInit.pod#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_SealInit.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_SignInit.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/OPENSSL_Applink.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/OPENSSL_config.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/PKCS12_create.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/PKCS7_sign.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/PKCS7_verify.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/RSA_sign.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/blowfish.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/bn.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/bn_internal.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/d2i_X509.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/des_modes.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/ecdsa.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/engine.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/hmac.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/threads.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/x509.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/fingerprints.txt#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/openssl.txt#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_ciphers.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_current_cipher.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_default_timeout.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_error.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_fd.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_session.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_verify_result.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_version.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_pending.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_set_shutdown.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_shutdown.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_state_string.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_want.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/ssl.pod#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssleay.txt#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/standards.txt#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/e_os.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/e_os2.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/axp.opt#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_4758cca.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_4758cca.ec#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_4758cca_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_4758cca_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_aep.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_aep.ec#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_aep_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_aep_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_atalla.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_atalla.ec#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_atalla_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_atalla_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_chil.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_chil.ec#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_chil_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_chil_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_cswift.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_cswift.ec#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_cswift_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_cswift_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_gmp.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_gmp.ec#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_gmp_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_gmp_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_nuron.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_nuron.ec#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_nuron_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_nuron_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_sureware.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_sureware.ec#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_sureware_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_sureware_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_ubsec.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_ubsec.ec#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_ubsec_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/e_ubsec_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/engine_vector.mar#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/vax.opt#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/vendor_defns/aep.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/vendor_defns/atalla.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/vendor_defns/cswift.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/vendor_defns/hw_4758_cca.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/vendor_defns/hw_ubsec.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/vendor_defns/hwcryptohook.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/engines/vendor_defns/sureware.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/openssl.spec#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/bio_ssl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/d1_both.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/d1_clnt.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/d1_enc.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/d1_lib.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/d1_meth.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/d1_pkt.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/d1_srvr.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/dtls1.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/kssl.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/kssl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s23_clnt.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s23_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s23_meth.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s23_srvr.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_clnt.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_enc.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_lib.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_meth.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_srvr.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_both.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_clnt.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_enc.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_lib.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_meth.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_pkt.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_srvr.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl3.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_algs.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_asn1.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_cert.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_ciph.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_err.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_lib.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_locl.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_rsa.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_sess.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_txt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssltest.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/t1_clnt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/t1_enc.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/t1_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/t1_meth.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/t1_srvr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/tls1.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/CAss.cnf#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/P1ss.cnf#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/test/P2ss.cnf#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/test/Uss.cnf#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/bctest#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/evptests.txt#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/tcrl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/testca#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/testenc#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/testfipsssl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/test/testgen#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/testss#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/testssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/testsslproxy#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/test/tpkcs7#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/tpkcs7d#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/treq#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/trsa#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/tsid#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 6 15:58:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C5EA416A4E6 for ; Sun, 6 Aug 2006 15:58:50 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BC3C43D6B for ; Sun, 6 Aug 2006 15:58:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C715C46CA7 for ; Sun, 6 Aug 2006 11:58:39 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0BFDC742FB; Sun, 6 Aug 2006 15:58:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BA2916A4E8; Sun, 6 Aug 2006 15:58:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B89FD16A4E5 for ; Sun, 6 Aug 2006 15:58:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6910343D6A for ; Sun, 6 Aug 2006 15:58: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.6/8.13.6) with ESMTP id k76FwcME084537 for ; Sun, 6 Aug 2006 15:58:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76Fwc4u084534 for perforce@freebsd.org; Sun, 6 Aug 2006 15:58:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 Aug 2006 15:58:38 GMT Message-Id: <200608061558.k76Fwc4u084534@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 103344 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 15:58:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=103344 Change 103344 by rwatson@rwatson_zoo on 2006/08/06 15:57:47 Correct mismerge. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#84 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#84 (text+ko) ==== @@ -354,8 +354,7 @@ */ ndp = &nd; NDINIT(ndp, LOOKUP, ISOPEN | LOCKLEAF | FOLLOW | SAVENAME | MPSAFE | - SAVESTART, - AUDITVNODE1, UIO_SYSSPACE, args->fname, td); + SAVESTART | AUDITVNODE1, UIO_SYSSPACE, args->fname, td); interpret: error = namei(ndp); From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 6 16:31:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5924D16A4DD for ; Sun, 6 Aug 2006 16:31:24 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CBAF643D45 for ; Sun, 6 Aug 2006 16:31:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1D12646C98 for ; Sun, 6 Aug 2006 12:31:23 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BE7DF564AE; Sun, 6 Aug 2006 16:31:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B804016A4E6; Sun, 6 Aug 2006 16:31:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9364116A4E2 for ; Sun, 6 Aug 2006 16:31:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D322C43D60 for ; Sun, 6 Aug 2006 16:31:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k76GVJt6087690 for ; Sun, 6 Aug 2006 16:31:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76GVJYR087687 for perforce@freebsd.org; Sun, 6 Aug 2006 16:31:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 Aug 2006 16:31:19 GMT Message-Id: <200608061631.k76GVJYR087687@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 103346 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 16:31:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=103346 Change 103346 by rwatson@rwatson_zoo on 2006/08/06 16:30:54 Update an additional send_pkt() instance added to ipfw2 for the MAC world order. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#44 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#44 (text+ko) ==== @@ -4177,7 +4177,7 @@ q->ack_fwd, TH_SYN); if (*mtailp != NULL) mtailp = &(*mtailp)->m_nextpkt; - *mtailp = send_pkt(&(q->id), q->ack_fwd - 1, + *mtailp = send_pkt(NULL, &(q->id), q->ack_fwd - 1, q->ack_rev, 0); if (*mtailp != NULL) mtailp = &(*mtailp)->m_nextpkt; From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 6 17:17:39 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0C1816A4DE for ; Sun, 6 Aug 2006 17:17:39 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD49143D49 for ; Sun, 6 Aug 2006 17:17:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 892B346CA7 for ; Sun, 6 Aug 2006 13:17:37 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D86C363137; Sun, 6 Aug 2006 17:17:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D1B0D16A4EB; Sun, 6 Aug 2006 17:17:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB62616A4E1 for ; Sun, 6 Aug 2006 17:17:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACD1943D7E for ; Sun, 6 Aug 2006 17:17:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k76HHIiu099921 for ; Sun, 6 Aug 2006 17:17:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76HHIsc099918 for perforce@freebsd.org; Sun, 6 Aug 2006 17:17:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 Aug 2006 17:17:18 GMT Message-Id: <200608061717.k76HHIsc099918@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 103348 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 17:17:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=103348 Change 103348 by rwatson@rwatson_zoo on 2006/08/06 17:16:36 Integrate TrustedBSD base branch; fix mac_associate_nfsd_label() prototype. Affected files ... .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#57 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#28 integrate .. //depot/projects/trustedbsd/base/sbin/dump/optr.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#41 integrate .. //depot/projects/trustedbsd/base/share/examples/drivers/make_device_driver.sh#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#33 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_stream.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#55 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#25 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#67 integrate .. //depot/projects/trustedbsd/base/sys/kern/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#78 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_usrreq.c#17 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#50 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#47 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#56 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#47 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#47 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#63 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlaninject/wlaninject.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kldxref/kldxref.c#13 integrate Differences ... ==== //depot/projects/trustedbsd/base/etc/defaults/rc.conf#57 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.290 2006/07/21 15:55:18 yar Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.291 2006/08/05 20:28:50 njl Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -516,9 +516,9 @@ devfs_system_ruleset="" # The name of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) -performance_cx_lowest="LOW" # Online CPU idle state +performance_cx_lowest="HIGH" # Online CPU idle state performance_cpu_freq="NONE" # Online CPU frequency -economy_cx_lowest="LOW" # Offline CPU idle state +economy_cx_lowest="HIGH" # Offline CPU idle state economy_cpu_freq="NONE" # Offline CPU frequency virecover_enable="YES" # Perform housekeeping for the vi(1) editor ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot ==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#28 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.52 2006/01/12 15:33:18 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.53 2006/08/05 20:38:23 yar Exp $ .\" .\" %beginstrip% . @@ -34,6 +34,7 @@ .\" FreeBSD .Lb values .ds doc-str-Lb-libarchive Streaming Archive Library (libarchive, \-larchive) .ds doc-str-Lb-libbluetooth Bluetooth User Library (libbluetooth, \-lbluetooth) +.ds doc-str-Lb-libbsm Basic Security Module User Library (libbsm, \-lbsm) .ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r) .ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar) .ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam) ==== //depot/projects/trustedbsd/base/sbin/dump/optr.c#16 (text+ko) ==== @@ -32,7 +32,7 @@ static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/optr.c,v 1.32 2005/02/16 06:48:35 obrien Exp $"; + "$FreeBSD: src/sbin/dump/optr.c,v 1.35 2006/08/06 14:23:50 marck Exp $"; #endif /* not lint */ #include @@ -190,6 +190,7 @@ { double percent; time_t tnow, tdone; + char *tdone_str; int deltat, hours, mins; (void)time(&tnow); @@ -207,15 +208,17 @@ hours = deltat / 3600; mins = (deltat % 3600) / 60; + tdone_str = ctime(&tdone); + tdone_str[strlen(tdone_str) - 1] = '\0'; setproctitle( "%s: pass %d: %3.2f%% done, finished in %d:%02d at %s", - disk, passno, percent, hours, mins, ctime(&tdone)); + disk, passno, percent, hours, mins, tdone_str); if (tnow >= tschedule) { tschedule = tnow + 300; if (blockswritten < 500) return; - msg("%3.2f%% done, finished in %d:%02d at %s", percent, - hours, mins, ctime(&tdone)); + msg("%3.2f%% done, finished in %d:%02d at %s\n", percent, + hours, mins, tdone_str); } } } ==== //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#41 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.91 2006/06/15 09:39:22 oleg Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.92 2006/08/05 13:58:50 stefanf Exp $ */ #include @@ -2243,7 +2243,7 @@ char buf[30]; char prefix[80]; - if (p->next.sle_next != (struct dn_pipe *)DN_IS_PIPE) + if (SLIST_NEXT(p, next) != (struct dn_pipe *)DN_IS_PIPE) break; /* done with pipes, now queues */ /* @@ -2282,7 +2282,7 @@ for (fs = next; nbytes >= sizeof *fs; fs = next) { char prefix[80]; - if (fs->next.sle_next != (struct dn_flow_set *)DN_IS_QUEUE) + if (SLIST_NEXT(fs, next) != (struct dn_flow_set *)DN_IS_QUEUE) break; l = sizeof(*fs) + fs->rq_elements * sizeof(*q); next = (char *)fs + l; ==== //depot/projects/trustedbsd/base/share/examples/drivers/make_device_driver.sh#5 (text+ko) ==== @@ -12,6 +12,7 @@ # cd /sys/modules/foo; make depend; make; make install; kldload foo # # arg1 to this script is expected to be lowercase "foo" +# arg2 path to the kernel sources, "/sys" if omitted # # Trust me, RUN THIS SCRIPT :) # @@ -19,19 +20,21 @@ # o generate foo_isa.c, foo_pci.c, foo_pccard.c, foo_cardbus.c, and foovar.h # o Put pccard stuff in here. # -# $FreeBSD: src/share/examples/drivers/make_device_driver.sh,v 1.21 2003/10/03 19:31:55 dds Exp $" +# $FreeBSD: src/share/examples/drivers/make_device_driver.sh,v 1.23 2006/08/06 11:06:35 rik Exp $" # # if [ "X${1}" = "X" ]; then echo "Hey, how about some help here... give me a device name!" exit 1 fi +if [ "X${2}" = "X" ]; then + TOP=`cd /sys; pwd -P` + echo "Using ${TOP} as the path to the kernel sources!" +else + TOP=${2} +fi UPPER=`echo ${1} |tr "[:lower:]" "[:upper:]"` -HERE=`pwd` -cd /sys -TOP=`pwd` - RCS_KEYWORD=FreeBSD if [ -d ${TOP}/modules/${1} ]; then @@ -46,7 +49,7 @@ echo "Cleaning up from prior runs" rm -rf ${TOP}/dev/${1} rm -rf ${TOP}/modules/${1} - rm ${TOP}/i386/conf/files.${UPPER} + rm ${TOP}/conf/files.${UPPER} rm ${TOP}/i386/conf/${UPPER} rm ${TOP}/sys/${1}io.h ;; @@ -58,7 +61,7 @@ echo "The following files will be created:" echo ${TOP}/modules/${1} -echo ${TOP}/i386/conf/files.${UPPER} +echo ${TOP}/conf/files.${UPPER} echo ${TOP}/i386/conf/${UPPER} echo ${TOP}/dev/${1} echo ${TOP}/dev/${1}/${1}.c @@ -79,7 +82,7 @@ # First add the file to a local file list. ####################################################################### -cat >${TOP}/i386/conf/files.${UPPER} <${TOP}/conf/files.${UPPER} <${TOP}/i386/conf/${UPPER} <>${TOP}/i386/conf/${UPPER} - cat >>${TOP}/i386/conf/${UPPER} < #include -#include -#include #include #include @@ -198,7 +201,7 @@ struct resource* res_irq; /* Resource for irq range. */ struct resource* res_drq; /* Resource for dma channel. */ device_t device; - dev_t dev; + struct cdev *dev; void *intr_cookie; void *vaddr; /* Virtual address of mem resource. */ char buffer[BUFFERSIZE]; /* If we need to buffer something. */ @@ -219,8 +222,8 @@ static d_poll_t ${1}poll; static void ${1}intr(void *arg); -#define CDEV_MAJOR 20 static struct cdevsw ${1}_cdevsw = { + .d_version = D_VERSION, .d_open = ${1}open, .d_close = ${1}close, .d_read = ${1}read, @@ -229,7 +232,6 @@ .d_poll = ${1}poll, .d_mmap = ${1}mmap, .d_name = "${1}", - .d_maj = CDEV_MAJOR, }; static devclass_t ${1}_devclass; @@ -818,7 +820,7 @@ } static int -${1}ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) +${1}ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) { struct ${1}_softc *scp = DEV2SOFTC(dev); @@ -840,7 +842,7 @@ * This should get you started. */ static int -${1}open(dev_t dev, int oflags, int devtype, struct thread *td) +${1}open(struct cdev *dev, int oflags, int devtype, struct thread *td) { struct ${1}_softc *scp = DEV2SOFTC(dev); @@ -852,7 +854,7 @@ } static int -${1}close(dev_t dev, int fflag, int devtype, struct thread *td) +${1}close(struct cdev *dev, int fflag, int devtype, struct thread *td) { struct ${1}_softc *scp = DEV2SOFTC(dev); @@ -864,7 +866,7 @@ } static int -${1}read(dev_t dev, struct uio *uio, int ioflag) +${1}read(struct cdev *dev, struct uio *uio, int ioflag) { struct ${1}_softc *scp = DEV2SOFTC(dev); int toread; @@ -879,7 +881,7 @@ } static int -${1}write(dev_t dev, struct uio *uio, int ioflag) +${1}write(struct cdev *dev, struct uio *uio, int ioflag) { struct ${1}_softc *scp = DEV2SOFTC(dev); int towrite; @@ -894,7 +896,7 @@ } static int -${1}mmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot) +${1}mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot) { struct ${1}_softc *scp = DEV2SOFTC(dev); @@ -913,7 +915,7 @@ } static int -${1}poll(dev_t dev, int which, struct thread *td) +${1}poll(struct cdev *dev, int which, struct thread *td) { struct ${1}_softc *scp = DEV2SOFTC(dev); @@ -967,15 +969,23 @@ .include DONE -(cd ${TOP}/modules/${1}; make depend; make ) -exit +echo -n "Do you want to build the '${1}' module? [Y]" +read VAL +if [ "-z" "$VAL" ]; then + VAL=YES +fi +case ${VAL} in +[yY]*) + (cd ${TOP}/modules/${1}; make depend; make ) + ;; +*) +# exit + ;; +esac -config ${UPPER} -cd ../../compile/${UPPER} -make depend -make ${1}.o -make -exit +echo "" +echo "To build the kernel you should merge ${TOP}/conf/files.${UPPER} " \ + "into one of the ${TOP}/conf/files*" #--------------end of script--------------- # ==== //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#33 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.568 2006/08/01 19:06:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.569 2006/08/06 06:29:16 alc Exp $"); /* * Manages physical address maps. @@ -2506,7 +2506,6 @@ retry: p = vm_page_lookup(object, pindex); if (p != NULL) { - vm_page_lock_queues(); if (vm_page_sleep_if_busy(p, FALSE, "init4p")) goto retry; } else { @@ -2525,8 +2524,8 @@ p = vm_page_lookup(object, pindex); vm_page_lock_queues(); vm_page_wakeup(p); + vm_page_unlock_queues(); } - vm_page_unlock_queues(); ptepa = VM_PAGE_TO_PHYS(p); if (ptepa & (NBPDR - 1)) ==== //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_stream.c#24 (text+ko) ==== @@ -36,11 +36,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.61 2006/07/28 16:56:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.62 2006/08/05 22:04:21 rwatson Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include @@ -50,7 +49,6 @@ #include #include #include /* Must come after sys/malloc.h */ -#include #include #include #include ==== //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#55 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.263 2006/07/24 19:47:00 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.264 2006/08/06 12:01:42 bms Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -890,6 +890,7 @@ product EPSON 1670 0x011f Perfection 1670 scanner product EPSON 1270 0x0120 Perfection 1270 scanner product EPSON 2480 0x0121 Perfection 2480 scanner +product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner /* e-TEK Labs products */ ==== //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#25 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.71 2006/06/18 17:28:08 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.72 2006/08/06 12:01:42 bms Exp $"); /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -213,6 +213,7 @@ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USC_KEEP_OPEN }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2480 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3500 }, USC_KEEP_OPEN }, /* UMAX */ {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U }, 0 }, ==== //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#67 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.572 2006/08/01 19:06:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.573 2006/08/06 06:29:16 alc Exp $"); /* * Manages physical address maps. @@ -2581,7 +2581,6 @@ retry: p = vm_page_lookup(object, pindex); if (p != NULL) { - vm_page_lock_queues(); if (vm_page_sleep_if_busy(p, FALSE, "init4p")) goto retry; } else { @@ -2600,8 +2599,8 @@ p = vm_page_lookup(object, pindex); vm_page_lock_queues(); vm_page_wakeup(p); + vm_page_unlock_queues(); } - vm_page_unlock_queues(); ptepa = VM_PAGE_TO_PHYS(p); if (ptepa & (NBPDR - 1)) ==== //depot/projects/trustedbsd/base/sys/kern/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/sys/kern/Makefile,v 1.12 2005/07/13 20:50:17 jhb Exp $ +# $FreeBSD: src/sys/kern/Makefile,v 1.13 2006/08/05 19:25:14 jb Exp $ # Makefile for kernel tags files, init_sysent, etc. @@ -11,10 +11,11 @@ sysent: init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall.mk \ ../sys/sysproto.h -init_sysent.c syscalls.c ../sys/syscall.h \ +init_sysent.c syscalls.c systrace_args.c ../sys/syscall.h \ ../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master -mv -f init_sysent.c init_sysent.c.bak -mv -f syscalls.c syscalls.c.bak + -mv -f systrace_args.c systrace_args.c.bak -mv -f ../sys/syscall.h ../sys/syscall.h.bak -mv -f ../sys/syscall.mk ../sys/syscall.mk.bak -mv -f ../sys/sysproto.h ../sys/sysproto.h.bak ==== //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#56 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.235 2006/08/04 05:53:20 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.236 2006/08/06 01:00:09 alc Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -2038,14 +2038,14 @@ VM_OBJECT_LOCK(obj); goto retry_lookup; } - } else { - vm_page_lock_queues(); - if (vm_page_sleep_if_busy(pg, TRUE, "sfpbsy")) - goto retry_lookup; + } else if (vm_page_sleep_if_busy(pg, TRUE, "sfpbsy")) + goto retry_lookup; + else { /* * Wire the page so it does not get ripped out from * under us. */ + vm_page_lock_queues(); vm_page_wire(pg); vm_page_unlock_queues(); } ==== //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#42 (text+ko) ==== @@ -50,7 +50,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.184 2006/08/02 14:30:58 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.185 2006/08/06 10:39:21 rwatson Exp $"); #include "opt_mac.h" @@ -800,9 +800,6 @@ .pru_sense = uipc_sense, .pru_shutdown = uipc_shutdown, .pru_sockaddr = uipc_sockaddr, - .pru_sosend = sosend_generic, - .pru_soreceive = soreceive_generic, - .pru_sopoll = sopoll_generic, .pru_close = uipc_close, }; ==== //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#24 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.91 2006/04/29 07:13:49 kris Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.93 2006/08/05 21:40:59 rwatson Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -88,7 +88,7 @@ "Enables/Disables shared locks for path name translation"); /* - * Convert a pathname into a pointer to a locked inode. + * Convert a pathname into a pointer to a locked vnode. * * The FOLLOW flag is set when symbolic links are to be followed * when they occur at the end of the name translation process. @@ -108,12 +108,11 @@ * } */ int -namei(ndp) - register struct nameidata *ndp; +namei(struct nameidata *ndp) { - register struct filedesc *fdp; /* pointer to file descriptor state */ - register char *cp; /* pointer into pathname argument */ - register struct vnode *dp; /* the directory we are searching */ + struct filedesc *fdp; /* pointer to file descriptor state */ + char *cp; /* pointer into pathname argument */ + struct vnode *dp; /* the directory we are searching */ struct iovec aiov; /* uio for reading symbolic links */ struct uio auio; int error, linklen; @@ -343,11 +342,10 @@ * if WANTPARENT set, return unlocked parent in ni_dvp */ int -lookup(ndp) - register struct nameidata *ndp; +lookup(struct nameidata *ndp) { - register char *cp; /* pointer into pathname argument */ - register struct vnode *dp = 0; /* the directory we are searching */ + char *cp; /* pointer into pathname argument */ + struct vnode *dp = 0; /* the directory we are searching */ struct vnode *tdp; /* saved dp */ struct mount *mp; /* mount table entry */ int docache; /* == 0 do not cache last component */ @@ -607,7 +605,7 @@ /* * We return with ni_vp NULL to indicate that the entry * doesn't currently exist, leaving a pointer to the - * (possibly locked) directory inode in ndp->ni_dvp. + * (possibly locked) directory vnode in ndp->ni_dvp. */ if (cnp->cn_flags & SAVESTART) { ndp->ni_startdir = ndp->ni_dvp; @@ -766,9 +764,7 @@ * Used by lookup to re-aquire things. */ int -relookup(dvp, vpp, cnp) - struct vnode *dvp, **vpp; - struct componentname *cnp; +relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp) { struct thread *td = cnp->cn_thread; struct vnode *dp = 0; /* the directory we are searching */ @@ -859,7 +855,7 @@ /* * We return with ni_vp NULL to indicate that the entry * doesn't currently exist, leaving a pointer to the - * (possibly locked) directory inode in ndp->ni_dvp. + * (possibly locked) directory vnode in ndp->ni_dvp. */ return (0); } @@ -910,9 +906,7 @@ * Free data allocated by namei(); see namei(9) for details. */ void -NDFREE(ndp, flags) - struct nameidata *ndp; - const u_int flags; +NDFREE(struct nameidata *ndp, const u_int flags) { int unlock_dvp; int unlock_vp; ==== //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#78 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.678 2006/07/15 06:44:27 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.679 2006/08/06 10:43:35 rwatson Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -3134,6 +3134,9 @@ * and optional call-by-reference privused argument allowing vaccess() * to indicate to the caller whether privilege was used to satisfy the * request (obsoleted). Returns 0 on success, or an errno on failure. + * + * The ifdef'd CAPABILITIES version is here for reference, but is not + * actually used. */ int vaccess(enum vtype type, mode_t file_mode, uid_t file_uid, gid_t file_gid, @@ -3207,9 +3210,11 @@ /* * Build a capability mask to determine if the set of capabilities * satisfies the requirements when combined with the granted mask - * from above. - * For each capability, if the capability is required, bitwise - * or the request type onto the cap_granted mask. + * from above. For each capability, if the capability is required, + * bitwise or the request type onto the cap_granted mask. + * + * Note: This is never actually used, but is here for reference + * purposes. */ cap_granted = 0; @@ -3219,7 +3224,8 @@ * VEXEC requests, instead of CAP_DAC_EXECUTE. */ if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && - !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) + !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, + SUSER_ALLOWJAIL)) cap_granted |= VEXEC; } else { if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && ==== //depot/projects/trustedbsd/base/sys/netatalk/ddp_usrreq.c#17 (text+ko) ==== @@ -24,7 +24,7 @@ * +1-313-764-2278 * netatalk@umich.edu * - * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.51 2006/07/21 17:11:13 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.52 2006/08/05 14:14:34 rwatson Exp $ */ #include @@ -217,6 +217,7 @@ DDP_LOCK(ddp); at_pcbdisconnect(ddp); DDP_UNLOCK(ddp); + soisdisconnected(so); } static void @@ -230,6 +231,7 @@ DDP_LOCK(ddp); at_pcbdisconnect(ddp); DDP_UNLOCK(ddp); + soisdisconnected(so); } void ==== //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#50 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.92 2006/07/10 19:13:32 csjp Exp $ + * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.93 2006/08/06 16:56:15 rwatson Exp $ */ /* @@ -3019,7 +3019,7 @@ return (0); } -static int +static void mac_biba_associate_nfsd_label(struct ucred *cred) { struct mac_biba *label; @@ -3028,7 +3028,6 @@ mac_biba_set_effective(label, MAC_BIBA_TYPE_LOW, 0, NULL); mac_biba_set_range(label, MAC_BIBA_TYPE_LOW, 0, NULL, MAC_BIBA_TYPE_HIGH, 0, NULL); - return (0); } static struct mac_policy_ops mac_biba_ops = ==== //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#47 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac_policy.h,v 1.72 2006/04/26 14:18:55 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac_policy.h,v 1.73 2006/08/06 16:56:15 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. @@ -589,7 +589,7 @@ typedef int (*mpo_check_vnode_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); -typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); +typedef void (*mpo_associate_nfsd_label_t)(struct ucred *cred); struct mac_policy_ops { /* ==== //depot/projects/trustedbsd/base/sys/sys/param.h#56 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.269 2006/07/29 19:44:07 simon Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.270 2006/08/05 20:35:11 jb Exp $ */ #ifndef _SYS_PARAM_H_ @@ -331,4 +331,20 @@ #define ctodb(db) /* calculates pages to devblks */ \ ((db) << (PAGE_SHIFT - DEV_BSHIFT)) +/* + * Solaris compatibility definitions. + */ +#ifdef _SOLARIS_C_SOURCE +#define PAGESIZE PAGE_SIZE + +/* + * The OpenSolaris version is set according to the version last imported + * from http://dlc.sun.com/osol/on/downloads/current/. In FreeBSD header + * files it can be used to detemine the level of compatibility that the + * FreeBSD headers provide to OpenSolaris code. Perhaps one day there + * will be a really, really Single Unix Specification. + */ +#define __OpenSolaris_version 20060731 +#endif + #endif /* _SYS_PARAM_H_ */ ==== //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#47 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.280 2006/08/03 23:56:11 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.281 2006/08/05 19:07:07 alc Exp $"); #include "opt_mac.h" #include "opt_swap.h" @@ -1424,11 +1424,6 @@ * NOTE: for reads, m->dirty will probably * be overridden by the original caller of * getpages so don't play cute tricks here. - * - * XXX IT IS NOT LEGAL TO FREE THE PAGE HERE - * AS THIS MESSES WITH object->memq, and it is - * not legal to mess with object->memq from an - * interrupt. */ m->valid = 0; if (i != bp->b_pager.pg_reqpage) ==== //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#47 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.217 2006/07/21 23:22:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.218 2006/08/06 00:17:17 alc Exp $"); #include #include @@ -389,10 +389,8 @@ VM_OBJECT_LOCK(fs.object); if (fs.m == vm_page_lookup(fs.object, fs.pindex)) { - vm_page_lock_queues(); - if (!vm_page_sleep_if_busy(fs.m, TRUE, - "vmpfw")) - vm_page_unlock_queues(); + vm_page_sleep_if_busy(fs.m, TRUE, + "vmpfw"); } vm_object_pip_wakeup(fs.object); VM_OBJECT_UNLOCK(fs.object); ==== //depot/projects/trustedbsd/base/sys/vm/vm_page.c#63 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.320 2006/08/03 23:56:11 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.321 2006/08/06 00:15:40 alc Exp $"); #include #include @@ -496,9 +496,10 @@ vm_page_sleep_if_busy(vm_page_t m, int also_m_busy, const char *msg) { - mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); if ((m->flags & PG_BUSY) || (also_m_busy && m->busy)) { + if (!mtx_owned(&vm_page_queue_mtx)) + vm_page_lock_queues(); vm_page_flag_set(m, PG_WANTED | PG_REFERENCED); vm_page_unlock_queues(); ==== //depot/projects/trustedbsd/base/tools/tools/net80211/wlaninject/wlaninject.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/tools/tools/net80211/wlaninject/wlaninject.c,v 1.1 2006/08/05 05:13:31 sam Exp $ + * $FreeBSD: src/tools/tools/net80211/wlaninject/wlaninject.c,v 1.2 2006/08/05 18:21:04 sam Exp $ */ #include #include @@ -145,7 +145,7 @@ int rc; iov[0].iov_base = p; - iov[0].iov_len = sizeof(*p); + iov[0].iov_len = p->ibp_len; iov[1].iov_base = buf; iov[1].iov_len = buflen; @@ -486,11 +486,14 @@ int do_verify(struct ieee80211_frame *sent, int slen, void *got, int glen) { +#define BIT(n) (1<<(n)) struct bpf_hdr *bpfh = got; struct ieee80211_frame *wh; struct ieee80211_radiotap_header *rth; int i; unsigned char *ptr, *ptr2; + uint32_t present; + uint8_t rflags; /* get the 802.11 header */ glen -= bpfh->bh_hdrlen; @@ -503,7 +506,18 @@ glen -= rth->it_len; assert(glen > 0); wh = (struct ieee80211_frame*) ((char*)rth + rth->it_len); - glen -= 4; /* 802.11 CRC */ + + /* check if FCS/CRC is included in packet */ + present = le32toh(rth->it_present); + if (present & BIT(IEEE80211_RADIOTAP_FLAGS)) { + if (present & BIT(IEEE80211_RADIOTAP_TSFT)) + rflags = ((const uint8_t *)rth)[8]; + else + rflags = ((const uint8_t *)rth)[0]; + } else + rflags = 0; + if (rflags & IEEE80211_RADIOTAP_F_FCS) + glen -= IEEE80211_CRC_LEN; assert(glen > 0); /* did we receive the packet we sent? */ @@ -526,6 +540,7 @@ i, *ptr, *ptr2); } return -1; +#undef BIT } int main(int argc, char *argv[]) @@ -534,10 +549,10 @@ char *iface = "ath0"; char *verify = NULL; int chan = 1; - union { + struct { struct ieee80211_frame w; unsigned char buf[2048]; - } u; + } __packed u; int len = 0; int ch; struct ieee80211_bpf_params params; @@ -546,6 +561,8 @@ memset(&u, 0, sizeof(u)); memset(¶ms, 0, sizeof(params)); + params.ibp_vers = IEEE80211_BPF_VERSION; + params.ibp_len = sizeof(struct ieee80211_bpf_params) - 6, params.ibp_rate0 = 2; /* 1 MB/s XXX */ params.ibp_try0 = 1; /* no retransmits */ params.ibp_power = 100; /* nominal max */ @@ -763,15 +780,35 @@ setup_if(verify, chan); fd2 = open_bpf(verify); } - inject(fd, u.buf, len, ¶ms); + inject(fd, wh, len, ¶ms); close(fd); if (verify) { char buf2[4096]; int rc; int max = 10; + int timeout = 2; + fd_set fds; + struct timeval tv; + time_t start; printf("Verifying via %s\n", verify); + start = time(NULL); while (max--) { + FD_ZERO(&fds); + FD_SET(fd2, &fds); + + tv.tv_usec = 0; + tv.tv_sec = time(NULL) - start; + if (tv.tv_sec >= timeout) { + timeout = 0; + break; + } + tv.tv_sec = timeout - tv.tv_sec; + if (select(fd2+1, &fds, NULL, NULL, &tv) == -1) + err(1, "select()"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 6 17:18:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18CD316A4EC for ; Sun, 6 Aug 2006 17:18:27 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3C0743D49 for ; Sun, 6 Aug 2006 17:18:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 965A746CAE for ; Sun, 6 Aug 2006 13:18:22 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CA1FE638F6; Sun, 6 Aug 2006 17:18:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C8E4216A4E0; Sun, 6 Aug 2006 17:18:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57B5716A4DD for ; Sun, 6 Aug 2006 17:18:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8A4643D45 for ; Sun, 6 Aug 2006 17:18:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k76HIK52000397 for ; Sun, 6 Aug 2006 17:18:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k76HIKeC000394 for perforce@freebsd.org; Sun, 6 Aug 2006 17:18:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 Aug 2006 17:18:20 GMT Message-Id: <200608061718.k76HIKeC000394@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 103349 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 17:18:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=103349 Change 103349 by rwatson@rwatson_zoo on 2006/08/06 17:18:05 Integrate TrustedBSD MAC branch from TrustedBSD base branch; see @103348 for change description. Includes mac_nfsd_associate_label fix. Affected files ... .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#49 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#26 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/optr.c#15 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#34 integrate .. //depot/projects/trustedbsd/mac/share/examples/drivers/make_device_driver.sh#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/pmap.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_stream.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#47 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uscanner.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#55 integrate .. //depot/projects/trustedbsd/mac/sys/kern/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#57 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#86 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_usrreq.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#263 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#247 integrate .. //depot/projects/trustedbsd/mac/sys/sys/param.h#49 integrate .. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#53 integrate .. //depot/projects/trustedbsd/mac/tools/tools/net80211/wlaninject/wlaninject.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/kldxref/kldxref.c#11 integrate Differences ... ==== //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#49 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.290 2006/07/21 15:55:18 yar Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.291 2006/08/05 20:28:50 njl Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -516,9 +516,9 @@ devfs_system_ruleset="" # The name of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) -performance_cx_lowest="LOW" # Online CPU idle state +performance_cx_lowest="HIGH" # Online CPU idle state performance_cpu_freq="NONE" # Online CPU frequency -economy_cx_lowest="LOW" # Offline CPU idle state +economy_cx_lowest="HIGH" # Offline CPU idle state economy_cpu_freq="NONE" # Offline CPU frequency virecover_enable="YES" # Perform housekeeping for the vi(1) editor ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#26 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.52 2006/01/12 15:33:18 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.53 2006/08/05 20:38:23 yar Exp $ .\" .\" %beginstrip% . @@ -34,6 +34,7 @@ .\" FreeBSD .Lb values .ds doc-str-Lb-libarchive Streaming Archive Library (libarchive, \-larchive) .ds doc-str-Lb-libbluetooth Bluetooth User Library (libbluetooth, \-lbluetooth) +.ds doc-str-Lb-libbsm Basic Security Module User Library (libbsm, \-lbsm) .ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r) .ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar) .ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam) ==== //depot/projects/trustedbsd/mac/sbin/dump/optr.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/optr.c,v 1.32 2005/02/16 06:48:35 obrien Exp $"; + "$FreeBSD: src/sbin/dump/optr.c,v 1.35 2006/08/06 14:23:50 marck Exp $"; #endif /* not lint */ #include @@ -190,6 +190,7 @@ { double percent; time_t tnow, tdone; + char *tdone_str; int deltat, hours, mins; (void)time(&tnow); @@ -207,15 +208,17 @@ hours = deltat / 3600; mins = (deltat % 3600) / 60; + tdone_str = ctime(&tdone); + tdone_str[strlen(tdone_str) - 1] = '\0'; setproctitle( "%s: pass %d: %3.2f%% done, finished in %d:%02d at %s", - disk, passno, percent, hours, mins, ctime(&tdone)); + disk, passno, percent, hours, mins, tdone_str); if (tnow >= tschedule) { tschedule = tnow + 300; if (blockswritten < 500) return; - msg("%3.2f%% done, finished in %d:%02d at %s", percent, - hours, mins, ctime(&tdone)); + msg("%3.2f%% done, finished in %d:%02d at %s\n", percent, + hours, mins, tdone_str); } } } ==== //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#34 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.91 2006/06/15 09:39:22 oleg Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.92 2006/08/05 13:58:50 stefanf Exp $ */ #include @@ -2243,7 +2243,7 @@ char buf[30]; char prefix[80]; - if (p->next.sle_next != (struct dn_pipe *)DN_IS_PIPE) + if (SLIST_NEXT(p, next) != (struct dn_pipe *)DN_IS_PIPE) break; /* done with pipes, now queues */ /* @@ -2282,7 +2282,7 @@ for (fs = next; nbytes >= sizeof *fs; fs = next) { char prefix[80]; - if (fs->next.sle_next != (struct dn_flow_set *)DN_IS_QUEUE) + if (SLIST_NEXT(fs, next) != (struct dn_flow_set *)DN_IS_QUEUE) break; l = sizeof(*fs) + fs->rq_elements * sizeof(*q); next = (char *)fs + l; ==== //depot/projects/trustedbsd/mac/share/examples/drivers/make_device_driver.sh#4 (text+ko) ==== @@ -12,6 +12,7 @@ # cd /sys/modules/foo; make depend; make; make install; kldload foo # # arg1 to this script is expected to be lowercase "foo" +# arg2 path to the kernel sources, "/sys" if omitted # # Trust me, RUN THIS SCRIPT :) # @@ -19,19 +20,21 @@ # o generate foo_isa.c, foo_pci.c, foo_pccard.c, foo_cardbus.c, and foovar.h # o Put pccard stuff in here. # -# $FreeBSD: src/share/examples/drivers/make_device_driver.sh,v 1.21 2003/10/03 19:31:55 dds Exp $" +# $FreeBSD: src/share/examples/drivers/make_device_driver.sh,v 1.23 2006/08/06 11:06:35 rik Exp $" # # if [ "X${1}" = "X" ]; then echo "Hey, how about some help here... give me a device name!" exit 1 fi +if [ "X${2}" = "X" ]; then + TOP=`cd /sys; pwd -P` + echo "Using ${TOP} as the path to the kernel sources!" +else + TOP=${2} +fi UPPER=`echo ${1} |tr "[:lower:]" "[:upper:]"` -HERE=`pwd` -cd /sys -TOP=`pwd` - RCS_KEYWORD=FreeBSD if [ -d ${TOP}/modules/${1} ]; then @@ -46,7 +49,7 @@ echo "Cleaning up from prior runs" rm -rf ${TOP}/dev/${1} rm -rf ${TOP}/modules/${1} - rm ${TOP}/i386/conf/files.${UPPER} + rm ${TOP}/conf/files.${UPPER} rm ${TOP}/i386/conf/${UPPER} rm ${TOP}/sys/${1}io.h ;; @@ -58,7 +61,7 @@ echo "The following files will be created:" echo ${TOP}/modules/${1} -echo ${TOP}/i386/conf/files.${UPPER} +echo ${TOP}/conf/files.${UPPER} echo ${TOP}/i386/conf/${UPPER} echo ${TOP}/dev/${1} echo ${TOP}/dev/${1}/${1}.c @@ -79,7 +82,7 @@ # First add the file to a local file list. ####################################################################### -cat >${TOP}/i386/conf/files.${UPPER} <${TOP}/conf/files.${UPPER} <${TOP}/i386/conf/${UPPER} <>${TOP}/i386/conf/${UPPER} - cat >>${TOP}/i386/conf/${UPPER} < #include -#include -#include #include #include @@ -198,7 +201,7 @@ struct resource* res_irq; /* Resource for irq range. */ struct resource* res_drq; /* Resource for dma channel. */ device_t device; - dev_t dev; + struct cdev *dev; void *intr_cookie; void *vaddr; /* Virtual address of mem resource. */ char buffer[BUFFERSIZE]; /* If we need to buffer something. */ @@ -219,8 +222,8 @@ static d_poll_t ${1}poll; static void ${1}intr(void *arg); -#define CDEV_MAJOR 20 static struct cdevsw ${1}_cdevsw = { + .d_version = D_VERSION, .d_open = ${1}open, .d_close = ${1}close, .d_read = ${1}read, @@ -229,7 +232,6 @@ .d_poll = ${1}poll, .d_mmap = ${1}mmap, .d_name = "${1}", - .d_maj = CDEV_MAJOR, }; static devclass_t ${1}_devclass; @@ -818,7 +820,7 @@ } static int -${1}ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) +${1}ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) { struct ${1}_softc *scp = DEV2SOFTC(dev); @@ -840,7 +842,7 @@ * This should get you started. */ static int -${1}open(dev_t dev, int oflags, int devtype, struct thread *td) +${1}open(struct cdev *dev, int oflags, int devtype, struct thread *td) { struct ${1}_softc *scp = DEV2SOFTC(dev); @@ -852,7 +854,7 @@ } static int -${1}close(dev_t dev, int fflag, int devtype, struct thread *td) +${1}close(struct cdev *dev, int fflag, int devtype, struct thread *td) { struct ${1}_softc *scp = DEV2SOFTC(dev); @@ -864,7 +866,7 @@ } static int -${1}read(dev_t dev, struct uio *uio, int ioflag) +${1}read(struct cdev *dev, struct uio *uio, int ioflag) { struct ${1}_softc *scp = DEV2SOFTC(dev); int toread; @@ -879,7 +881,7 @@ } static int -${1}write(dev_t dev, struct uio *uio, int ioflag) +${1}write(struct cdev *dev, struct uio *uio, int ioflag) { struct ${1}_softc *scp = DEV2SOFTC(dev); int towrite; @@ -894,7 +896,7 @@ } static int -${1}mmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot) +${1}mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot) { struct ${1}_softc *scp = DEV2SOFTC(dev); @@ -913,7 +915,7 @@ } static int -${1}poll(dev_t dev, int which, struct thread *td) +${1}poll(struct cdev *dev, int which, struct thread *td) { struct ${1}_softc *scp = DEV2SOFTC(dev); @@ -967,15 +969,23 @@ .include DONE -(cd ${TOP}/modules/${1}; make depend; make ) -exit +echo -n "Do you want to build the '${1}' module? [Y]" +read VAL +if [ "-z" "$VAL" ]; then + VAL=YES +fi +case ${VAL} in +[yY]*) + (cd ${TOP}/modules/${1}; make depend; make ) + ;; +*) +# exit + ;; +esac -config ${UPPER} -cd ../../compile/${UPPER} -make depend -make ${1}.o -make -exit +echo "" +echo "To build the kernel you should merge ${TOP}/conf/files.${UPPER} " \ + "into one of the ${TOP}/conf/files*" #--------------end of script--------------- # ==== //depot/projects/trustedbsd/mac/sys/amd64/amd64/pmap.c#24 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.568 2006/08/01 19:06:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.569 2006/08/06 06:29:16 alc Exp $"); /* * Manages physical address maps. @@ -2506,7 +2506,6 @@ retry: p = vm_page_lookup(object, pindex); if (p != NULL) { - vm_page_lock_queues(); if (vm_page_sleep_if_busy(p, FALSE, "init4p")) goto retry; } else { @@ -2525,8 +2524,8 @@ p = vm_page_lookup(object, pindex); vm_page_lock_queues(); vm_page_wakeup(p); + vm_page_unlock_queues(); } - vm_page_unlock_queues(); ptepa = VM_PAGE_TO_PHYS(p); if (ptepa & (NBPDR - 1)) ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_stream.c#23 (text+ko) ==== @@ -36,11 +36,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.61 2006/07/28 16:56:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.62 2006/08/05 22:04:21 rwatson Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include @@ -50,7 +49,6 @@ #include #include #include /* Must come after sys/malloc.h */ -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#47 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.263 2006/07/24 19:47:00 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.264 2006/08/06 12:01:42 bms Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -890,6 +890,7 @@ product EPSON 1670 0x011f Perfection 1670 scanner product EPSON 1270 0x0120 Perfection 1270 scanner product EPSON 2480 0x0121 Perfection 2480 scanner +product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner /* e-TEK Labs products */ ==== //depot/projects/trustedbsd/mac/sys/dev/usb/uscanner.c#23 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.71 2006/06/18 17:28:08 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.72 2006/08/06 12:01:42 bms Exp $"); /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -213,6 +213,7 @@ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USC_KEEP_OPEN }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2480 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3500 }, USC_KEEP_OPEN }, /* UMAX */ {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U }, 0 }, ==== //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#55 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.572 2006/08/01 19:06:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.573 2006/08/06 06:29:16 alc Exp $"); /* * Manages physical address maps. @@ -2581,7 +2581,6 @@ retry: p = vm_page_lookup(object, pindex); if (p != NULL) { - vm_page_lock_queues(); if (vm_page_sleep_if_busy(p, FALSE, "init4p")) goto retry; } else { @@ -2600,8 +2599,8 @@ p = vm_page_lookup(object, pindex); vm_page_lock_queues(); vm_page_wakeup(p); + vm_page_unlock_queues(); } - vm_page_unlock_queues(); ptepa = VM_PAGE_TO_PHYS(p); if (ptepa & (NBPDR - 1)) ==== //depot/projects/trustedbsd/mac/sys/kern/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/sys/kern/Makefile,v 1.12 2005/07/13 20:50:17 jhb Exp $ +# $FreeBSD: src/sys/kern/Makefile,v 1.13 2006/08/05 19:25:14 jb Exp $ # Makefile for kernel tags files, init_sysent, etc. @@ -11,10 +11,11 @@ sysent: init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall.mk \ ../sys/sysproto.h -init_sysent.c syscalls.c ../sys/syscall.h \ +init_sysent.c syscalls.c systrace_args.c ../sys/syscall.h \ ../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master -mv -f init_sysent.c init_sysent.c.bak -mv -f syscalls.c syscalls.c.bak + -mv -f systrace_args.c systrace_args.c.bak -mv -f ../sys/syscall.h ../sys/syscall.h.bak -mv -f ../sys/syscall.mk ../sys/syscall.mk.bak -mv -f ../sys/sysproto.h ../sys/sysproto.h.bak ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#57 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.235 2006/08/04 05:53:20 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.236 2006/08/06 01:00:09 alc Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -2038,14 +2038,14 @@ VM_OBJECT_LOCK(obj); goto retry_lookup; } - } else { - vm_page_lock_queues(); - if (vm_page_sleep_if_busy(pg, TRUE, "sfpbsy")) - goto retry_lookup; + } else if (vm_page_sleep_if_busy(pg, TRUE, "sfpbsy")) + goto retry_lookup; + else { /* * Wire the page so it does not get ripped out from * under us. */ + vm_page_lock_queues(); vm_page_wire(pg); vm_page_unlock_queues(); } ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#47 (text+ko) ==== @@ -50,7 +50,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.184 2006/08/02 14:30:58 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.185 2006/08/06 10:39:21 rwatson Exp $"); #include "opt_mac.h" @@ -800,9 +800,6 @@ .pru_sense = uipc_sense, .pru_shutdown = uipc_shutdown, .pru_sockaddr = uipc_sockaddr, - .pru_sosend = sosend_generic, - .pru_soreceive = soreceive_generic, - .pru_sopoll = sopoll_generic, .pru_close = uipc_close, }; ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#36 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.91 2006/04/29 07:13:49 kris Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.93 2006/08/05 21:40:59 rwatson Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -88,7 +88,7 @@ "Enables/Disables shared locks for path name translation"); /* - * Convert a pathname into a pointer to a locked inode. + * Convert a pathname into a pointer to a locked vnode. * * The FOLLOW flag is set when symbolic links are to be followed * when they occur at the end of the name translation process. @@ -108,12 +108,11 @@ * } */ int -namei(ndp) - register struct nameidata *ndp; +namei(struct nameidata *ndp) { - register struct filedesc *fdp; /* pointer to file descriptor state */ - register char *cp; /* pointer into pathname argument */ - register struct vnode *dp; /* the directory we are searching */ + struct filedesc *fdp; /* pointer to file descriptor state */ + char *cp; /* pointer into pathname argument */ + struct vnode *dp; /* the directory we are searching */ struct iovec aiov; /* uio for reading symbolic links */ struct uio auio; int error, linklen; @@ -343,11 +342,10 @@ * if WANTPARENT set, return unlocked parent in ni_dvp */ int -lookup(ndp) - register struct nameidata *ndp; +lookup(struct nameidata *ndp) { - register char *cp; /* pointer into pathname argument */ - register struct vnode *dp = 0; /* the directory we are searching */ + char *cp; /* pointer into pathname argument */ + struct vnode *dp = 0; /* the directory we are searching */ struct vnode *tdp; /* saved dp */ struct mount *mp; /* mount table entry */ int docache; /* == 0 do not cache last component */ @@ -607,7 +605,7 @@ /* * We return with ni_vp NULL to indicate that the entry * doesn't currently exist, leaving a pointer to the - * (possibly locked) directory inode in ndp->ni_dvp. + * (possibly locked) directory vnode in ndp->ni_dvp. */ if (cnp->cn_flags & SAVESTART) { ndp->ni_startdir = ndp->ni_dvp; @@ -766,9 +764,7 @@ * Used by lookup to re-aquire things. */ int -relookup(dvp, vpp, cnp) - struct vnode *dvp, **vpp; - struct componentname *cnp; +relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp) { struct thread *td = cnp->cn_thread; struct vnode *dp = 0; /* the directory we are searching */ @@ -859,7 +855,7 @@ /* * We return with ni_vp NULL to indicate that the entry * doesn't currently exist, leaving a pointer to the - * (possibly locked) directory inode in ndp->ni_dvp. + * (possibly locked) directory vnode in ndp->ni_dvp. */ return (0); } @@ -910,9 +906,7 @@ * Free data allocated by namei(); see namei(9) for details. */ void -NDFREE(ndp, flags) - struct nameidata *ndp; - const u_int flags; +NDFREE(struct nameidata *ndp, const u_int flags) { int unlock_dvp; int unlock_vp; ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#86 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.678 2006/07/15 06:44:27 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.679 2006/08/06 10:43:35 rwatson Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -3141,6 +3141,9 @@ * and optional call-by-reference privused argument allowing vaccess() * to indicate to the caller whether privilege was used to satisfy the * request (obsoleted). Returns 0 on success, or an errno on failure. + * + * The ifdef'd CAPABILITIES version is here for reference, but is not + * actually used. */ int vaccess(enum vtype type, mode_t file_mode, uid_t file_uid, gid_t file_gid, @@ -3214,9 +3217,11 @@ /* * Build a capability mask to determine if the set of capabilities * satisfies the requirements when combined with the granted mask - * from above. - * For each capability, if the capability is required, bitwise - * or the request type onto the cap_granted mask. + * from above. For each capability, if the capability is required, + * bitwise or the request type onto the cap_granted mask. + * + * Note: This is never actually used, but is here for reference + * purposes. */ cap_granted = 0; @@ -3226,7 +3231,8 @@ * VEXEC requests, instead of CAP_DAC_EXECUTE. */ if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && - !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) + !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, + SUSER_ALLOWJAIL)) cap_granted |= VEXEC; } else { if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && ==== //depot/projects/trustedbsd/mac/sys/netatalk/ddp_usrreq.c#20 (text+ko) ==== @@ -24,7 +24,7 @@ * +1-313-764-2278 * netatalk@umich.edu * - * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.51 2006/07/21 17:11:13 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.52 2006/08/05 14:14:34 rwatson Exp $ */ #include @@ -217,6 +217,7 @@ DDP_LOCK(ddp); at_pcbdisconnect(ddp); DDP_UNLOCK(ddp); + soisdisconnected(so); } static void @@ -230,6 +231,7 @@ DDP_LOCK(ddp); at_pcbdisconnect(ddp); DDP_UNLOCK(ddp); + soisdisconnected(so); } void ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#263 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.92 2006/07/10 19:13:32 csjp Exp $ + * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.93 2006/08/06 16:56:15 rwatson Exp $ */ /* @@ -3088,7 +3088,7 @@ return (0); } -static int +static void mac_biba_associate_nfsd_label(struct ucred *cred) { struct mac_biba *label; @@ -3097,7 +3097,6 @@ mac_biba_set_effective(label, MAC_BIBA_TYPE_LOW, 0, NULL); mac_biba_set_range(label, MAC_BIBA_TYPE_LOW, 0, NULL, MAC_BIBA_TYPE_HIGH, 0, NULL); - return (0); } static struct mac_policy_ops mac_biba_ops = ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#247 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac_policy.h,v 1.72 2006/04/26 14:18:55 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac_policy.h,v 1.73 2006/08/06 16:56:15 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. ==== //depot/projects/trustedbsd/mac/sys/sys/param.h#49 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.269 2006/07/29 19:44:07 simon Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.270 2006/08/05 20:35:11 jb Exp $ */ #ifndef _SYS_PARAM_H_ @@ -331,4 +331,20 @@ #define ctodb(db) /* calculates pages to devblks */ \ ((db) << (PAGE_SHIFT - DEV_BSHIFT)) +/* + * Solaris compatibility definitions. + */ +#ifdef _SOLARIS_C_SOURCE +#define PAGESIZE PAGE_SIZE + +/* + * The OpenSolaris version is set according to the version last imported + * from http://dlc.sun.com/osol/on/downloads/current/. In FreeBSD header + * files it can be used to detemine the level of compatibility that the + * FreeBSD headers provide to OpenSolaris code. Perhaps one day there + * will be a really, really Single Unix Specification. + */ +#define __OpenSolaris_version 20060731 +#endif + #endif /* _SYS_PARAM_H_ */ ==== //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#42 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.280 2006/08/03 23:56:11 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.281 2006/08/05 19:07:07 alc Exp $"); #include "opt_mac.h" #include "opt_swap.h" @@ -1424,11 +1424,6 @@ * NOTE: for reads, m->dirty will probably * be overridden by the original caller of * getpages so don't play cute tricks here. - * - * XXX IT IS NOT LEGAL TO FREE THE PAGE HERE - * AS THIS MESSES WITH object->memq, and it is - * not legal to mess with object->memq from an - * interrupt. */ m->valid = 0; if (i != bp->b_pager.pg_reqpage) ==== //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#38 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.217 2006/07/21 23:22:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.218 2006/08/06 00:17:17 alc Exp $"); #include #include @@ -389,10 +389,8 @@ VM_OBJECT_LOCK(fs.object); if (fs.m == vm_page_lookup(fs.object, fs.pindex)) { - vm_page_lock_queues(); - if (!vm_page_sleep_if_busy(fs.m, TRUE, - "vmpfw")) - vm_page_unlock_queues(); + vm_page_sleep_if_busy(fs.m, TRUE, + "vmpfw"); } vm_object_pip_wakeup(fs.object); VM_OBJECT_UNLOCK(fs.object); ==== //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#53 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.320 2006/08/03 23:56:11 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.321 2006/08/06 00:15:40 alc Exp $"); #include #include @@ -496,9 +496,10 @@ vm_page_sleep_if_busy(vm_page_t m, int also_m_busy, const char *msg) { - mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); if ((m->flags & PG_BUSY) || (also_m_busy && m->busy)) { + if (!mtx_owned(&vm_page_queue_mtx)) + vm_page_lock_queues(); vm_page_flag_set(m, PG_WANTED | PG_REFERENCED); vm_page_unlock_queues(); ==== //depot/projects/trustedbsd/mac/tools/tools/net80211/wlaninject/wlaninject.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/tools/tools/net80211/wlaninject/wlaninject.c,v 1.1 2006/08/05 05:13:31 sam Exp $ + * $FreeBSD: src/tools/tools/net80211/wlaninject/wlaninject.c,v 1.2 2006/08/05 18:21:04 sam Exp $ */ #include #include @@ -145,7 +145,7 @@ int rc; iov[0].iov_base = p; - iov[0].iov_len = sizeof(*p); + iov[0].iov_len = p->ibp_len; iov[1].iov_base = buf; iov[1].iov_len = buflen; @@ -486,11 +486,14 @@ int do_verify(struct ieee80211_frame *sent, int slen, void *got, int glen) { +#define BIT(n) (1<<(n)) struct bpf_hdr *bpfh = got; struct ieee80211_frame *wh; struct ieee80211_radiotap_header *rth; int i; unsigned char *ptr, *ptr2; + uint32_t present; + uint8_t rflags; /* get the 802.11 header */ glen -= bpfh->bh_hdrlen; @@ -503,7 +506,18 @@ glen -= rth->it_len; assert(glen > 0); wh = (struct ieee80211_frame*) ((char*)rth + rth->it_len); - glen -= 4; /* 802.11 CRC */ + + /* check if FCS/CRC is included in packet */ + present = le32toh(rth->it_present); + if (present & BIT(IEEE80211_RADIOTAP_FLAGS)) { + if (present & BIT(IEEE80211_RADIOTAP_TSFT)) + rflags = ((const uint8_t *)rth)[8]; + else + rflags = ((const uint8_t *)rth)[0]; + } else + rflags = 0; + if (rflags & IEEE80211_RADIOTAP_F_FCS) + glen -= IEEE80211_CRC_LEN; assert(glen > 0); /* did we receive the packet we sent? */ @@ -526,6 +540,7 @@ i, *ptr, *ptr2); } return -1; +#undef BIT } int main(int argc, char *argv[]) @@ -534,10 +549,10 @@ char *iface = "ath0"; char *verify = NULL; int chan = 1; - union { + struct { struct ieee80211_frame w; unsigned char buf[2048]; - } u; + } __packed u; int len = 0; int ch; struct ieee80211_bpf_params params; @@ -546,6 +561,8 @@ memset(&u, 0, sizeof(u)); memset(¶ms, 0, sizeof(params)); + params.ibp_vers = IEEE80211_BPF_VERSION; + params.ibp_len = sizeof(struct ieee80211_bpf_params) - 6, params.ibp_rate0 = 2; /* 1 MB/s XXX */ params.ibp_try0 = 1; /* no retransmits */ params.ibp_power = 100; /* nominal max */ @@ -763,15 +780,35 @@ setup_if(verify, chan); fd2 = open_bpf(verify); } - inject(fd, u.buf, len, ¶ms); + inject(fd, wh, len, ¶ms); close(fd); if (verify) { char buf2[4096]; int rc; int max = 10; + int timeout = 2; + fd_set fds; + struct timeval tv; + time_t start; printf("Verifying via %s\n", verify); + start = time(NULL); while (max--) { + FD_ZERO(&fds); + FD_SET(fd2, &fds); + + tv.tv_usec = 0; + tv.tv_sec = time(NULL) - start; + if (tv.tv_sec >= timeout) { + timeout = 0; + break; + } + tv.tv_sec = timeout - tv.tv_sec; + if (select(fd2+1, &fds, NULL, NULL, &tv) == -1) + err(1, "select()"); + if (!FD_ISSET(fd2, &fds)) + continue; + if ((rc = read(fd2, buf2, sizeof(buf2))) == -1) err(1, "read()"); @@ -780,7 +817,7 @@ break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 8 10:39:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 765C016A4DA for ; Tue, 8 Aug 2006 10:39:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1C5F43D6B for ; Tue, 8 Aug 2006 10:39:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0272F46CBB for ; Tue, 8 Aug 2006 06:39:32 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0ADEB5CDE8; Tue, 8 Aug 2006 10:39:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 03ADB16A4E0; Tue, 8 Aug 2006 10:39:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB82E16A4DF for ; Tue, 8 Aug 2006 10:39:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C12143D46 for ; Tue, 8 Aug 2006 10:39:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k78Ad4rj075373 for ; Tue, 8 Aug 2006 10:39:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k78Ad4hm075370 for perforce@freebsd.org; Tue, 8 Aug 2006 10:39:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 8 Aug 2006 10:39:04 GMT Message-Id: <200608081039.k78Ad4hm075370@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 103433 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Aug 2006 10:39:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=103433 Change 103433 by rwatson@rwatson_peppercorn on 2006/08/08 10:38:07 Allow NULL event descriptions and class lists. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#12 $ */ #include @@ -62,27 +62,32 @@ evdesc = strtok_r(NULL, eventdelim, &last); evclass = strtok_r(NULL, eventdelim, &last); - if ((evno == NULL) || (evname == NULL) || (evdesc == NULL) || - (evclass == NULL)) + if ((evno == NULL) || (evname == NULL)) return (NULL); if (strlen(evname) >= AU_EVENT_NAME_MAX) return (NULL); strcpy(e->ae_name, evname); - if (strlen(evdesc) >= AU_EVENT_DESC_MAX) - return (NULL); - strcpy(e->ae_desc, evdesc); + if (evdesc != NULL) { + if (strlen(evdesc) >= AU_EVENT_DESC_MAX) + return (NULL); + strcpy(e->ae_desc, evdesc); + } else + strcpy(e->ae_desc, ""); e->ae_number = atoi(evno); /* * Find out the mask that corresponds to the given list of classes. */ - if (getauditflagsbin(evclass, &evmask) != 0) + if (evclass != NULL) { + if (getauditflagsbin(evclass, &evmask) != 0) + e->ae_class = AU_NULL; + else + e->ae_class = evmask.am_success; + } else e->ae_class = AU_NULL; - else - e->ae_class = evmask.am_success; return (e); } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 8 12:40:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86B7D16A4DE for ; Tue, 8 Aug 2006 12:40:24 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1F5E43D6B for ; Tue, 8 Aug 2006 12:39:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 53AB646B7D for ; Tue, 8 Aug 2006 08:39:34 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6CF9E557F8; Tue, 8 Aug 2006 12:38:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 66A7416A510; Tue, 8 Aug 2006 12:38:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41EFC16A500 for ; Tue, 8 Aug 2006 12:38:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE96043D49 for ; Tue, 8 Aug 2006 12:38:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k78Ccbtx085174 for ; Tue, 8 Aug 2006 12:38:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k78CcbHF085171 for perforce@freebsd.org; Tue, 8 Aug 2006 12:38:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 8 Aug 2006 12:38:37 GMT Message-Id: <200608081238.k78CcbHF085171@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 103438 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Aug 2006 12:40:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=103438 Change 103438 by rwatson@rwatson_fledge on 2006/08/08 12:38:02 Mention OpenBSM portability more clearly. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#10 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#10 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#9 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#10 $ @@ -43,8 +43,8 @@ //depot/projects/trustedbsd/openbsm/...

    -

    OpenBSM is an open source implementation of Sun's Basic Security - Module (BSM) Audit API and file format. +

    OpenBSM is a portable, open source implementation of Sun's Basic + Security Module (BSM) Audit API and file format. BSM, the de facto industry standard for Audit, describes a set of system call and library interfaces for managing audit records, as well as a token stream file format that permits extensible and @@ -52,7 +52,11 @@ OpenBSM extends the BSM API and file format in a number of ways to support features present in the Mac OS X and FreeBSD operating systems, such as Mach task interfaces, sendfile(), and Linux system - calls present in the FreeBSD Linux emulation layer.

    + calls present in the FreeBSD Linux emulation layer. + OpenBSM is known to build on FreeBSD, Mac OS X, and Linux; some + components, such as the audit daemon, require up-to-date kernel + audit parts from the FreeBSD kernel audit implementation, but the + basic library and audit trail tools run on all three platforms.

    The OpenBSM distribution includes system include files appropriate for inclusion in an operating system implementation of Audit, libbsm, From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 9 00:55:23 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A013616A4EB for ; Wed, 9 Aug 2006 00:55:23 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19FB143D4C for ; Wed, 9 Aug 2006 00:55:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6FAA446CC6 for ; Tue, 8 Aug 2006 20:55:22 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3774B55830; Wed, 9 Aug 2006 00:55:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B32516A4E2; Wed, 9 Aug 2006 00:55:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E17F916A4E0 for ; Wed, 9 Aug 2006 00:55:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4B7643D4C for ; Wed, 9 Aug 2006 00:55:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k790tKTu077824 for ; Wed, 9 Aug 2006 00:55:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k790tI8T077821 for perforce@freebsd.org; Wed, 9 Aug 2006 00:55:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 9 Aug 2006 00:55:18 GMT Message-Id: <200608090055.k790tI8T077821@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 103480 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Aug 2006 00:55:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=103480 Change 103480 by rwatson@rwatson_zoo on 2006/08/09 00:54:57 Prototype kqueue support for audit pipes. Untested. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#26 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#26 (text+ko) ==== @@ -172,6 +172,7 @@ static d_read_t audit_pipe_read; static d_ioctl_t audit_pipe_ioctl; static d_poll_t audit_pipe_poll; +static d_kqfilter_t audit_pipe_kqfilter; static struct cdevsw audit_pipe_cdevsw = { .d_version = D_VERSION, @@ -181,9 +182,20 @@ .d_read = audit_pipe_read, .d_ioctl = audit_pipe_ioctl, .d_poll = audit_pipe_poll, + .d_kqfilter = audit_pipe_kqfilter, .d_name = AUDIT_PIPE_NAME, }; +static int audit_pipe_kqread(struct knote *note, long hint); +static void audit_pipe_kqdetach(struct knote *note); + +static struct filterops audit_pipe_read_filterops = { + .f_isfd = 1, + .f_attach = NULL, + .f_detach = audit_pipe_kqdetach, + .f_event = audit_pipe_kqread, +}; + /* * Some global statistics on audit pipes. */ @@ -425,6 +437,7 @@ ap->ap_inserts++; ap->ap_qlen++; selwakeuppri(&ap->ap_selinfo, PSOCK); + KNOTE_LOCKED(&ap->ap_selinfo.si_note, 0); if (ap->ap_flags & AUDIT_PIPE_ASYNC) pgsigio(&ap->ap_sigio, SIGIO, 0); } @@ -520,6 +533,8 @@ return (NULL); ap->ap_qlimit = AUDIT_PIPE_QLIMIT_DEFAULT; TAILQ_INIT(&ap->ap_queue); + knlist_init(&ap->ap_selinfo.si_note, &audit_pipe_mtx, NULL, NULL, + NULL); /* * Default flags, naflags, and auid-specific preselection settings to @@ -533,6 +548,9 @@ TAILQ_INIT(&ap->ap_preselect_list); ap->ap_preselect_mode = AUDITPIPE_PRESELECT_MODE_TRAIL; + /* + * Add to global list and update global statistics. + */ TAILQ_INSERT_HEAD(&audit_pipe_list, ap, ap_list); audit_pipe_count++; audit_pipe_ever++; @@ -572,6 +590,7 @@ audit_pipe_preselect_flush_locked(ap); audit_pipe_flush(ap); + knlist_destroy(&ap->ap_selinfo.si_note); TAILQ_REMOVE(&audit_pipe_list, ap, ap_list); free(ap, M_AUDIT_PIPE); audit_pipe_count--; @@ -946,6 +965,71 @@ } /* + * Audit pipe kqfilter. + */ +static int +audit_pipe_kqfilter(struct cdev *dev, struct knote *kn) +{ + struct audit_pipe *ap; + + ap = dev->si_drv1; + KASSERT(ap != NULL, ("audit_pipe_kqfilter: ap == NULL")); + + if (kn->kn_filter != EVFILT_READ) + return (EINVAL); + + kn->kn_fop = &audit_pipe_read_filterops; + kn->kn_hook = ap; + + mtx_lock(&audit_pipe_mtx); + knlist_add(&ap->ap_selinfo.si_note, kn, 1); + mtx_unlock(&audit_pipe_mtx); + return (0); +} + +/* + * Return true if there are records available for reading on the pipe. + */ +static int +audit_pipe_kqread(struct knote *kn, long hint) +{ + struct audit_pipe_entry *ape; + struct audit_pipe *ap; + + mtx_assert(&audit_pipe_mtx, MA_OWNED); + + ap = (struct audit_pipe *)kn->kn_hook; + KASSERT(ap != NULL, ("audit_pipe_kqread: ap == NULL")); + + if (ap->ap_qlen != 0) { + ape = TAILQ_FIRST(&ap->ap_queue); + KASSERT(ape != NULL, ("audit_pipe_kqread: ape == NULL")); + + kn->kn_data = ape->ape_record_len; + return (1); + } else { + kn->kn_data = 0; + return (0); + } +} + +/* + * Detach kqueue state from audit pipe. + */ +static void +audit_pipe_kqdetach(struct knote *kn) +{ + struct audit_pipe *ap; + + ap = (struct audit_pipe *)kn->kn_hook; + KASSERT(ap != NULL, ("audit_pipe_kqdetach: ap == NULL")); + + mtx_lock(&audit_pipe_mtx); + knlist_remove(&ap->ap_selinfo.si_note, kn, 1); + mtx_unlock(&audit_pipe_mtx); +} + +/* * Initialize the audit pipe system. */ static void From owner-trustedbsd-cvs@FreeBSD.ORG Thu Aug 10 16:19:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE18016A4DA for ; Thu, 10 Aug 2006 16:19:59 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 520DC43D76 for ; Thu, 10 Aug 2006 16:19:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3AFCE46CFB for ; Thu, 10 Aug 2006 12:19:49 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B6E3758926; Thu, 10 Aug 2006 16:19:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A846C16A4E6; Thu, 10 Aug 2006 16:19:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8367616A4E1 for ; Thu, 10 Aug 2006 16:19:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CEF943D5A for ; Thu, 10 Aug 2006 16:19:48 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7AGJmTx027091 for ; Thu, 10 Aug 2006 16:19:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7AGJlCS027088 for perforce@freebsd.org; Thu, 10 Aug 2006 16:19:47 GMT (envelope-from millert@freebsd.org) Date: Thu, 10 Aug 2006 16:19:47 GMT Message-Id: <200608101619.k7AGJlCS027088@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 103579 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Aug 2006 16:20:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=103579 Change 103579 by millert@millert_macbook on 2006/08/10 16:19:40 Remove flask_types.h; it has not been used in a long time. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/flask_types.h#2 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 12 17:17:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66C5116A558 for ; Sat, 12 Aug 2006 17:17:38 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CDDC43D45 for ; Sat, 12 Aug 2006 17:17:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E216A46D34 for ; Sat, 12 Aug 2006 13:17:36 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 26B08554E3; Sat, 12 Aug 2006 17:17:36 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1952216A4DF; Sat, 12 Aug 2006 17:17:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D20B816A4DA for ; Sat, 12 Aug 2006 17:17:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B4F943D46 for ; Sat, 12 Aug 2006 17:17:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7CHHZd1065718 for ; Sat, 12 Aug 2006 17:17:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7CHHZpH065715 for perforce@freebsd.org; Sat, 12 Aug 2006 17:17:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 12 Aug 2006 17:17:35 GMT Message-Id: <200608121717.k7CHHZpH065715@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 103721 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Aug 2006 17:17:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=103721 Change 103721 by rwatson@rwatson_peppercorn on 2006/08/12 17:17:17 Rename autool to audump in makefiles, to match file rename. Affected files ... .. //depot/projects/trustedbsd/openbsm/tools/Makefile.am#2 edit .. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/tools/Makefile.am#2 (text+ko) ==== @@ -1,9 +1,9 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) -bin_PROGRAMS = autool -autool_SOURCES = autool.c -autool_LDADD = $(top_builddir)/libbsm/libbsm.la +bin_PROGRAMS = audump +audump_SOURCES = audump.c +audump_LDADD = $(top_builddir)/libbsm/libbsm.la ==== //depot/projects/trustedbsd/openbsm/tools/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#4 $ # srcdir = @srcdir@ @@ -40,7 +40,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = autool$(EXEEXT) +bin_PROGRAMS = audump$(EXEEXT) subdir = tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -53,9 +53,9 @@ am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_autool_OBJECTS = autool.$(OBJEXT) -autool_OBJECTS = $(am_autool_OBJECTS) -autool_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la +am_audump_OBJECTS = audump.$(OBJEXT) +audump_OBJECTS = $(am_audump_OBJECTS) +audump_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -67,8 +67,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(autool_SOURCES) -DIST_SOURCES = $(autool_SOURCES) +SOURCES = $(audump_SOURCES) +DIST_SOURCES = $(audump_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -174,8 +174,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ INCLUDES = -I$(top_srcdir) -autool_SOURCES = autool.c -autool_LDADD = $(top_builddir)/libbsm/libbsm.la +audump_SOURCES = audump.c +audump_LDADD = $(top_builddir)/libbsm/libbsm.la all: all-am .SUFFIXES: @@ -237,9 +237,9 @@ echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -autool$(EXEEXT): $(autool_OBJECTS) $(autool_DEPENDENCIES) - @rm -f autool$(EXEEXT) - $(LINK) $(autool_LDFLAGS) $(autool_OBJECTS) $(autool_LDADD) $(LIBS) +audump$(EXEEXT): $(audump_OBJECTS) $(audump_DEPENDENCIES) + @rm -f audump$(EXEEXT) + $(LINK) $(audump_LDFLAGS) $(audump_OBJECTS) $(audump_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -247,7 +247,7 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autool.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audump.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ From owner-trustedbsd-cvs@FreeBSD.ORG Sat Aug 12 17:18:39 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED15D16A4E6 for ; Sat, 12 Aug 2006 17:18:39 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77DB443D46 for ; Sat, 12 Aug 2006 17:18:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9FA1D46D1C for ; Sat, 12 Aug 2006 13:18:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id EC92F555E2; Sat, 12 Aug 2006 17:18:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DCA1C16A4E5; Sat, 12 Aug 2006 17:18:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA1E416A4E1 for ; Sat, 12 Aug 2006 17:18:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A7B143D49 for ; Sat, 12 Aug 2006 17:18:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7CHIbwU065765 for ; Sat, 12 Aug 2006 17:18:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7CHIbBU065762 for perforce@freebsd.org; Sat, 12 Aug 2006 17:18:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 12 Aug 2006 17:18:37 GMT Message-Id: <200608121718.k7CHIbBU065762@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 103722 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Aug 2006 17:18:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=103722 Change 103722 by rwatson@rwatson_peppercorn on 2006/08/12 17:17:56 Update for OpenBSM 1.0a8. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure.ac#26 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure.ac#26 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a8], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#25 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#26 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) From owner-trustedbsd-cvs@FreeBSD.ORG Sun Aug 13 11:19:20 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 534CA16A4E1 for ; Sun, 13 Aug 2006 11:19:20 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBDB543D45 for ; Sun, 13 Aug 2006 11:19:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E20FF46C1D for ; Sun, 13 Aug 2006 07:19:18 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BEA4F554E0; Sun, 13 Aug 2006 11:19:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B970C16A4DF; Sun, 13 Aug 2006 11:19:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D39216A4DD for ; Sun, 13 Aug 2006 11:19:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A7D843D45 for ; Sun, 13 Aug 2006 11:19:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DBJHF1002677 for ; Sun, 13 Aug 2006 11:19:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DBJEfK002674 for perforce@freebsd.org; Sun, 13 Aug 2006 11:19:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 13 Aug 2006 11:19:14 GMT Message-Id: <200608131119.k7DBJEfK002674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103749 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 11:19:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=103749 Change 103749 by rwatson@rwatson_peppercorn on 2006/08/13 11:18:37 Update for OpenBSM 1.0a8. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#23 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#23 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#25 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a7. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a8. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a7' -PACKAGE_STRING='OpenBSM 1.0a7' +PACKAGE_VERSION='1.0a8' +PACKAGE_STRING='OpenBSM 1.0a8' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a7 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a7:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a8:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a7 +OpenBSM configure 1.0a8 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a7, which was +It was created by OpenBSM $as_me 1.0a8, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a7 + VERSION=1.0a8 cat >>confdefs.h <<_ACEOF @@ -23477,7 +23477,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a7, which was +This file was extended by OpenBSM $as_me 1.0a8, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23540,7 +23540,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a7 +OpenBSM config.status 1.0a8 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" From owner-trustedbsd-cvs@FreeBSD.ORG Mon Aug 14 13:28:36 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 897E616A4EA for ; Mon, 14 Aug 2006 13:28:36 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F87343D78 for ; Mon, 14 Aug 2006 13:28:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9282846C3B for ; Mon, 14 Aug 2006 09:28:25 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 061A856955; Mon, 14 Aug 2006 13:28:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F162716A4E2; Mon, 14 Aug 2006 13:28:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ADD2D16A4E0 for ; Mon, 14 Aug 2006 13:28:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DDEE43D8D for ; Mon, 14 Aug 2006 13:27:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EDRqJA083852 for ; Mon, 14 Aug 2006 13:27:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EDRqbb083849 for perforce@freebsd.org; Mon, 14 Aug 2006 13:27:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 14 Aug 2006 13:27:52 GMT Message-Id: <200608141327.k7EDRqbb083849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103837 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 13:28:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=103837 Change 103837 by rwatson@rwatson_fledge on 2006/08/14 13:27:05 Restructure, update, expand OpenBSM web page. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#11 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#11 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#10 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#11 $ @@ -68,6 +68,19 @@ easier audit trail analysis, including a pattern matching library.

    + + + +
    + History and Vendors + + +

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

    +

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

    + +
    + +
    + Mailing List + +

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

    -

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

    + +
    + +
    + Downloads + + +

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

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

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

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

    OpenBSM is a portable, open source implementation of Sun's Basic From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 10:45:49 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F119316A4E7 for ; Tue, 15 Aug 2006 10:45:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69D8243D45 for ; Tue, 15 Aug 2006 10:45:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 76B4946C05 for ; Tue, 15 Aug 2006 06:45:47 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 74E9E56C02; Tue, 15 Aug 2006 10:45:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CFFA16A4E8; Tue, 15 Aug 2006 10:45:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1751216A4DA for ; Tue, 15 Aug 2006 10:45:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B57D243D45 for ; Tue, 15 Aug 2006 10:45:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FAji3T060619 for ; Tue, 15 Aug 2006 10:45:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FAjiNq060616 for perforce@freebsd.org; Tue, 15 Aug 2006 10:45:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 15 Aug 2006 10:45:44 GMT Message-Id: <200608151045.k7FAjiNq060616@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104000 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 10:45:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=104000 Change 104000 by rwatson@rwatson_peppercorn on 2006/08/15 10:44:46 Test for clock_gettime(), which is not available on Darwin. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#8 edit .. //depot/projects/trustedbsd/openbsm/configure#24 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#27 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#8 (text+ko) ==== @@ -12,6 +12,9 @@ /* Define to 1 if your system has a working `chown' function. */ #undef HAVE_CHOWN +/* Define to 1 if you have the `clock_gettime' function. */ +#undef HAVE_CLOCK_GETTIME + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H ==== //depot/projects/trustedbsd/openbsm/configure#24 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#25 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#26 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a8. # @@ -22833,7 +22833,8 @@ -for ac_func in bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul + +for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 ==== //depot/projects/trustedbsd/openbsm/configure.ac#27 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a8], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#26 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#27 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -56,7 +56,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRFTIME -AC_CHECK_FUNCS([bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) +AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) # sys/queue.h exists on most systems, but its capabilities vary a great deal. # test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 16:29:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3691D16A519 for ; Tue, 15 Aug 2006 16:29:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71B3943DEF for ; Tue, 15 Aug 2006 16:26:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6DD7A46D52 for ; Tue, 15 Aug 2006 12:26:39 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D1C2257BC4; Tue, 15 Aug 2006 16:23:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CCFC416A4E8; Tue, 15 Aug 2006 16:23:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EEA616A4DA for ; Tue, 15 Aug 2006 16:23:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75D1243D7B for ; Tue, 15 Aug 2006 16:23:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FGNSYv014284 for ; Tue, 15 Aug 2006 16:23:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FGNPhp014281 for perforce@freebsd.org; Tue, 15 Aug 2006 16:23:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 15 Aug 2006 16:23:25 GMT Message-Id: <200608151623.k7FGNPhp014281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104050 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 16:29:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=104050 Change 104050 by rwatson@rwatson_peppercorn on 2006/08/15 16:23:02 Fixes to 32-bit and 64-bit argument token output. Submitted by: Pawel Worach Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#21 edit .. //depot/projects/trustedbsd/openbsm/README#18 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#39 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#21 (text+ko) ==== @@ -10,6 +10,8 @@ - OpenBSM-specific events assigned numbers in the 43xxx range to avoid future collisions with Solaris. Darwin events renamed to AUE_DARWIN_foo, as they are now deprecated numberings. +- autoconf now detects clock_gettime(), which is not available on Darwin. +- praudit output fixes relating to arg32 and arg64 tokens. OpenBSM 1.0 alpha 7 @@ -188,4 +190,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#20 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#21 $ ==== //depot/projects/trustedbsd/openbsm/README#18 (text+ko) ==== @@ -74,6 +74,7 @@ Olivier Houchard Christian Peron Martin Fong + Pawel Worach In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -95,4 +96,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#17 $ +$P4: //depot/projects/trustedbsd/openbsm/README#18 $ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#39 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#38 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#39 $ */ #include @@ -820,7 +820,7 @@ print_delim(fp, del); print_1_byte(fp, tok->tt.arg32.no, "%u"); print_delim(fp, del); - print_4_bytes(fp, tok->tt.arg32.val, "%#x"); + print_4_bytes(fp, tok->tt.arg32.val, "0x%x"); print_delim(fp, del); print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len); } @@ -859,7 +859,7 @@ print_delim(fp, del); print_1_byte(fp, tok->tt.arg64.no, "%u"); print_delim(fp, del); - print_8_bytes(fp, tok->tt.arg64.val, "%#llx"); + print_8_bytes(fp, tok->tt.arg64.val, "0x%llx"); print_delim(fp, del); print_string(fp, tok->tt.arg64.text, tok->tt.arg64.len); } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 17:21:51 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29AAA16A4E0 for ; Tue, 15 Aug 2006 17:21:51 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 270BF43D66 for ; Tue, 15 Aug 2006 17:21:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3C2A446C72 for ; Tue, 15 Aug 2006 13:21:49 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 75AAA55606; Tue, 15 Aug 2006 17:21:48 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7219C16A4E1; Tue, 15 Aug 2006 17:21:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3286216A4DA for ; Tue, 15 Aug 2006 17:21:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2F3F43D6D for ; Tue, 15 Aug 2006 17:21:47 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHLlhO033518 for ; Tue, 15 Aug 2006 17:21:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHLlmv033515 for perforce@freebsd.org; Tue, 15 Aug 2006 17:21:47 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:21:47 GMT Message-Id: <200608151721.k7FHLlmv033515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104061 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:21:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=104061 Change 104061 by millert@millert_g4tower on 2006/08/15 17:20:46 Add missing break in switch() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscall.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscall.c#2 (text+ko) ==== @@ -158,6 +158,7 @@ security_get_bool(str, &active, &pending); gb.val = active | (pending << 1); error = copyout(&gb, args, sizeof(gb)); + break; } case SEBSDCALL_SET_BOOL: From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 17:36:15 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3C0C16A4E1 for ; Tue, 15 Aug 2006 17:36:14 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8101F43D82 for ; Tue, 15 Aug 2006 17:36:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5CBEB46B42 for ; Tue, 15 Aug 2006 13:36:09 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C8FBE55FDD; Tue, 15 Aug 2006 17:36:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C543416A4DF; Tue, 15 Aug 2006 17:36:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88F4316A4DD for ; Tue, 15 Aug 2006 17:36:08 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9A6543D6D for ; Tue, 15 Aug 2006 17:36:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHa7hp034506 for ; Tue, 15 Aug 2006 17:36:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHa7nh034503 for perforce@freebsd.org; Tue, 15 Aug 2006 17:36:07 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:36:07 GMT Message-Id: <200608151736.k7FHa7nh034503@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104066 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:36:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=104066 Change 104066 by millert@millert_g4tower on 2006/08/15 17:35:16 Add missing mac_get_peer() prototype. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#2 (text+ko) ==== @@ -86,6 +86,7 @@ int mac_get_lcid(pid_t _lcid, mac_t _label); int mac_get_lctx(mac_t _label); int mac_get_link(const char *_path, mac_t _label); +int mac_get_peer(int fd, struct mac *label); int mac_get_pid(pid_t _pid, mac_t _label); int mac_get_proc(mac_t _label); int mac_is_present(const char *_policyname); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 17:41:58 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9EE7816A4DA for ; Tue, 15 Aug 2006 17:41:58 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6F4943D6E for ; Tue, 15 Aug 2006 17:41:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 708CC46CBF for ; Tue, 15 Aug 2006 13:41:57 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id EAFC492A14; Tue, 15 Aug 2006 17:41:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D94916A605; Tue, 15 Aug 2006 17:41:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B10E616A5F3 for ; Tue, 15 Aug 2006 17:41:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83E1443D8A for ; Tue, 15 Aug 2006 17:41:15 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHfFhH035208 for ; Tue, 15 Aug 2006 17:41:15 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHfFZB035205 for perforce@freebsd.org; Tue, 15 Aug 2006 17:41:15 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:41:15 GMT Message-Id: <200608151741.k7FHfFZB035205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104068 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:41:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=104068 Change 104068 by millert@millert_macbook on 2006/08/15 17:40:36 Remove file mistakenly submitted in sedarwin8 import. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/loadpolicy/loadpolicy#2 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 17:42:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC06B16A600 for ; Tue, 15 Aug 2006 17:42:37 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65E9143D8C for ; Tue, 15 Aug 2006 17:42:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C9DDB46CC7 for ; Tue, 15 Aug 2006 13:42:28 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 04EFD578BA; Tue, 15 Aug 2006 17:42:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A00B16A510; Tue, 15 Aug 2006 17:42:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D41BB16A4DA for ; Tue, 15 Aug 2006 17:42:17 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C9AA43D70 for ; Tue, 15 Aug 2006 17:42:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHgH15035306 for ; Tue, 15 Aug 2006 17:42:17 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHgGXX035303 for perforce@freebsd.org; Tue, 15 Aug 2006 17:42:16 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:42:16 GMT Message-Id: <200608151742.k7FHgGXX035303@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104069 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:42:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=104069 Change 104069 by millert@millert_macbook on 2006/08/15 17:41:25 load_policy belongs in /usr/sbin Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/load_policy/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/load_policy/Makefile#2 (text+ko) ==== @@ -19,7 +19,7 @@ $(CC) $(CFLAGS) -o $@ $^ $(LDADD) install: - install -m 555 $(PROG) $(DESTDIR)/usr/bin + install -m 555 $(PROG) $(DESTDIR)/usr/sbin install -m 444 $(MAN8) $(DESTDIR)/usr/share/man/man8 clean: From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 17:44:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D84116A4E0 for ; Tue, 15 Aug 2006 17:44:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 704E843D67 for ; Tue, 15 Aug 2006 17:44:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A33A546CC4 for ; Tue, 15 Aug 2006 13:44:24 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5F3C356FD7; Tue, 15 Aug 2006 17:44:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 594E016A4E0; Tue, 15 Aug 2006 17:44:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 306B016A4DA for ; Tue, 15 Aug 2006 17:44:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EA7E43D6B for ; Tue, 15 Aug 2006 17:44:20 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHiKUu035486 for ; Tue, 15 Aug 2006 17:44:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHiJdB035483 for perforce@freebsd.org; Tue, 15 Aug 2006 17:44:19 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:44:19 GMT Message-Id: <200608151744.k7FHiJdB035483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104070 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:44:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=104070 Change 104070 by millert@millert_macbook on 2006/08/15 17:44:17 Add security.mac.sebsd.compute.create, security.mac.sebsd.compute.member, and security.mac.sebsd.canon.context sysctls for use by libselinux. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_sysctl.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_sysctl.c#2 (text+ko) ==== @@ -366,7 +366,169 @@ return (error); } +/* + * Sysctl handler for security.mac.sebsd.canon_context. + * Check sid validity, returns canonical name of context. + */ +static int +sysctl_canon_context SYSCTL_HANDLER_ARGS +{ + u_int32_t sid, len; + char *context, *canon; + int error; + +#ifdef SECURITY__COMPUTE_CHECK + error = cred_has_security(kauth_cred_get(), SECURITY__COMPUTE_CHECK); + if (error) + return (error); +#endif + + if (req->newlen < 2) + return (EINVAL); + if (req->newlen > 512) /* arbitrary */ + return (ENAMETOOLONG); + context = sebsd_malloc(req->newlen, M_SEBSD, M_WAITOK); + error = SYSCTL_IN(req, context, req->newlen); + if (error) + goto out; + if (context[req->newlen - 1] != '\0') { + error = EINVAL; + goto out; + } + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ + error = security_context_to_sid(context, strlen(context) + 1, &sid); + if (error) + goto out; + + error = security_sid_to_context(sid, &canon, &len); + if (error == 0) { + error = SYSCTL_OUT(req, canon, len); + sebsd_free(canon, M_SEBSD); + } +out: + sebsd_free(context, M_SEBSD); + return (error); +} + +/* + * Sysctl handler for security.mac.sebsd.compute_create. Create new sid + * given input "scontext\0tcontext\0", tclass. + */ +static int +sysctl_compute_create SYSCTL_HANDLER_ARGS +{ + u_int32_t sid, tsid, newsid, len; + u_int16_t tclass; + char *scontext, *tcontext, *newcontext; + int error; + + error = cred_has_security(kauth_cred_get(), SECURITY__COMPUTE_CREATE); + if (error) + return (error); + + if (req->newlen < 4 + sizeof(tclass)) + return (EINVAL); + if (req->newlen > 512) /* arbitrary */ + return (ENAMETOOLONG); + scontext = sebsd_malloc(req->newlen, M_SEBSD, M_WAITOK); + error = SYSCTL_IN(req, scontext, req->newlen); + if (error) + goto out; + if (scontext[req->newlen - (1 + sizeof(tclass))] != '\0') { + error = EINVAL; + goto out; + } + tcontext = &scontext[strlen(scontext) + 1]; + if (tcontext >= &scontext[req->newlen - (1 + sizeof(tclass))]) { + error = EINVAL; + goto out; + } + bcopy(&tcontext[strlen(tcontext) + 1], &tclass, sizeof(tclass)); + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ + error = security_context_to_sid(scontext, strlen(scontext) + 1, &sid); + if (error) + goto out; + error = security_context_to_sid(tcontext, strlen(tcontext) + 1, &tsid); + if (error) + goto out; + + error = security_transition_sid(sid, tsid, tclass, &newsid); + if (error) + goto out; + + error = security_sid_to_context(newsid, &newcontext, &len); + if (error == 0) { + error = SYSCTL_OUT(req, newcontext, len); + sebsd_free(newcontext, M_SEBSD); + } +out: + sebsd_free(scontext, M_SEBSD); + return (error); +} + +/* + * Sysctl handler for security.mac.sebsd.compute_member. Compute member sid + * given input "scontext\0tcontext\0", tclass. + */ static int +sysctl_compute_member SYSCTL_HANDLER_ARGS +{ + u_int32_t sid, tsid, newsid, len; + u_int16_t tclass; + char *scontext, *tcontext, *newcontext; + int error; + + error = cred_has_security(kauth_cred_get(), SECURITY__COMPUTE_MEMBER); + if (error) + return (error); + + if (req->newlen < 4 + sizeof(tclass)) + return (EINVAL); + if (req->newlen > 512) /* arbitrary */ + return (ENAMETOOLONG); + scontext = sebsd_malloc(req->newlen, M_SEBSD, M_WAITOK); + error = SYSCTL_IN(req, scontext, req->newlen); + if (error) + goto out; + if (scontext[req->newlen - (1 + sizeof(tclass))] != '\0') { + error = EINVAL; + goto out; + } + tcontext = &scontext[strlen(scontext) + 1]; + if (tcontext >= &scontext[req->newlen - (1 + sizeof(tclass))]) { + error = EINVAL; + goto out; + } + bcopy(&tcontext[strlen(tcontext) + 1], &tclass, sizeof(tclass)); + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ + error = security_context_to_sid(scontext, strlen(scontext) + 1, &sid); + if (error) + goto out; + error = security_context_to_sid(tcontext, strlen(tcontext) + 1, &tsid); + if (error) + goto out; + + error = security_member_sid(sid, tsid, tclass, &newsid); + if (error) + goto out; + + error = security_sid_to_context(newsid, &newcontext, &len); + if (error == 0) { + error = SYSCTL_OUT(req, newcontext, len); + sebsd_free(newcontext, M_SEBSD); + } +out: + sebsd_free(scontext, M_SEBSD); + return (error); +} + +static int sysctl_sebsd_policypath SYSCTL_HANDLER_ARGS { void *path; @@ -412,6 +574,15 @@ SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_av, CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_av, "A", "SEBSD access vector decision query"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, canon_context, CTLTYPE_STRING | + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_canon_context, "A", + "SEBSD context verification query"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_create, CTLTYPE_STRING | + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_create, "A", + "SEBSD context computation query"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_member, CTLTYPE_STRING | + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_member, "A", + "SEBSD context member query"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, auditing, CTLTYPE_INT | CTLFLAG_RW, NULL, 0, sysctl_sebsd_auditing, "I", "SEBSD avc auditing"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, enforcing, CTLTYPE_INT | @@ -436,6 +607,9 @@ sysctl_register_oid(&sysctl__security_mac_sebsd_file_sids); sysctl_register_oid(&sysctl__security_mac_sebsd_change_sid); sysctl_register_oid(&sysctl__security_mac_sebsd_compute_av); + sysctl_register_oid(&sysctl__security_mac_sebsd_compute_create); + sysctl_register_oid(&sysctl__security_mac_sebsd_compute_member); + sysctl_register_oid(&sysctl__security_mac_sebsd_canon_context); sysctl_register_oid(&sysctl__security_mac_sebsd_auditing); sysctl_register_oid(&sysctl__security_mac_sebsd_enforcing); sysctl_register_oid(&sysctl__security_mac_sebsd_policyvers); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 17:53:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C503B16A4EF for ; Tue, 15 Aug 2006 17:53:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D6C543DA9 for ; Tue, 15 Aug 2006 17:52:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C938F46D24 for ; Tue, 15 Aug 2006 13:52:15 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id F293893253; Tue, 15 Aug 2006 17:52:03 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D8EE16A6B1; Tue, 15 Aug 2006 17:51:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 022FC16A666 for ; Tue, 15 Aug 2006 17:51:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A7CD43D69 for ; Tue, 15 Aug 2006 17:51:34 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHpUEb036223 for ; Tue, 15 Aug 2006 17:51:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHpUpN036220 for perforce@freebsd.org; Tue, 15 Aug 2006 17:51:30 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:51:30 GMT Message-Id: <200608151751.k7FHpUpN036220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104072 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:53:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=104072 Change 104072 by millert@millert_macbook on 2006/08/15 17:50:45 Use __func__ in error message instead of hard-coding the wrong thing (cut & pasto). Also replace an instance of __FUNCTION__ (old gccism) with __func__ (c99). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#2 (text+ko) ==== @@ -691,8 +691,8 @@ goto dosclass; } if (error) { - printf("sebsd_update_vnode_from_extattr: ERROR %d returned " - " by mac_vnop_getxattr()\n", error); + printf("%s: ERROR %d returned by mac_vnop_getxattr()\n", + __func__, error); return (error); /* Fail closed */ } @@ -702,8 +702,8 @@ error = security_context_to_sid(context, context_len, &vsec->sid); if (error) { - printf("sebsd_update_vnode_from_extattr: ERROR mapping " - "context to sid: %.*s\n", context_len, context); + printf("%s: ERROR mapping context to sid: %.*s\n", + __func__, context_len, context); return (0); /* TBD bad, bad, bad */ } @@ -1256,7 +1256,7 @@ break; default: printf("%s: security_fs_use(%s) returned unrecognized " - "behavior %d\n", __FUNCTION__, mp->mnt_vtable->vfc_name, + "behavior %d\n", __func__, mp->mnt_vtable->vfc_name, behavior); behavior = SECURITY_FS_USE_NONE; break; From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 17:53:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4B0E16A4F4 for ; Tue, 15 Aug 2006 17:53:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E82043DAA for ; Tue, 15 Aug 2006 17:52:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E3FBF46D48 for ; Tue, 15 Aug 2006 13:52:13 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id EC37972AF6; Tue, 15 Aug 2006 17:51:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CE79216A647; Tue, 15 Aug 2006 17:51:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 82D3F16A641 for ; Tue, 15 Aug 2006 17:51:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2069043DE9 for ; Tue, 15 Aug 2006 17:51:35 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHpVvp036229 for ; Tue, 15 Aug 2006 17:51:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHpVqb036226 for perforce@freebsd.org; Tue, 15 Aug 2006 17:51:31 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:51:31 GMT Message-Id: <200608151751.k7FHpVqb036226@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104073 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:53:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=104073 Change 104073 by millert@millert_macbook on 2006/08/15 17:51:17 Fall back on fslabel if the label in the exattr is invalid. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#3 (text+ko) ==== @@ -671,6 +671,7 @@ struct vnode *vp, struct label *vlabel) { struct vnode_security_struct *vsec; + struct mount_fs_security_struct *fssec; /* * TBD: static buffers aren't a good idea, and SELinux contexts * aren't restricted in length. @@ -684,32 +685,37 @@ error = mac_vnop_getxattr(vp, SEBSD_MAC_EXTATTR_NAME, context, sizeof(context), &context_len); - if (error == ENOATTR || error == ENOTSUP || error == EPERM) { - /* XXX - use fslabel sid instead */ - vsec->sid = SECINITSID_UNLABELED; /* Use the default label */ - - goto dosclass; - } if (error) { + if (error == ENOATTR || error == ENOTSUP || error == EPERM) + goto dosclass; printf("%s: ERROR %d returned by mac_vnop_getxattr()\n", __func__, error); - return (error); /* Fail closed */ + return (error); /* Fail closed */ } if (p == NULL || vp == NULL || vp->v_op == NULL || - vp->v_tag != VT_HFS || vp->v_data == NULL) + vp->v_tag != VT_HFS || vp->v_data == NULL) { + error = EINVAL; goto dosclass; + } error = security_context_to_sid(context, context_len, &vsec->sid); - if (error) { + if (error) printf("%s: ERROR mapping context to sid: %.*s\n", __func__, context_len, context); - return (0); /* TBD bad, bad, bad */ - } dosclass: vsec->sclass = vnode_type_to_security_class(vp->v_type); + /* Fall back to the filesystem label on error */ + if (error) { + if (fslabel) { + fssec = SLOT(fslabel); + vsec->sid = fssec->sid; + } else + vsec->sid = SECINITSID_UNLABELED; + } + return (0); } @@ -746,10 +752,13 @@ __func__, context_len, context); } - /* Fall back on the filesystem label on error */ + /* Fall back to the filesystem label on error */ if (error) { - fssec = SLOT(fslabel); - vsec->sid = fssec->sid; + if (fslabel) { + fssec = SLOT(fslabel); + vsec->sid = fssec->sid; + } else + vsec->sid = SECINITSID_UNLABELED; } } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 17:53:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBAD916A4DF for ; Tue, 15 Aug 2006 17:53:38 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DEA643D5A for ; Tue, 15 Aug 2006 17:53:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CA10F46D46 for ; Tue, 15 Aug 2006 13:53:14 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B705256ACC; Tue, 15 Aug 2006 17:53:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B190B16A4E0; Tue, 15 Aug 2006 17:53:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A3B416A4DD for ; Tue, 15 Aug 2006 17:53:13 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 020C343D62 for ; Tue, 15 Aug 2006 17:53:06 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHqWhe036340 for ; Tue, 15 Aug 2006 17:52:32 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHqWRC036337 for perforce@freebsd.org; Tue, 15 Aug 2006 17:52:32 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:52:32 GMT Message-Id: <200608151752.k7FHqWRC036337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104074 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:53:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=104074 Change 104074 by millert@millert_macbook on 2006/08/15 17:52:14 Rename slot -> sebsd_slot sebsd_slot is initialized by MAC_POLICY_SET so update comment Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#4 (text+ko) ==== @@ -97,8 +97,8 @@ static zone_t vnode_security_zone; static zone_t ipc_security_zone; -static int slot = 1; /* TBD, dynamic */ -#define SLOT(l) ((void *)LABEL_TO_SLOT((l), slot).l_ptr) +static int sebsd_slot; /* set by framework */ +#define SLOT(l) ((void *)LABEL_TO_SLOT((l), sebsd_slot).l_ptr) extern struct mac_policy_conf sebsd_mac_policy_conf; @@ -3705,4 +3705,4 @@ {SEBSD_MAC_LABEL_NAMESPACES}; MAC_POLICY_SET(&sebsd_ops, sebsd, POLICY_DESC, labelnamespaces, - SEBSD_MAC_LABEL_NAME_COUNT, &slot, MPC_LOADTIME_FLAG_NOTLATE, 0); + SEBSD_MAC_LABEL_NAME_COUNT, &sebsd_slot, MPC_LOADTIME_FLAG_NOTLATE, 0); From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 17:54:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B931116A4DE for ; Tue, 15 Aug 2006 17:54:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C5BD43D81 for ; Tue, 15 Aug 2006 17:54:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A8D1B46D37 for ; Tue, 15 Aug 2006 13:54:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 27813561A1; Tue, 15 Aug 2006 17:54:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2091E16A4E6; Tue, 15 Aug 2006 17:54:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D2B1A16A4DF for ; Tue, 15 Aug 2006 17:54:37 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 605CD43D8D for ; Tue, 15 Aug 2006 17:53:58 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHrYqZ036444 for ; Tue, 15 Aug 2006 17:53:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHrYEF036441 for perforce@freebsd.org; Tue, 15 Aug 2006 17:53:34 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:53:34 GMT Message-Id: <200608151753.k7FHrYEF036441@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104075 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:54:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=104075 Change 104075 by millert@millert_macbook on 2006/08/15 17:53:18 Add sebsd_prev label namespace for getting at the previous sid. Will be used by getprevcon() in libselinux. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#5 (text+ko) ==== @@ -2936,9 +2936,6 @@ u_int32_t context_len; int error; - if (strcmp("sebsd", element_name) != 0) - return (0); - error = security_sid_to_context(sid, &context, &context_len); if (error) return (error); @@ -2949,16 +2946,35 @@ return (error); } -#define SEBSD_EXTERNALIZE_LABEL(n1,n2) \ +#define SEBSD_EXTERNALIZE_LABEL(n1,n2) \ static int sebsd_externalize_##n1##_label(struct label *label, \ char *element_name, struct sbuf *sb) \ { \ struct n2##_security_struct *lsec; \ + \ + if (strcmp("sebsd", element_name) != 0) \ + return (0); \ + \ lsec = SLOT(label); \ return (sebsd_externalize_sid(lsec->sid, element_name, sb)); \ } -SEBSD_EXTERNALIZE_LABEL(cred,task) +static int sebsd_externalize_cred_label(struct label *label, + char *element_name, struct sbuf *sb) +{ + struct task_security_struct *tsec; + u_int32_t sid; + + tsec = SLOT(label); + if (strcmp("sebsd_prev", element_name) == 0) + sid = tsec->osid; + else if (strcmp("sebsd", element_name) == 0) + sid = tsec->sid; + else + return (0); + return (sebsd_externalize_sid(sid, element_name, sb)); +} + SEBSD_EXTERNALIZE_LABEL(network,network) SEBSD_EXTERNALIZE_LABEL(vnode,vnode) SEBSD_EXTERNALIZE_LABEL(mount_fs,mount_fs) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.h#2 (text+ko) ==== @@ -41,8 +41,8 @@ #define SEBSD_ID_STRING "sebsd" #define SEBSD_MAC_EXTATTR_NAME "sebsd" #define SEBSD_MAC_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM -#define SEBSD_MAC_LABEL_NAMESPACES "sebsd" -#define SEBSD_MAC_LABEL_NAME_COUNT 1 +#define SEBSD_MAC_LABEL_NAMESPACES "sebsd","sebsd_prev" +#define SEBSD_MAC_LABEL_NAME_COUNT 2 extern int sebsd_find_data(const char *key, void **valp, size_t *sizep); #define sebsd_find_data(k, v, s) mac_find_module_data("sebsd", k, v, s) From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:01:04 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7782116A4E1 for ; Tue, 15 Aug 2006 18:01:04 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF29543D77 for ; Tue, 15 Aug 2006 18:00:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8310F46C72 for ; Tue, 15 Aug 2006 14:00:45 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 84EDC55660; Tue, 15 Aug 2006 18:00:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 81E1B16A4E1; Tue, 15 Aug 2006 18:00:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58FEC16A4DA for ; Tue, 15 Aug 2006 18:00:44 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1610743D73 for ; Tue, 15 Aug 2006 18:00:44 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FI0hse037079 for ; Tue, 15 Aug 2006 18:00:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FI0hcr037071 for perforce@freebsd.org; Tue, 15 Aug 2006 18:00:43 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:00:43 GMT Message-Id: <200608151800.k7FI0hcr037071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104076 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:01:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=104076 Change 104076 by millert@millert_macbook on 2006/08/15 18:00:26 Use BSD-stye bit types in sebsd headers. Add commented out fscreate and exec sids in task_security_struct for future use/reference. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscalls.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by NAI Labs, the @@ -7,6 +8,9 @@ * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -42,32 +46,36 @@ #include struct task_security_struct { - u32 osid; - u32 sid; + u_int32_t osid; + u_int32_t sid; +#if 0 + u_int32_t exec_sid; /* exec SID */ + u_int32_t create_sid; /* fscreate SID */ +#endif }; struct file_security_struct { - u32 sid; + u_int32_t sid; }; struct vnode_security_struct { - u32 task_sid; - u32 sid; - u16 sclass; + u_int32_t task_sid; + u_int32_t sid; + u_int16_t sclass; }; struct network_security_struct { - u32 sid; - u32 task_sid; + u_int32_t sid; + u_int32_t task_sid; }; struct ipc_security_struct { - u32 sid; - u16 sclass; + u_int32_t sid; + u_int16_t sclass; }; struct mount_security_struct { - u32 sid; /* SID of file system */ + u_int32_t sid; /* SID of file system */ #ifndef __FreeBSD__ struct psidtab *psidtab; /* persistent SID mapping */ #endif @@ -82,6 +90,6 @@ }; struct mount_fs_security_struct { - u32 sid; /* default object SID of file system */ + u_int32_t sid; /* default object SID of file system */ }; #endif /* _SYS_SECURITY_SEBSD_LABELS_H */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscalls.h#2 (text+ko) ==== @@ -1,3 +1,43 @@ +/*- + * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by NAI Labs, the + * Security Research Division of Network Associates, Inc. under + * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA + * CHATS research program. + * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + #ifndef _SEBSD_SYSCALLS_H_ #define _SEBSD_SYSCALLS_H_ @@ -17,19 +57,19 @@ /* Structure definitions for compute_av call. */ struct security_query { - char *scontext; - char *tcontext; - u16 tclass; - u32 requested; + char *scontext; + char *tcontext; + u_int16_t tclass; + u_int32_t requested; }; struct security_response { - u32 allowed; - u32 decided; - u32 auditallow; - u32 auditdeny; - u32 notify; - u32 seqno; + u_int32_t allowed; + u_int32_t decided; + u_int32_t auditallow; + u_int32_t auditdeny; + u_int32_t notify; + u_int32_t seqno; }; struct sebsd_get_bools { From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:04:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59A2816A504 for ; Tue, 15 Aug 2006 18:04:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E252643D66 for ; Tue, 15 Aug 2006 18:04:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6831746BEB for ; Tue, 15 Aug 2006 14:04:07 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E91C655952; Tue, 15 Aug 2006 18:04:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E61E416A4DA; Tue, 15 Aug 2006 18:04:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C164616A4E0 for ; Tue, 15 Aug 2006 18:04:06 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9512543DA2 for ; Tue, 15 Aug 2006 18:02:47 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FI2lDo037324 for ; Tue, 15 Aug 2006 18:02:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FI2lgf037321 for perforce@freebsd.org; Tue, 15 Aug 2006 18:02:47 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:02:47 GMT Message-Id: <200608151802.k7FI2lgf037321@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104078 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:04:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=104078 Change 104078 by millert@millert_macbook on 2006/08/15 18:01:55 If the message number is bad, only return failure if we are in enforcing mode. Fix some whitespace here too. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#2 (text+ko) ==== @@ -129,8 +129,8 @@ sebsd_check_ipc_method1(int subj, int obj, int msgid) { struct msgid_classinfo *mcl; - u32 perms; - int cl; + u32 perms; + int cl; /* * Return allowed for messages in an unknown subsystem. @@ -142,10 +142,14 @@ return 0; cl = (msgid - mcl->baseid) / (8 * sizeof(u32)); - if (cl >= mcl->nclasses) - return (1); /* bad message, access denied */ + if (cl >= mcl->nclasses) { + /* bad message */ + if (selinux_enforcing) + return (EACCES); + else + return (0); + } - perms = (u32)1 << - (msgid - mcl->baseid - (cl * 8 * sizeof(u32))); + perms = (u32)1 << (msgid - mcl->baseid - (cl * 8 * sizeof(u32))); return avc_has_perm(subj, obj, mcl->classes[cl], perms, NULL); } From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:05:02 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECDA816A4F0 for ; Tue, 15 Aug 2006 18:05:01 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D96E43D45 for ; Tue, 15 Aug 2006 18:05:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 11D3C46BE3 for ; Tue, 15 Aug 2006 14:05:00 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 76BD456116; Tue, 15 Aug 2006 18:04:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 03B0416A4E5; Tue, 15 Aug 2006 18:04:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AEEC16A51A for ; Tue, 15 Aug 2006 18:04:58 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFC8F43D92 for ; Tue, 15 Aug 2006 18:04:50 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FI4oN7038700 for ; Tue, 15 Aug 2006 18:04:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FI4oZV038697 for perforce@freebsd.org; Tue, 15 Aug 2006 18:04:50 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:04:50 GMT Message-Id: <200608151804.k7FI4oZV038697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104079 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:05:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=104079 Change 104079 by millert@millert_macbook on 2006/08/15 18:04:30 Simpler Makefile Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/Makefile#2 (text+ko) ==== @@ -1,25 +1,25 @@ include ../../../Makeconfig -# Installation directories. -PREFIX = $(DESTDIR)/usr -LIBDIR = $(PREFIX)/lib -SHLIBDIR = $(DESTDIR)/lib +LIB = secompat +OBJS = getline.o strndup.o -LIBVERSION = 1 +CFLAGS += -Wall -SRCS= getline.c strndup.c +AR = ar cq +RANLIB = ranlib +INSTALL = install -LIBA=libsecompat.a -OBJS= $(patsubst %.c,%.o,$(SRCS)) +all: lib$(LIB).a -all: $(LIBA) +install: all + $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 0644 lib$(LIB).a \ + $(DESTDIR)/usr/lib + $(RANLIB) $(DESTDIR)/usr/lib/lib$(LIB).a -$(LIBA): $(OBJS) - libtool -static -c -o $@ $^ +clean: + rm -f lib$(LIB).a $(OBJS) -install: - -clean: - rm -f $(OBJS) $(LIBA) $(TARGET) - -.PHONY: install +lib$(LIB).a:: $(OBJS) + rm -f lib$(LIB).a + $(AR) lib$(LIB).a `lorder $(OBJS) | tsort -q` + $(RANLIB) lib$(LIB).a From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:06:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74A7616A55B for ; Tue, 15 Aug 2006 18:06:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F03BE43D46 for ; Tue, 15 Aug 2006 18:06:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7310C46BF1 for ; Tue, 15 Aug 2006 14:06:56 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 09CB155551; Tue, 15 Aug 2006 18:06:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0630E16A4E8; Tue, 15 Aug 2006 18:06:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B12DD16A4E6 for ; Tue, 15 Aug 2006 18:06:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68A6443D46 for ; Tue, 15 Aug 2006 18:06:55 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FI6tdc039018 for ; Tue, 15 Aug 2006 18:06:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FI6tDF039013 for perforce@freebsd.org; Tue, 15 Aug 2006 18:06:55 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:06:55 GMT Message-Id: <200608151806.k7FI6tDF039013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104081 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:06:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=104081 Change 104081 by millert@millert_macbook on 2006/08/15 18:06:09 Remove old Makefile Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile.old#2 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:25:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A31816A4DE for ; Tue, 15 Aug 2006 18:25:50 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1D9143D6B for ; Tue, 15 Aug 2006 18:25:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8FC0146C45 for ; Tue, 15 Aug 2006 14:25:26 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C90FC92EC5; Tue, 15 Aug 2006 18:21:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EBADC16A4EC; Tue, 15 Aug 2006 18:21:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9730216A541 for ; Tue, 15 Aug 2006 18:21:18 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7050243D49 for ; Tue, 15 Aug 2006 18:21:16 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FILGGw040598 for ; Tue, 15 Aug 2006 18:21:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FILEsd040559 for perforce@freebsd.org; Tue, 15 Aug 2006 18:21:14 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:21:14 GMT Message-Id: <200608151821.k7FILEsd040559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104085 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:25:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=104085 Change 104085 by millert@millert_macbook on 2006/08/15 18:20:43 Update to libsepol 1.12.23 Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/boolean_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/booleans.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/debug.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/iface_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/interfaces.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/module.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/node_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/nodes.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/avrule_block.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/avtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/conditional.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/constraint.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/ebitmap.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/expand.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/flask_types.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/hashtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/hierarchy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/link.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/mls_types.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/module.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/policydb.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/services.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/sidtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/symtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/util.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/port_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/ports.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/roles.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/sepol.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/user_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/users.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/assertion.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/avrule_block.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/avtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/boolean_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/boolean_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/booleans.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/conditional.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/constraint.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/debug.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/debug.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/ebitmap.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/expand.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/genbools.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/genusers.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/handle.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/handle.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/hashtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/hierarchy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/iface_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/iface_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/interfaces.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/link.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/mls.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/mls.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/module.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/module_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/node_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/node_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/nodes.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb_convert.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb_public.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/port_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/port_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/ports.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/private.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/roles.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/services.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/sidtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/symtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/user_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/user_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/users.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/util.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/write.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/libsepol-tests.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/refpolicy-base.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-cond.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-cond.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/utils/chkcon.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,69 @@ +1.12.23 2006-08-03 + * Merged symtab datum patch from Karl MacMillan. + +1.12.22 2006-08-03 + * Merged netfilter contexts support from Chris PeBenito. + +1.12.21 2006-07-28 + * Merged helpful hierarchy check errors patch from Joshua Brindle. + +1.12.20 2006-07-25 + * Merged semodule_deps patch from Karl MacMillan. + This adds source module names to the avrule decls. + +1.12.19 2006-06-29 + * Lindent. + +1.12.18 2006-06-26 + * Merged optionals in base take 2 patch set from Joshua Brindle. + +1.12.17 2006-05-30 + * Revert 1.12.16. + +1.12.16 2006-05-30 + * Merged cleaner fix for bool_ids overflow from Karl MacMillan, + replacing the prior patch. + +1.12.15 2006-05-30 + * Merged fixes for several memory leaks in the error paths during + policy read from Serge Hallyn. + +1.12.14 2006-05-25 + * Fixed bool_ids overflow bug in cond_node_find and cond_copy_list, + based on bug report and suggested fix by Cedric Roux. + +1.12.13 2006-05-24 + * Merged sens_copy_callback, check_role_hierarchy_callback, + and node_from_record fixes from Serge Hallyn. + +1.12.12 2006-05-22 + * Added sepol_policydb_compat_net() interface for testing whether + a policy requires the compatibility support for network checks + to be enabled in the kernel. + +1.12.11 2006-05-17 + * Merged patch to initialize sym_val_to_name arrays from Kevin Carr. + Reworked to use calloc in the first place, and converted some other + malloc/memset pairs to calloc calls. + +1.12.10 2006-05-08 + * Merged patch to revert role/user decl upgrade from Karl MacMillan. + +1.12.9 2006-05-08 + * Dropped tests from all Makefile target. + +1.12.8 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.12.7 2006-05-05 + * Merged libsepol test framework patch from Karl MacMillan. + +1.12.6 2006-04-28 + * Fixed cond_normalize to traverse the entire cond list at link time. + +1.12.5 2006-04-03 + * Merged fix for leak of optional package sections from Ivan Gyurdiev. + 1.12.4 2006-03-29 * Generalize test for bitmap overflow in ebitmap_set_bit. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/Makefile#2 (text+ko) ==== @@ -14,4 +14,8 @@ clean: $(MAKE) -C src clean $(MAKE) -C utils clean + $(MAKE) -C tests clean + +test: + $(MAKE) -C tests test ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.12.4 +1.12.23 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/boolean_record.h#2 (text+ko) ==== @@ -10,59 +10,42 @@ typedef struct sepol_bool_key sepol_bool_key_t; /* Key */ -extern int sepol_bool_key_create( - sepol_handle_t* handle, - const char* name, - sepol_bool_key_t** key); +extern int sepol_bool_key_create(sepol_handle_t * handle, + const char *name, sepol_bool_key_t ** key); + +extern void sepol_bool_key_unpack(const sepol_bool_key_t * key, + const char **name); -extern void sepol_bool_key_unpack( - const sepol_bool_key_t* key, - const char** name); +extern int sepol_bool_key_extract(sepol_handle_t * handle, + const sepol_bool_t * boolean, + sepol_bool_key_t ** key_ptr); -extern int sepol_bool_key_extract( - sepol_handle_t* handle, - const sepol_bool_t* boolean, - sepol_bool_key_t** key_ptr); +extern void sepol_bool_key_free(sepol_bool_key_t * key); -extern void sepol_bool_key_free( - sepol_bool_key_t* key); +extern int sepol_bool_compare(const sepol_bool_t * boolean, + const sepol_bool_key_t * key); -extern int sepol_bool_compare( - const sepol_bool_t* boolean, - const sepol_bool_key_t* key); +extern int sepol_bool_compare2(const sepol_bool_t * boolean, + const sepol_bool_t * boolean2); -extern int sepol_bool_compare2( - const sepol_bool_t* boolean, - const sepol_bool_t* boolean2); - /* Name */ -extern const char* sepol_bool_get_name( - const sepol_bool_t* boolean); +extern const char *sepol_bool_get_name(const sepol_bool_t * boolean); -extern int sepol_bool_set_name( - sepol_handle_t* handle, - sepol_bool_t* boolean, - const char* name); +extern int sepol_bool_set_name(sepol_handle_t * handle, + sepol_bool_t * boolean, const char *name); /* Value */ -extern int sepol_bool_get_value( - const sepol_bool_t* boolean); +extern int sepol_bool_get_value(const sepol_bool_t * boolean); -extern void sepol_bool_set_value( - sepol_bool_t* boolean, - int value); +extern void sepol_bool_set_value(sepol_bool_t * boolean, int value); /* Create/Clone/Destroy */ -extern int sepol_bool_create( - sepol_handle_t* handle, - sepol_bool_t** bool_ptr); +extern int sepol_bool_create(sepol_handle_t * handle, sepol_bool_t ** bool_ptr); -extern int sepol_bool_clone( - sepol_handle_t* handle, - const sepol_bool_t* boolean, - sepol_bool_t** bool_ptr); +extern int sepol_bool_clone(sepol_handle_t * handle, + const sepol_bool_t * boolean, + sepol_bool_t ** bool_ptr); -extern void sepol_bool_free( - sepol_bool_t* boolean); +extern void sepol_bool_free(sepol_bool_t * boolean); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/booleans.h#2 (text+ko) ==== @@ -13,47 +13,37 @@ policy for the boolean settings in the boolean configuration file. The binary policy is rewritten in place in memory. Returns 0 upon success, or -1 otherwise. */ -extern int sepol_genbools( - void *data, size_t len, - char *boolpath); +extern int sepol_genbools(void *data, size_t len, char *boolpath); /* Given an existing binary policy (starting at 'data', with length 'len') and boolean settings specified by the parallel arrays ('names', 'values') with 'nel' elements, rewrite the binary policy for the boolean settings. The binary policy is rewritten in place in memory. Returns 0 upon success or -1 otherwise. */ -extern int sepol_genbools_array( - void *data, size_t len, - char **names, int *values, - int nel); +extern int sepol_genbools_array(void *data, size_t len, + char **names, int *values, int nel); /*---------------end compatbility------------*/ /* Set the specified boolean */ -extern int sepol_bool_set ( - sepol_handle_t* handle, - sepol_policydb_t* policydb, - const sepol_bool_key_t* key, - const sepol_bool_t* data); +extern int sepol_bool_set(sepol_handle_t * handle, + sepol_policydb_t * policydb, + const sepol_bool_key_t * key, + const sepol_bool_t * data); /* Return the number of booleans */ -extern int sepol_bool_count( - sepol_handle_t* handle, - const sepol_policydb_t* p, - unsigned int* response); +extern int sepol_bool_count(sepol_handle_t * handle, + const sepol_policydb_t * p, unsigned int *response); /* Check if the specified boolean exists */ -extern int sepol_bool_exists( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_bool_key_t* key, - int* response); +extern int sepol_bool_exists(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_bool_key_t * key, int *response); /* Query a boolean - returns the boolean, or NULL if not found */ -extern int sepol_bool_query( - sepol_handle_t* handle, - const sepol_policydb_t* p, - const sepol_bool_key_t* key, - sepol_bool_t** response); +extern int sepol_bool_query(sepol_handle_t * handle, + const sepol_policydb_t * p, + const sepol_bool_key_t * key, + sepol_bool_t ** response); /* Iterate the booleans * The handler may return: @@ -61,12 +51,9 @@ * 1 to signal successful exit * 0 to signal continue */ -extern int sepol_bool_iterate( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - int (*fn)( - const sepol_bool_t* boolean, - void* fn_arg), - void* arg); +extern int sepol_bool_iterate(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + int (*fn) (const sepol_bool_t * boolean, + void *fn_arg), void *arg); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context.h#2 (text+ko) ==== @@ -7,25 +7,19 @@ /* -- Deprecated -- */ -extern int sepol_check_context( - const char *context); +extern int sepol_check_context(const char *context); /* -- End deprecated -- */ -extern int sepol_context_check( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_context_t* context); +extern int sepol_context_check(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_context_t * context); -extern int sepol_mls_contains( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const char* mls1, - const char* mls2, - int* response); +extern int sepol_mls_contains(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const char *mls1, + const char *mls2, int *response); -extern int sepol_mls_check( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const char* mls); +extern int sepol_mls_check(sepol_handle_t * handle, + const sepol_policydb_t * policydb, const char *mls); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_CONTEXT_RECORD_H_ -#define _SEPOL_CONTEXT_RECORD_H_ +#define _SEPOL_CONTEXT_RECORD_H_ #include @@ -10,63 +10,44 @@ * in a data collection by itself */ /* User */ -extern const char* sepol_context_get_user( - const sepol_context_t* con); +extern const char *sepol_context_get_user(const sepol_context_t * con); -extern int sepol_context_set_user( - sepol_handle_t* handle, - sepol_context_t* con, - const char* user); +extern int sepol_context_set_user(sepol_handle_t * handle, + sepol_context_t * con, const char *user); /* Role */ -extern const char* sepol_context_get_role( - const sepol_context_t* con); +extern const char *sepol_context_get_role(const sepol_context_t * con); -extern int sepol_context_set_role( - sepol_handle_t* handle, - sepol_context_t* con, - const char* role); +extern int sepol_context_set_role(sepol_handle_t * handle, + sepol_context_t * con, const char *role); /* Type */ -extern const char* sepol_context_get_type( - const sepol_context_t* con); +extern const char *sepol_context_get_type(const sepol_context_t * con); -extern int sepol_context_set_type( - sepol_handle_t* handle, - sepol_context_t* con, - const char* type); +extern int sepol_context_set_type(sepol_handle_t * handle, + sepol_context_t * con, const char *type); /* MLS */ -extern const char* sepol_context_get_mls( - const sepol_context_t* con); +extern const char *sepol_context_get_mls(const sepol_context_t * con); -extern int sepol_context_set_mls( - sepol_handle_t* handle, - sepol_context_t* con, - const char* mls_range); +extern int sepol_context_set_mls(sepol_handle_t * handle, + sepol_context_t * con, const char *mls_range); /* Create/Clone/Destroy */ -extern int sepol_context_create( - sepol_handle_t* handle, - sepol_context_t** con_ptr); +extern int sepol_context_create(sepol_handle_t * handle, + sepol_context_t ** con_ptr); -extern int sepol_context_clone( - sepol_handle_t* handle, - const sepol_context_t* con, - sepol_context_t** con_ptr); +extern int sepol_context_clone(sepol_handle_t * handle, + const sepol_context_t * con, + sepol_context_t ** con_ptr); -extern void sepol_context_free( - sepol_context_t* con); +extern void sepol_context_free(sepol_context_t * con); /* Parse to/from string */ -extern int sepol_context_from_string( - sepol_handle_t* handle, - const char* str, - sepol_context_t** con); +extern int sepol_context_from_string(sepol_handle_t * handle, + const char *str, sepol_context_t ** con); -extern int sepol_context_to_string( - sepol_handle_t* handle, - const sepol_context_t* con, - char** str_ptr); +extern int sepol_context_to_string(sepol_handle_t * handle, + const sepol_context_t * con, char **str_ptr); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/debug.h#2 (text+ko) ==== @@ -11,29 +11,24 @@ #define SEPOL_MSG_WARN 2 #define SEPOL_MSG_INFO 3 -extern int sepol_msg_get_level( - sepol_handle_t* handle); +extern int sepol_msg_get_level(sepol_handle_t * handle); -extern const char* sepol_msg_get_channel( - sepol_handle_t* handle); +extern const char *sepol_msg_get_channel(sepol_handle_t * handle); -extern const char* sepol_msg_get_fname( - sepol_handle_t* handle); +extern const char *sepol_msg_get_fname(sepol_handle_t * handle); /* Set the messaging callback. * By the default, the callback will print * the message on standard output, in a * particular format. Passing NULL here * indicates that messaging should be suppressed */ -extern void sepol_msg_set_callback( - sepol_handle_t* handle, +extern void sepol_msg_set_callback(sepol_handle_t * handle, #ifdef __GNUC__ - __attribute__ ((format (printf, 3, 4))) + __attribute__ ((format(printf, 3, 4))) +#endif + void (*msg_callback) (void *varg, + sepol_handle_t * + handle, + const char *fmt, ...), + void *msg_callback_arg); #endif - void (*msg_callback) ( - void* varg, - sepol_handle_t* handle, - const char* fmt, - ...), - void* msg_callback_arg); -#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/iface_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_IFACE_RECORD_H_ -#define _SEPOL_IFACE_RECORD_H_ +#define _SEPOL_IFACE_RECORD_H_ #include #include @@ -10,68 +10,50 @@ typedef struct sepol_iface_key sepol_iface_key_t; /* Key */ -extern int sepol_iface_compare( - const sepol_iface_t* iface, - const sepol_iface_key_t* key); +extern int sepol_iface_compare(const sepol_iface_t * iface, + const sepol_iface_key_t * key); -extern int sepol_iface_compare2( - const sepol_iface_t* iface, - const sepol_iface_t* iface2); +extern int sepol_iface_compare2(const sepol_iface_t * iface, + const sepol_iface_t * iface2); -extern void sepol_iface_key_unpack( - const sepol_iface_key_t* key, - const char** name); +extern void sepol_iface_key_unpack(const sepol_iface_key_t * key, + const char **name); -extern int sepol_iface_key_create( - sepol_handle_t* handle, - const char* name, - sepol_iface_key_t** key_ptr); +extern int sepol_iface_key_create(sepol_handle_t * handle, + const char *name, + sepol_iface_key_t ** key_ptr); -extern int sepol_iface_key_extract( - sepol_handle_t* handle, - const sepol_iface_t* iface, - sepol_iface_key_t** key_ptr); +extern int sepol_iface_key_extract(sepol_handle_t * handle, + const sepol_iface_t * iface, + sepol_iface_key_t ** key_ptr); -extern void sepol_iface_key_free( - sepol_iface_key_t* key); +extern void sepol_iface_key_free(sepol_iface_key_t * key); /* Name */ -extern const char* sepol_iface_get_name( - const sepol_iface_t* iface); +extern const char *sepol_iface_get_name(const sepol_iface_t * iface); -extern int sepol_iface_set_name( - sepol_handle_t* handle, - sepol_iface_t* iface, - const char* name); +extern int sepol_iface_set_name(sepol_handle_t * handle, + sepol_iface_t * iface, const char *name); /* Context */ -extern sepol_context_t* sepol_iface_get_ifcon( - const sepol_iface_t* iface); +extern sepol_context_t *sepol_iface_get_ifcon(const sepol_iface_t * iface); -extern int sepol_iface_set_ifcon( - sepol_handle_t* handle, - sepol_iface_t* iface, - sepol_context_t* con); +extern int sepol_iface_set_ifcon(sepol_handle_t * handle, + sepol_iface_t * iface, sepol_context_t * con); -extern sepol_context_t* sepol_iface_get_msgcon( - const sepol_iface_t* iface); +extern sepol_context_t *sepol_iface_get_msgcon(const sepol_iface_t * iface); -extern int sepol_iface_set_msgcon( - sepol_handle_t* handle, - sepol_iface_t* iface, - sepol_context_t* con); +extern int sepol_iface_set_msgcon(sepol_handle_t * handle, + sepol_iface_t * iface, sepol_context_t * con); /* Create/Clone/Destroy */ -extern int sepol_iface_create( - sepol_handle_t* handle, - sepol_iface_t** iface_ptr); +extern int sepol_iface_create(sepol_handle_t * handle, + sepol_iface_t ** iface_ptr); -extern int sepol_iface_clone( - sepol_handle_t* handle, - const sepol_iface_t* iface, - sepol_iface_t** iface_ptr); +extern int sepol_iface_clone(sepol_handle_t * handle, + const sepol_iface_t * iface, + sepol_iface_t ** iface_ptr); -extern void sepol_iface_free( - sepol_iface_t* iface); +extern void sepol_iface_free(sepol_iface_t * iface); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/interfaces.h#2 (text+ko) ==== @@ -6,33 +6,28 @@ #include /* Return the number of interfaces */ -extern int sepol_iface_count( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - unsigned int* response); +extern int sepol_iface_count(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + unsigned int *response); /* Check if an interface exists */ -extern int sepol_iface_exists( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - int* response); +extern int sepol_iface_exists(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_iface_key_t * key, int *response); /* Query an interface - returns the interface, * or NULL if not found */ -extern int sepol_iface_query( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - sepol_iface_t** response); +extern int sepol_iface_query(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_iface_key_t * key, + sepol_iface_t ** response); /* Modify an interface, or add it, if the key * is not found */ -extern int sepol_iface_modify( - sepol_handle_t* handle, - sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - const sepol_iface_t* data); +extern int sepol_iface_modify(sepol_handle_t * handle, + sepol_policydb_t * policydb, + const sepol_iface_key_t * key, + const sepol_iface_t * data); /* Iterate the interfaces * The handler may return: @@ -40,12 +35,9 @@ * 1 to signal successful exit * 0 to signal continue */ -extern int sepol_iface_iterate( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - int (*fn)( - const sepol_iface_t* iface, - void* fn_arg), - void* arg); +extern int sepol_iface_iterate(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + int (*fn) (const sepol_iface_t * iface, + void *fn_arg), void *arg); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/module.h#2 (text+ko) ==== @@ -6,73 +6,77 @@ #include #include -#include +#include struct sepol_module_package; typedef struct sepol_module_package sepol_module_package_t; /* Module package public interfaces. */ -extern int sepol_module_package_create(sepol_module_package_t **p); +extern int sepol_module_package_create(sepol_module_package_t ** p); + +extern void sepol_module_package_free(sepol_module_package_t * p); + +extern char *sepol_module_package_get_file_contexts(sepol_module_package_t * p); -extern void sepol_module_package_free(sepol_module_package_t *p); +extern size_t sepol_module_package_get_file_contexts_len(sepol_module_package_t + * p); -extern char *sepol_module_package_get_file_contexts(sepol_module_package_t *p); +extern int sepol_module_package_set_file_contexts(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_file_contexts_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_seusers(sepol_module_package_t * p); -extern int sepol_module_package_set_file_contexts(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t sepol_module_package_get_seusers_len(sepol_module_package_t * p); -extern char *sepol_module_package_get_seusers(sepol_module_package_t *p); +extern int sepol_module_package_set_seusers(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_seusers_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_user_extra(sepol_module_package_t * p); -extern int sepol_module_package_set_seusers(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t sepol_module_package_get_user_extra_len(sepol_module_package_t * + p); -extern char *sepol_module_package_get_user_extra(sepol_module_package_t *p); +extern int sepol_module_package_set_user_extra(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_user_extra_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_netfilter_contexts(sepol_module_package_t + * p); -extern int sepol_module_package_set_user_extra(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t +sepol_module_package_get_netfilter_contexts_len(sepol_module_package_t * p); +extern int sepol_module_package_set_netfilter_contexts(sepol_module_package_t * + p, char *data, + size_t len); -extern sepol_policydb_t *sepol_module_package_get_policy(sepol_module_package_t *p); +extern sepol_policydb_t *sepol_module_package_get_policy(sepol_module_package_t + * p); -extern int sepol_link_packages(sepol_handle_t *handle, - sepol_module_package_t *base, - sepol_module_package_t **modules, - int num_modules, - int verbose); +extern int sepol_link_packages(sepol_handle_t * handle, + sepol_module_package_t * base, + sepol_module_package_t ** modules, + int num_modules, int verbose); -extern int sepol_module_package_read(sepol_module_package_t *mod, - struct sepol_policy_file *file, +extern int sepol_module_package_read(sepol_module_package_t * mod, + struct sepol_policy_file *file, int verbose); -extern int sepol_module_package_info(struct sepol_policy_file *file, +extern int sepol_module_package_info(struct sepol_policy_file *file, int *type, char **name, char **version); -extern int sepol_module_package_write(sepol_module_package_t *p, +extern int sepol_module_package_write(sepol_module_package_t * p, struct sepol_policy_file *file); /* Module linking/expanding public interfaces. */ -extern int sepol_link_modules(sepol_handle_t *handle, - sepol_policydb_t *base, - sepol_policydb_t **modules, - size_t len, - int verbose); +extern int sepol_link_modules(sepol_handle_t * handle, + sepol_policydb_t * base, + sepol_policydb_t ** modules, + size_t len, int verbose); -extern int sepol_expand_module(sepol_handle_t *handle, - sepol_policydb_t *base, - sepol_policydb_t *out, - int verbose, - int check); +extern int sepol_expand_module(sepol_handle_t * handle, + sepol_policydb_t * base, + sepol_policydb_t * out, int verbose, int check); #endif - ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/node_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_NODE_RECORD_H_ -#define _SEPOL_NODE_RECORD_H_ +#define _SEPOL_NODE_RECORD_H_ #include #include @@ -14,114 +14,79 @@ #define SEPOL_PROTO_IP6 1 /* Key */ -extern int sepol_node_compare( - const sepol_node_t* node, - const sepol_node_key_t* key); +extern int sepol_node_compare(const sepol_node_t * node, + const sepol_node_key_t * key); -extern int sepol_node_compare2( - const sepol_node_t* node, - const sepol_node_t* node2); +extern int sepol_node_compare2(const sepol_node_t * node, + const sepol_node_t * node2); -extern int sepol_node_key_create( - sepol_handle_t* handle, - const char* addr, - const char* mask, - int proto, - sepol_node_key_t** key_ptr); +extern int sepol_node_key_create(sepol_handle_t * handle, + const char *addr, + const char *mask, + int proto, sepol_node_key_t ** key_ptr); -extern void sepol_node_key_unpack( - const sepol_node_key_t* key, - const char** addr, - const char** mask, - int* proto); +extern void sepol_node_key_unpack(const sepol_node_key_t * key, + const char **addr, + const char **mask, int *proto); -extern int sepol_node_key_extract( - sepol_handle_t* handle, - const sepol_node_t* node, - sepol_node_key_t** key_ptr); +extern int sepol_node_key_extract(sepol_handle_t * handle, + const sepol_node_t * node, + sepol_node_key_t ** key_ptr); -extern void sepol_node_key_free( - sepol_node_key_t* key); +extern void sepol_node_key_free(sepol_node_key_t * key); /* Address */ -extern int sepol_node_get_addr( - sepol_handle_t* handle, - const sepol_node_t* node, - char** addr); +extern int sepol_node_get_addr(sepol_handle_t * handle, + const sepol_node_t * node, char **addr); -extern int sepol_node_get_addr_bytes( - sepol_handle_t* handle, - const sepol_node_t* node, - char** addr, - size_t* addr_sz); +extern int sepol_node_get_addr_bytes(sepol_handle_t * handle, + const sepol_node_t * node, + char **addr, size_t * addr_sz); -extern int sepol_node_set_addr( - sepol_handle_t* handle, - sepol_node_t* node, - int proto, - const char* addr); +extern int sepol_node_set_addr(sepol_handle_t * handle, + sepol_node_t * node, + int proto, const char *addr); -extern int sepol_node_set_addr_bytes( - sepol_handle_t* handle, - sepol_node_t* node, - const char* addr, - size_t addr_sz); +extern int sepol_node_set_addr_bytes(sepol_handle_t * handle, + sepol_node_t * node, + const char *addr, size_t addr_sz); /* Netmask */ -extern int sepol_node_get_mask( - sepol_handle_t* handle, - const sepol_node_t* node, - char** mask); +extern int sepol_node_get_mask(sepol_handle_t * handle, + const sepol_node_t * node, char **mask); -extern int sepol_node_get_mask_bytes( - sepol_handle_t* handle, - const sepol_node_t* node, - char** mask, - size_t* mask_sz); +extern int sepol_node_get_mask_bytes(sepol_handle_t * handle, + const sepol_node_t * node, + char **mask, size_t * mask_sz); -extern int sepol_node_set_mask( - sepol_handle_t* handle, - sepol_node_t* node, - int proto, - const char* mask); +extern int sepol_node_set_mask(sepol_handle_t * handle, + sepol_node_t * node, + int proto, const char *mask); -extern int sepol_node_set_mask_bytes( - sepol_handle_t* handle, - sepol_node_t* node, - const char* mask, - size_t mask_sz); +extern int sepol_node_set_mask_bytes(sepol_handle_t * handle, + sepol_node_t * node, + const char *mask, size_t mask_sz); /* Protocol */ -extern int sepol_node_get_proto( - const sepol_node_t* node); +extern int sepol_node_get_proto(const sepol_node_t * node); -extern void sepol_node_set_proto( - sepol_node_t* node, - int proto); +extern void sepol_node_set_proto(sepol_node_t * node, int proto); -extern const char* sepol_node_get_proto_str( - int proto); +extern const char *sepol_node_get_proto_str(int proto); /* Context */ -extern sepol_context_t* sepol_node_get_con( - const sepol_node_t* node); +extern sepol_context_t *sepol_node_get_con(const sepol_node_t * node); -extern int sepol_node_set_con( - sepol_handle_t* handle, - sepol_node_t* node, - sepol_context_t* con); +extern int sepol_node_set_con(sepol_handle_t * handle, + sepol_node_t * node, sepol_context_t * con); /* Create/Clone/Destroy */ -extern int sepol_node_create( - sepol_handle_t* handle, - sepol_node_t** node_ptr); +extern int sepol_node_create(sepol_handle_t * handle, sepol_node_t ** node_ptr); -extern int sepol_node_clone( >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:28:37 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2EBBD16A4E1 for ; Tue, 15 Aug 2006 18:28:37 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 449AF43D68 for ; Tue, 15 Aug 2006 18:28:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0362646C4B for ; Tue, 15 Aug 2006 14:28:19 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7F7CA58559; Tue, 15 Aug 2006 18:26:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1955116A5EE; Tue, 15 Aug 2006 18:26:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5E8F16A5E5 for ; Tue, 15 Aug 2006 18:26:29 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7082C43D58 for ; Tue, 15 Aug 2006 18:26:26 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIQQLT041752 for ; Tue, 15 Aug 2006 18:26:26 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIQOcI041744 for perforce@freebsd.org; Tue, 15 Aug 2006 18:26:24 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:26:24 GMT Message-Id: <200608151826.k7FIQOcI041744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104088 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:28:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=104088 Change 104088 by millert@millert_macbook on 2006/08/15 18:25:27 Update to libselinux 1.30.22 from sourceforge Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/av_permissions.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/avc.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/flask.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/get_context_list.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/get_default_type.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/selinux.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getfscreatecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/matchpathcon.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/booleans.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/matchpathcon.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/av_inherit.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/av_perm_to_string.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_sidtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_sidtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/booleans.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/canonicalize_context.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/checkAccess.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/check_context.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/class_to_string.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/common_perm_to_string.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compat_file_path.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compute_av.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compute_create.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compute_member.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compute_relabel.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compute_user.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/context.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/context_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/disable.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/enabled.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/fgetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/file_path_suffixes.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/freecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/freeconary.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/fsetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_context_list.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_context_list_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_default_type.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_file_contexts.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getexeccon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getfscreatecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getkeycreatecon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getpeercon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getpidcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getprevcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getprocattrcon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/init.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/is_customizable_type.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/lgetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/load_migscs.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/load_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/lsetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/matchmediacon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/matchpathcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/policyvers.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/query_user_context.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/rpm.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/sedarwin_config.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux.py#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_config.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_netlink.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig.i#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig_wrap.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setexeccon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setfscreatecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setkeycreatecon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setprocattrcon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setrans_client.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setrans_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/seusers.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/trans.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/avcstat.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/compute_av.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/compute_create.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/compute_member.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/compute_relabel.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/compute_user.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getcon.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getconlist.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getpidcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getsebool.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getseuser.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/matchpathcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/policyvers.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/selinuxenabled.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/setenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/setfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/setsebool.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/togglesebool.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,90 @@ +1.30.22 2006-08-03 + * Merged no-tls-direct-seg-refs patch from Jeremy Katz. + +1.30.21 2006-08-03 + * Merged netfilter_contexts support patch from Chris PeBenito. + +1.30.20 2006-08-01 + * Merged context_*_set errno patch from Jim Meyering. + +1.30.19 2006-06-29 + * Lindent. + +1.30.18 2006-06-27 + * Merged {get,set}procattrcon patch set from Eric Paris. + * Merged re-base of keycreate patch originally by Michael LeMay from Eric Paris. + +1.30.17 2006-06-27 + * Regenerated Flask headers from refpolicy. + +1.30.16 2006-06-26 + * Merged patch from Dan Walsh with: + - Added selinux_file_context_{cmp,verify}. + - Added selinux_lsetfilecon_default. + - Delay translation of contexts in matchpathcon. + +1.30.15 2006-06-16 + * Merged patch from Dan Walsh with: + * Added selinux_getpolicytype() function. + * Modified setrans code to skip processing if !mls_enabled. + +1.30.14 2006-06-16 + * Set errno in the !selinux_mnt case. + +1.30.13 2006-06-02 + * Allocate large buffers from the heap, not on stack. + Affects is_context_customizable, selinux_init_load_policy, + and selinux_getenforcemode. + +1.30.12 2006-06-02 + * Merged !selinux_mnt checks from Ian Kent. + +1.30.11 2006-05-24 + * Merged matchmediacon and trans_to_raw_context fixes from + Serge Hallyn. + +1.30.10 2006-05-22 + * Merged simple setrans client cache from Dan Walsh. + Merged avcstat patch from Russell Coker. + +1.30.9 2006-05-22 + * Modified selinux_mkload_policy() to also set /selinux/compat_net + appropriately for the loaded policy. + +1.30.8 2006-05-17 + * Added matchpathcon_fini() function to free memory allocated by + matchpathcon_init(). + +1.30.7 2006-05-16 + * Merged setrans client cleanup patch from Steve Grubb. + +1.30.6 2006-05-08 + * Merged getfscreatecon man page fix from Dan Walsh. + * Updated booleans(8) man page to drop references to the old + booleans file and to note that setsebool can be used to set + the boot-time defaults via -P. + +1.30.5 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.30.4 2006-05-05 + * Merged setrans client support from Dan Walsh. + This removes use of libsetrans. + * Merged patch to eliminate use of PAGE_SIZE constant from Dan Walsh. + * Merged swig typemap fixes from Glauber de Oliveira Costa. + +1.30.3 2006-04-12 + * Added distclean target to Makefile. + * Regenerated swig files. + +1.30.2 2006-04-11 + * Changed matchpathcon_init to verify that the spec file is + a regular file. + * Merged python binding t_output_helper removal patch from Dan Walsh. + +1.30.1 2006-03-20 + * Merged Makefile PYLIBVER definition patch from Dan Walsh. + 1.30 2006-03-14 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/Makefile#2 (text+ko) ==== @@ -17,7 +17,8 @@ relabel: $(MAKE) -C src relabel -clean: - $(MAKE) -C src clean +clean distclean: + $(MAKE) -C src $@ $(MAKE) -C utils clean +test: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30 +1.30.22 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/av_permissions.h#2 (text+ko) ==== @@ -253,6 +253,7 @@ #define TCP_SOCKET__NEWCONN 0x00800000UL #define TCP_SOCKET__ACCEPTFROM 0x01000000UL #define TCP_SOCKET__NODE_BIND 0x02000000UL +#define TCP_SOCKET__NAME_CONNECT 0x04000000UL #define UDP_SOCKET__IOCTL 0x00000001UL #define UDP_SOCKET__READ 0x00000002UL @@ -464,6 +465,9 @@ #define PROCESS__DYNTRANSITION 0x00800000UL #define PROCESS__SETCURRENT 0x01000000UL #define PROCESS__EXECMEM 0x02000000UL +#define PROCESS__EXECSTACK 0x04000000UL +#define PROCESS__EXECHEAP 0x08000000UL +#define PROCESS__SETKEYCREATE 0x10000000UL #define IPC__CREATE 0x00000001UL #define IPC__DESTROY 0x00000002UL @@ -522,6 +526,7 @@ #define SECURITY__SETENFORCE 0x00000080UL #define SECURITY__SETBOOL 0x00000100UL #define SECURITY__SETSECPARAM 0x00000200UL +#define SECURITY__SETCHECKREQPROT 0x00000400UL #define SYSTEM__IPC_INFO 0x00000001UL #define SYSTEM__SYSLOG_READ 0x00000002UL @@ -838,6 +843,8 @@ #define NETLINK_AUDIT_SOCKET__NLMSG_READ 0x00400000UL #define NETLINK_AUDIT_SOCKET__NLMSG_WRITE 0x00800000UL +#define NETLINK_AUDIT_SOCKET__NLMSG_RELAY 0x01000000UL +#define NETLINK_AUDIT_SOCKET__NLMSG_READPRIV 0x02000000UL #define NETLINK_IP6FW_SOCKET__IOCTL 0x00000001UL #define NETLINK_IP6FW_SOCKET__READ 0x00000002UL @@ -902,4 +909,62 @@ #define ASSOCIATION__SENDTO 0x00000001UL #define ASSOCIATION__RECVFROM 0x00000002UL +#define ASSOCIATION__SETCONTEXT 0x00000004UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__IOCTL 0x00000001UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__READ 0x00000002UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__WRITE 0x00000004UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__CREATE 0x00000008UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__GETATTR 0x00000010UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SETATTR 0x00000020UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__LOCK 0x00000040UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RELABELFROM 0x00000080UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RELABELTO 0x00000100UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__APPEND 0x00000200UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__BIND 0x00000400UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__CONNECT 0x00000800UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__LISTEN 0x00001000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__ACCEPT 0x00002000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__GETOPT 0x00004000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SETOPT 0x00008000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SHUTDOWN 0x00010000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RECVFROM 0x00020000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SENDTO 0x00040000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RECV_MSG 0x00080000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SEND_MSG 0x00100000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__NAME_BIND 0x00200000UL + +#define APPLETALK_SOCKET__IOCTL 0x00000001UL +#define APPLETALK_SOCKET__READ 0x00000002UL +#define APPLETALK_SOCKET__WRITE 0x00000004UL +#define APPLETALK_SOCKET__CREATE 0x00000008UL +#define APPLETALK_SOCKET__GETATTR 0x00000010UL +#define APPLETALK_SOCKET__SETATTR 0x00000020UL +#define APPLETALK_SOCKET__LOCK 0x00000040UL +#define APPLETALK_SOCKET__RELABELFROM 0x00000080UL +#define APPLETALK_SOCKET__RELABELTO 0x00000100UL +#define APPLETALK_SOCKET__APPEND 0x00000200UL +#define APPLETALK_SOCKET__BIND 0x00000400UL +#define APPLETALK_SOCKET__CONNECT 0x00000800UL +#define APPLETALK_SOCKET__LISTEN 0x00001000UL +#define APPLETALK_SOCKET__ACCEPT 0x00002000UL +#define APPLETALK_SOCKET__GETOPT 0x00004000UL +#define APPLETALK_SOCKET__SETOPT 0x00008000UL +#define APPLETALK_SOCKET__SHUTDOWN 0x00010000UL +#define APPLETALK_SOCKET__RECVFROM 0x00020000UL +#define APPLETALK_SOCKET__SENDTO 0x00040000UL +#define APPLETALK_SOCKET__RECV_MSG 0x00080000UL +#define APPLETALK_SOCKET__SEND_MSG 0x00100000UL +#define APPLETALK_SOCKET__NAME_BIND 0x00200000UL + +#define PACKET__SEND 0x00000001UL +#define PACKET__RECV 0x00000002UL +#define PACKET__RELABELTO 0x00000004UL + +#define KEY__VIEW 0x00000001UL +#define KEY__READ 0x00000002UL +#define KEY__WRITE 0x00000004UL +#define KEY__SEARCH 0x00000008UL +#define KEY__LINK 0x00000010UL +#define KEY__SETATTR 0x00000020UL +#define KEY__CREATE 0x00000040UL ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/avc.h#2 (text+ko) ==== @@ -12,20 +12,19 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* * SID format and operations */ -struct security_id { - security_context_t ctx; - unsigned int refcnt; -}; -typedef struct security_id *security_id_t; + struct security_id { + security_context_t ctx; + unsigned int refcnt; + }; + typedef struct security_id *security_id_t; -#define SECSID_WILD (security_id_t)NULL /* unspecified SID */ +#define SECSID_WILD (security_id_t)NULL /* unspecified SID */ /** * avc_sid_to_context - get copy of context corresponding to SID. @@ -38,7 +37,7 @@ * failure, with @errno set to %ENOMEM if insufficient memory was * available to make the copy, or %EINVAL if the input SID is invalid. */ -int avc_sid_to_context(security_id_t sid, security_context_t *ctx); + int avc_sid_to_context(security_id_t sid, security_context_t * ctx); /** * avc_context_to_sid - get SID for context. @@ -51,7 +50,7 @@ * to the SID structure into the memory referenced by @sid, * returning %0 on success or -%1 on error with @errno set. */ -int avc_context_to_sid(security_context_t ctx, security_id_t *sid); + int avc_context_to_sid(security_context_t ctx, security_id_t * sid); /** * sidget - increment SID reference counter. @@ -63,7 +62,7 @@ * reference count). Note that avc_context_to_sid() also * increments reference counts. */ -int sidget(security_id_t sid); + int sidget(security_id_t sid); /** * sidput - decrement SID reference counter. @@ -75,16 +74,15 @@ * zero, the SID is invalid, and avc_context_to_sid() must * be called to obtain a new SID for the security context. */ -int sidput(security_id_t sid); - + int sidput(security_id_t sid); /* * AVC entry */ -struct avc_entry; -struct avc_entry_ref { - struct avc_entry *ae; -}; + struct avc_entry; + struct avc_entry_ref { + struct avc_entry *ae; + }; /** * avc_entry_ref_init - initialize an AVC entry reference. @@ -108,43 +106,42 @@ * listening thread won't be started for kernel policy change messages. * If no locking callbacks are passed, no locking will take place. */ -struct avc_memory_callback { - /* malloc() equivalent. */ - void *(*func_malloc)(size_t size); - /* free() equivalent. */ - void (*func_free) (void *ptr); - /* Note that these functions should set errno on failure. - If not, some avc routines may return -1 without errno set. */ -}; + struct avc_memory_callback { + /* malloc() equivalent. */ + void *(*func_malloc) (size_t size); + /* free() equivalent. */ + void (*func_free) (void *ptr); + /* Note that these functions should set errno on failure. + If not, some avc routines may return -1 without errno set. */ + }; -struct avc_log_callback { - /* log the printf-style format and arguments. */ - void (*func_log)(const char *fmt, ...); - /* store a string representation of auditdata (corresponding - to the given security class) into msgbuf. */ - void (*func_audit)(void *auditdata, security_class_t class, - char *msgbuf, size_t msgbufsize); -}; + struct avc_log_callback { + /* log the printf-style format and arguments. */ + void (*func_log) (const char *fmt, ...); + /* store a string representation of auditdata (corresponding + to the given security class) into msgbuf. */ + void (*func_audit) (void *auditdata, security_class_t class, + char *msgbuf, size_t msgbufsize); + }; -struct avc_thread_callback { - /* create and start a thread, returning an opaque pointer to it; - the thread should run the given function. */ - void *(*func_create_thread)(void (*run)(void)); - /* cancel a given thread and free its resources. */ - void (*func_stop_thread)(void *thread); -}; + struct avc_thread_callback { + /* create and start a thread, returning an opaque pointer to it; + the thread should run the given function. */ + void *(*func_create_thread) (void (*run) (void)); + /* cancel a given thread and free its resources. */ + void (*func_stop_thread) (void *thread); + }; -struct avc_lock_callback { - /* create a lock and return an opaque pointer to it. */ - void *(*func_alloc_lock)(void); - /* obtain a given lock, blocking if necessary. */ - void (*func_get_lock)(void *lock); - /* release a given lock. */ - void (*func_release_lock)(void *lock); - /* destroy a given lock (free memory, etc.) */ - void (*func_free_lock)(void *lock); -}; - + struct avc_lock_callback { + /* create a lock and return an opaque pointer to it. */ + void *(*func_alloc_lock) (void); + /* obtain a given lock, blocking if necessary. */ + void (*func_get_lock) (void *lock); + /* release a given lock. */ + void (*func_release_lock) (void *lock); + /* destroy a given lock (free memory, etc.) */ + void (*func_free_lock) (void *lock); + }; /* * AVC operations @@ -165,11 +162,11 @@ * for those callbacks (see the definition of the callback * structures above). */ -int avc_init(const char *msgprefix, - const struct avc_memory_callback *mem_callbacks, - const struct avc_log_callback *log_callbacks, - const struct avc_thread_callback *thread_callbacks, - const struct avc_lock_callback *lock_callbacks); + int avc_init(const char *msgprefix, + const struct avc_memory_callback *mem_callbacks, + const struct avc_log_callback *log_callbacks, + const struct avc_thread_callback *thread_callbacks, + const struct avc_lock_callback *lock_callbacks); /** * avc_cleanup - Remove unused SIDs and AVC entries. @@ -179,7 +176,7 @@ * AVC entries that reference them. This can be used * to return memory to the system. */ -void avc_cleanup(void); + void avc_cleanup(void); /** * avc_reset - Flush the cache and reset statistics. @@ -189,7 +186,7 @@ * The SID mapping is not affected. Return %0 on success, * -%1 with @errno set on error. */ -int avc_reset(void); + int avc_reset(void); /** * avc_destroy - Free all AVC structures. @@ -200,7 +197,7 @@ * callbacks will not. All SID's will be invalidated. * User must call avc_init() if further use of AVC is desired. */ -void avc_destroy(void); + void avc_destroy(void); /** * avc_has_perm_noaudit - Check permissions but perform no auditing. @@ -223,12 +220,12 @@ * auditing, e.g. in cases where a lock must be held for the check but * should be released for the auditing. */ -int avc_has_perm_noaudit(security_id_t ssid, - security_id_t tsid, - security_class_t tclass, - access_vector_t requested, - struct avc_entry_ref *aeref, - struct av_decision *avd); + int avc_has_perm_noaudit(security_id_t ssid, + security_id_t tsid, + security_class_t tclass, + access_vector_t requested, + struct avc_entry_ref *aeref, + struct av_decision *avd); /** * avc_has_perm - Check permissions and perform any appropriate auditing. @@ -248,9 +245,9 @@ * permissions are granted, -%1 with @errno set to %EACCES if any permissions * are denied or to another value upon other errors. */ -int avc_has_perm(security_id_t ssid, security_id_t tsid, - security_class_t tclass, access_vector_t requested, - struct avc_entry_ref *aeref, void *auditdata); + int avc_has_perm(security_id_t ssid, security_id_t tsid, + security_class_t tclass, access_vector_t requested, + struct avc_entry_ref *aeref, void *auditdata); /** * avc_audit - Audit the granting or denial of permissions. @@ -271,11 +268,9 @@ * be performed under a lock, to allow the lock to be released * before calling the auditing code. */ -void avc_audit(security_id_t ssid, security_id_t tsid, - security_class_t tclass, access_vector_t requested, - struct av_decision *avd, int result, void *auditdata); - - + void avc_audit(security_id_t ssid, security_id_t tsid, + security_class_t tclass, access_vector_t requested, + struct av_decision *avd, int result, void *auditdata); /* * security event callback facility @@ -306,16 +301,14 @@ * @perms based on @tclass. Returns %0 on success or * -%1 if insufficient memory exists to add the callback. */ -int avc_add_callback(int (*callback)(u_int32_t event, security_id_t ssid, - security_id_t tsid, - security_class_t tclass, - access_vector_t perms, - access_vector_t *out_retained), - u_int32_t events, security_id_t ssid, - security_id_t tsid, - security_class_t tclass, access_vector_t perms); - - + int avc_add_callback(int (*callback) + (u_int32_t event, security_id_t ssid, + security_id_t tsid, security_class_t tclass, + access_vector_t perms, + access_vector_t * out_retained), + u_int32_t events, security_id_t ssid, + security_id_t tsid, security_class_t tclass, + access_vector_t perms); /* * AVC statistics @@ -326,16 +319,16 @@ */ #define AVC_CACHE_STATS 1 -struct avc_cache_stats { - unsigned entry_lookups; - unsigned entry_hits; - unsigned entry_misses; - unsigned entry_discards; - unsigned cav_lookups; - unsigned cav_hits; - unsigned cav_probes; - unsigned cav_misses; -}; + struct avc_cache_stats { + unsigned entry_lookups; + unsigned entry_hits; + unsigned entry_misses; + unsigned entry_discards; + unsigned cav_lookups; + unsigned cav_hits; + unsigned cav_probes; + unsigned cav_misses; + }; /** * avc_cache_stats - get cache access statistics. @@ -346,7 +339,7 @@ * avc_reset(). See the structure definition for * details. */ -void avc_cache_stats(struct avc_cache_stats *stats); + void avc_cache_stats(struct avc_cache_stats *stats); /** * avc_av_stats - log av table statistics. @@ -355,7 +348,7 @@ * distribution of the access vector table. The audit * callback is used to print the message. */ -void avc_av_stats(void); + void avc_av_stats(void); /** * avc_sid_stats - log SID table statistics. @@ -364,10 +357,9 @@ * distribution of the SID table. The audit callback * is used to print the message. */ -void avc_sid_stats(void); + void avc_sid_stats(void); #ifdef __cplusplus } #endif - -#endif /* _SELINUX_AVC_H_ */ +#endif /* _SELINUX_AVC_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/context.h#2 (text+ko) ==== @@ -2,23 +2,22 @@ #define _SELINUX_CONTEXT_H_ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* * Functions to deal with security contexts in user space. */ -typedef struct { - void * ptr; -} context_s_t; + typedef struct { + void *ptr; + } context_s_t; -typedef context_s_t *context_t; + typedef context_s_t *context_t; /* Return a new context initialized to a context string */ -extern context_t context_new(const char *); + extern context_t context_new(const char *); /* * Return a pointer to the string value of the context_t @@ -26,27 +25,26 @@ * for the same context_t* */ -extern char* context_str(context_t); + extern char *context_str(context_t); /* Free the storage used by a context */ -extern void context_free(context_t); + extern void context_free(context_t); /* Get a pointer to the string value of a context component */ -extern const char* context_type_get(context_t); -extern const char* context_range_get(context_t); -extern const char* context_role_get(context_t); -extern const char* context_user_get(context_t); + extern const char *context_type_get(context_t); + extern const char *context_range_get(context_t); + extern const char *context_role_get(context_t); + extern const char *context_user_get(context_t); /* Set a context component. Returns nonzero if unsuccessful */ -extern int context_type_set(context_t,const char*); -extern int context_range_set(context_t,const char*); -extern int context_role_set(context_t,const char*); -extern int context_user_set(context_t,const char*); + extern int context_type_set(context_t, const char *); + extern int context_range_set(context_t, const char *); + extern int context_role_set(context_t, const char *); + extern int context_user_set(context_t, const char *); #ifdef __cplusplus } #endif - #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/flask.h#2 (text+ko) ==== @@ -59,6 +59,10 @@ #define SECCLASS_DBUS 52 #define SECCLASS_NSCD 53 #define SECCLASS_ASSOCIATION 54 +#define SECCLASS_NETLINK_KOBJECT_UEVENT_SOCKET 55 +#define SECCLASS_APPLETALK_SOCKET 56 +#define SECCLASS_PACKET 57 +#define SECCLASS_KEY 58 /* * Security identifier indices for initial entities ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/get_context_list.h#2 (text+ko) ==== @@ -4,8 +4,7 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #define SELINUX_DEFAULTUSER "user_u" @@ -17,16 +16,16 @@ customizable preferences. Returns number of entries in *conary. If 'fromcon' is NULL, defaults to current context. Caller must free via freeconary. */ -extern int get_ordered_context_list(const char *user, - security_context_t fromcon, - security_context_t **list); + extern int get_ordered_context_list(const char *user, + security_context_t fromcon, + security_context_t ** list); /* As above, but use the provided MLS level rather than the default level for the user. */ -int get_ordered_context_list_with_level (const char *user, - const char *level, - security_context_t fromcon, - security_context_t **list); + int get_ordered_context_list_with_level(const char *user, + const char *level, + security_context_t fromcon, + security_context_t ** list); /* Get the default security context for a user session for 'user' spawned by 'fromcon' and set *newcon to refer to it. The context @@ -35,50 +34,49 @@ If 'fromcon' is NULL, defaults to current context. Returns 0 on success or -1 otherwise. Caller must free via freecon. */ -extern int get_default_context(const char* user, - security_context_t fromcon, - security_context_t *newcon); + extern int get_default_context(const char *user, + security_context_t fromcon, + security_context_t * newcon); /* As above, but use the provided MLS level rather than the default level for the user. */ -int get_default_context_with_level(const char *user, - const char *level, - security_context_t fromcon, - security_context_t *newcon); + int get_default_context_with_level(const char *user, + const char *level, + security_context_t fromcon, + security_context_t * newcon); /* Same as get_default_context, but only return a context that has the specified role. If no reachable context exists for the user with that role, then return -1. */ -int get_default_context_with_role(const char* user, - const char *role, - security_context_t fromcon, - security_context_t *newcon); + int get_default_context_with_role(const char *user, + const char *role, + security_context_t fromcon, + security_context_t * newcon); /* Same as get_default_context, but only return a context that has the specified role and level. If no reachable context exists for the user with that role, then return -1. */ -int get_default_context_with_rolelevel(const char* user, - const char *level, - const char *role, - security_context_t fromcon, - security_context_t *newcon); + int get_default_context_with_rolelevel(const char *user, + const char *level, + const char *role, + security_context_t fromcon, + security_context_t * newcon); /* Given a list of authorized security contexts for the user, query the user to select one and set *newcon to refer to it. Caller must free via freecon. Returns 0 on sucess or -1 otherwise. */ -extern int query_user_context(security_context_t *list, - security_context_t *newcon); + extern int query_user_context(security_context_t * list, + security_context_t * newcon); /* Allow the user to manually enter a context as a fallback if a list of authorized contexts could not be obtained. Caller must free via freecon. Returns 0 on success or -1 otherwise. */ -extern int manual_user_enter_context(const char *user, - security_context_t *newcon); + extern int manual_user_enter_context(const char *user, + security_context_t * newcon); #ifdef __cplusplus } #endif - #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/get_default_type.h#2 (text+ko) ==== @@ -6,20 +6,18 @@ #define _SELINUX_GET_DEFAULT_TYPE_H_ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Return path to default type file. */ -const char *selinux_default_type_path(void); + const char *selinux_default_type_path(void); /* Get the default type (domain) for 'role' and set 'type' to refer to it. Caller must free via free(). Return 0 on success or -1 otherwise. */ -int get_default_type (const char* role, char** type); + int get_default_type(const char *role, char **type); #ifdef __cplusplus } #endif - -#endif /* ifndef _GET_DEFAULT_TYPE_H_ */ +#endif /* ifndef _GET_DEFAULT_TYPE_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/selinux.h#2 (text+ko) ==== @@ -5,29 +5,28 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Return 1 if we are running on a SELinux kernel, or 0 if not or -1 if we get an error. */ -extern int is_selinux_enabled(void); + extern int is_selinux_enabled(void); /* Return 1 if we are running on a SELinux MLS kernel, or 0 otherwise. */ -extern int is_selinux_mls_enabled(void); + extern int is_selinux_mls_enabled(void); -typedef char* security_context_t; + typedef char *security_context_t; /* Free the memory allocated for a context by any of the below get* calls. */ -extern void freecon(security_context_t con); + extern void freecon(security_context_t con); /* Free the memory allocated for a context array by security_compute_user. */ -extern void freeconary(security_context_t *con); + extern void freeconary(security_context_t * con); /* Wrappers for the /proc/pid/attr API. */ /* Get current context, and set *con to refer to it. Caller must free via freecon. */ -extern int getcon(security_context_t *con); -extern int getcon_raw(security_context_t *con); + extern int getcon(security_context_t * con); + extern int getcon_raw(security_context_t * con); /* Set the current security context to con. Note that use of this function requires that the entire application @@ -37,142 +36,151 @@ instead. Note that the application may lose access to its open descriptors as a result of a setcon() unless policy allows it to use descriptors opened by the old context. */ -extern int setcon(security_context_t con); -extern int setcon_raw(security_context_t con); + extern int setcon(security_context_t con); + extern int setcon_raw(security_context_t con); /* Get context of process identified by pid, and set *con to refer to it. Caller must free via freecon. This has not been ported to SEBSD yet. */ -//extern int getpidcon(pid_t pid, security_context_t *con); -//extern int getpidcon_raw(pid_t pid, security_context_t *con); +// extern int getpidcon(pid_t pid, security_context_t * con); +// extern int getpidcon_raw(pid_t pid, security_context_t * con); /* Get previous context (prior to last exec), and set *con to refer to it. - Caller must free via freecon. + Caller must free via freecon. This has not been ported to SEBSD yet.*/ -//extern int getprevcon(security_context_t *con); -//extern int getprevcon_raw(security_context_t *con); +// extern int getprevcon(security_context_t * con); +// extern int getprevcon_raw(security_context_t * con); /* Get exec context, and set *con to refer to it. Sets *con to NULL if no exec context has been set, i.e. using default. If non-NULL, caller must free via freecon. */ -extern int getexeccon(security_context_t *con); -extern int getexeccon_raw(security_context_t *con); + extern int getexeccon(security_context_t * con); + extern int getexeccon_raw(security_context_t * con); /* Set exec security context for the next execve. - Call with NULL if you want to reset to the default. + Call with NULL if you want to reset to the default. This is not yet supported by SEBSD. */ -//extern int setexeccon(security_context_t con); -//extern int setexeccon_raw(security_context_t con); +// extern int setexeccon(security_context_t con); +// extern int setexeccon_raw(security_context_t con); /* Get fscreate context, and set *con to refer to it. Sets *con to NULL if no fs create context has been set, i.e. using default. - If non-NULL, caller must free via freecon. + If non-NULL, caller must free via freecon. This has not been ported to SEBSD yet. */ -//extern int getfscreatecon(security_context_t *con); -//extern int getfscreatecon_raw(security_context_t *con); +// extern int getfscreatecon(security_context_t * con); +// extern int getfscreatecon_raw(security_context_t * con); /* Set the fscreate security context for subsequent file creations. - Call with NULL if you want to reset to the default. + Call with NULL if you want to reset to the default. This has not been ported to SEBSD yet. */ -//extern int setfscreatecon(security_context_t context); -//extern int setfscreatecon_raw(security_context_t context); +// extern int setfscreatecon(security_context_t context); +// extern int setfscreatecon_raw(security_context_t context); + +/* Get keycreate context, and set *con to refer to it. + Sets *con to NULL if no key create context has been set, i.e. using default. + If non-NULL, caller must free via freecon. */ + extern int getkeycreatecon(security_context_t * con); + extern int getkeycreatecon_raw(security_context_t * con); +/* Set the keycreate security context for subsequent key creations. + Call with NULL if you want to reset to the default. */ + extern int setkeycreatecon(security_context_t context); + extern int setkeycreatecon_raw(security_context_t context); /* Wrappers for the xattr API. */ /* Get file context, and set *con to refer to it. Caller must free via freecon. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:36:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A01516A4E7 for ; Tue, 15 Aug 2006 18:36:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86F3943D5D for ; Tue, 15 Aug 2006 18:36:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 765FC46C5E for ; Tue, 15 Aug 2006 14:36:15 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 13E765CD68; Tue, 15 Aug 2006 18:34:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 10F3216A4E0; Tue, 15 Aug 2006 18:34:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB54116A4DD for ; Tue, 15 Aug 2006 18:34:01 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 135CA43D95 for ; Tue, 15 Aug 2006 18:33:45 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIXiwN043189 for ; Tue, 15 Aug 2006 18:33:44 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIXbo9043172 for perforce@freebsd.org; Tue, 15 Aug 2006 18:33:37 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:33:37 GMT Message-Id: <200608151833.k7FIXbo9043172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104091 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:36:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=104091 Change 104091 by millert@millert_macbook on 2006/08/15 18:33:03 Update to libsemanage 1.6.13 from sourceforge Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/boolean_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_active.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/context_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/debug.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontext_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontexts_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontexts_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/handle.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/iface_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/interfaces_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/interfaces_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/modules.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/node_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/nodes_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/nodes_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/port_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/ports_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/ports_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/seuser_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/seusers_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/seusers_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/user_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/users_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/users_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_count_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_exists_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_iterate_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_list_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_query_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_set_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_count.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_del.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_exists.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iterate.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_list.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_modify.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_query.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/boolean_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/boolean_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_active.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_activedb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-parse.y#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-scan.l#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/context_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/context_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_activedb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_activedb.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_file.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_join.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_join.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_llist.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_llist.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_policydb.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/debug.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/debug.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/direct_api.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/direct_api.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/fcontext_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/fcontext_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/fcontexts_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/fcontexts_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/fcontexts_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/handle.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/handle.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/handle_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/iface_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/iface_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/interfaces_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/interfaces_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/interfaces_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/interfaces_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/module_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/modules.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/modules.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/node_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/node_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/nodes_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/nodes_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/nodes_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/nodes_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/parse_utils.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/parse_utils.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/policy_components.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/port_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/port_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/ports_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/ports_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/ports_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/ports_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/private.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage.py#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_conf.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_store.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_store.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanageswig_python.i#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanageswig_wrap.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/seuser_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/seuser_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/seusers_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/seusers_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/seusers_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/user_base_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/user_extra_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/user_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/user_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_base_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_base_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_extra_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_join.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/README#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/libsemanage-tests.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/nc_sort_malformed#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/nc_sort_sorted#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/nc_sort_unsorted#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/test_semanage_store.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/test_semanage_store.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/utilities.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/utilities.h#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,55 @@ +1.6.13 2006-08-03 + * Merged netfilter contexts support from Chris PeBenito. + +1.6.12 2006-07-11 + * Merged support for read operations on read-only fs from + Caleb Case (Tresys Technology). + +1.6.11 2006-06-29 + * Lindent. + +1.6.10 2006-06-26 + * Merged setfiles location check patch from Dan Walsh. + +1.6.9 2006-06-16 + * Merged several fixes from Serge Hallyn: + dbase_file_cache: deref of uninit data on error path. + dbase_policydb_cache: clear fp to avoid double fclose + semanage_fc_sort: destroy temp on error paths + +1.6.8 2006-06-02 + * Updated default location for setfiles to /sbin to + match policycoreutils. This can also be adjusted via + semanage.conf using the syntax: + [setfiles] + path = /path/to/setfiles + args = -q -c $@ $< + [end] + +1.6.7 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.6.6 2006-04-14 + * Merged updated file context sorting patch from Christopher + Ashworth, with bug fix for escaped character flag. + +1.6.5 2006-04-13 + * Merged file context sorting code from Christopher Ashworth + (Tresys Technology), based on fc_sort.c code in refpolicy. + +1.6.4 2006-04-12 + * Merged python binding t_output_helper removal patch from Dan Walsh. + * Regenerated swig files. + +1.6.3 2006-03-30 + * Merged corrected fix for descriptor leak from Dan Walsh. + +1.6.2 2006-03-20 + * Merged Makefile PYLIBVER definition patch from Dan Walsh. + +1.6.1 2006-03-20 + * Merged man page reorganization from Ivan Gyurdiev. + 1.6 2006-03-14 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/Makefile#2 (text+ko) ==== @@ -17,4 +17,6 @@ clean distclean: $(MAKE) -C src $@ + $(MAKE) -C tests $@ +test: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.6 +1.6.13 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/boolean_record.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ #include #ifndef _SEMANAGE_BOOL_DEFINED_ -struct semanage_bool; +struct semanage_bool; struct semanage_bool_key; typedef struct semanage_bool semanage_bool_t; typedef struct semanage_bool_key semanage_bool_key_t; @@ -14,55 +14,41 @@ #endif /* Key */ -extern int semanage_bool_key_create( - semanage_handle_t* handle, - const char* name, - semanage_bool_key_t** key); +extern int semanage_bool_key_create(semanage_handle_t * handle, + const char *name, + semanage_bool_key_t ** key); + +extern int semanage_bool_key_extract(semanage_handle_t * handle, + const semanage_bool_t * boolean, + semanage_bool_key_t ** key); -extern int semanage_bool_key_extract( - semanage_handle_t* handle, - const semanage_bool_t* boolean, - semanage_bool_key_t** key); +extern void semanage_bool_key_free(semanage_bool_key_t * key); -extern void semanage_bool_key_free( - semanage_bool_key_t* key); +extern int semanage_bool_compare(const semanage_bool_t * boolean, + const semanage_bool_key_t * key); -extern int semanage_bool_compare( - const semanage_bool_t* boolean, - const semanage_bool_key_t* key); +extern int semanage_bool_compare2(const semanage_bool_t * boolean, + const semanage_bool_t * boolean2); -extern int semanage_bool_compare2( - const semanage_bool_t* boolean, - const semanage_bool_t* boolean2); - /* Name */ -extern const char* semanage_bool_get_name( - const semanage_bool_t* boolean); +extern const char *semanage_bool_get_name(const semanage_bool_t * boolean); -extern int semanage_bool_set_name( - semanage_handle_t* handle, - semanage_bool_t* boolean, - const char* name); +extern int semanage_bool_set_name(semanage_handle_t * handle, + semanage_bool_t * boolean, const char *name); /* Value */ -extern int semanage_bool_get_value( - const semanage_bool_t* boolean); +extern int semanage_bool_get_value(const semanage_bool_t * boolean); -extern void semanage_bool_set_value( - semanage_bool_t* boolean, - int value); +extern void semanage_bool_set_value(semanage_bool_t * boolean, int value); /* Create/Clone/Destroy */ -extern int semanage_bool_create( - semanage_handle_t* handle, - semanage_bool_t** bool_ptr); +extern int semanage_bool_create(semanage_handle_t * handle, + semanage_bool_t ** bool_ptr); -extern int semanage_bool_clone( - semanage_handle_t* handle, - const semanage_bool_t* boolean, - semanage_bool_t** bool_ptr); +extern int semanage_bool_clone(semanage_handle_t * handle, + const semanage_bool_t * boolean, + semanage_bool_t ** bool_ptr); -extern void semanage_bool_free( - semanage_bool_t* boolean); +extern void semanage_bool_free(semanage_bool_t * boolean); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_active.h#2 (text+ko) ==== @@ -6,35 +6,28 @@ #include #include -extern int semanage_bool_set_active( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - const semanage_bool_t* data); +extern int semanage_bool_set_active(semanage_handle_t * handle, + const semanage_bool_key_t * key, + const semanage_bool_t * data); -extern int semanage_bool_query_active( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - semanage_bool_t** response); +extern int semanage_bool_query_active(semanage_handle_t * handle, + const semanage_bool_key_t * key, + semanage_bool_t ** response); -extern int semanage_bool_exists_active( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - int* response); +extern int semanage_bool_exists_active(semanage_handle_t * handle, + const semanage_bool_key_t * key, + int *response); -extern int semanage_bool_count_active( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_bool_count_active(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_bool_iterate_active( - semanage_handle_t* handle, - int (*handler) ( - const semanage_bool_t* record, - void* varg), - void* handler_arg); +extern int semanage_bool_iterate_active(semanage_handle_t * handle, + int (*handler) (const semanage_bool_t * + record, void *varg), + void *handler_arg); -extern int semanage_bool_list_active( - semanage_handle_t* handle, - semanage_bool_t*** records, - unsigned int* count); +extern int semanage_bool_list_active(semanage_handle_t * handle, + semanage_bool_t *** records, + unsigned int *count); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_local.h#2 (text+ko) ==== @@ -6,39 +6,31 @@ #include #include -extern int semanage_bool_modify_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - const semanage_bool_t* data); +extern int semanage_bool_modify_local(semanage_handle_t * handle, + const semanage_bool_key_t * key, + const semanage_bool_t * data); -extern int semanage_bool_del_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key); +extern int semanage_bool_del_local(semanage_handle_t * handle, + const semanage_bool_key_t * key); -extern int semanage_bool_query_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - semanage_bool_t** response); +extern int semanage_bool_query_local(semanage_handle_t * handle, + const semanage_bool_key_t * key, + semanage_bool_t ** response); -extern int semanage_bool_exists_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - int* response); +extern int semanage_bool_exists_local(semanage_handle_t * handle, + const semanage_bool_key_t * key, + int *response); -extern int semanage_bool_count_local( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_bool_count_local(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_bool_iterate_local( - semanage_handle_t* handle, - int (*handler) ( - const semanage_bool_t* record, - void* varg), - void* handler_arg); +extern int semanage_bool_iterate_local(semanage_handle_t * handle, + int (*handler) (const semanage_bool_t * + record, void *varg), + void *handler_arg); -extern int semanage_bool_list_local( - semanage_handle_t* handle, - semanage_bool_t*** records, - unsigned int* count); +extern int semanage_bool_list_local(semanage_handle_t * handle, + semanage_bool_t *** records, + unsigned int *count); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_policy.h#2 (text+ko) ==== @@ -3,33 +3,25 @@ #ifndef _SEMANAGE_BOOLEANS_POLICY_H_ #define _SEMANAGE_BOOLEANS_POLICY_H_ -#include +#include #include -extern int semanage_bool_query( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - semanage_bool_t** response); +extern int semanage_bool_query(semanage_handle_t * handle, + const semanage_bool_key_t * key, + semanage_bool_t ** response); -extern int semanage_bool_exists( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - int* response); +extern int semanage_bool_exists(semanage_handle_t * handle, + const semanage_bool_key_t * key, int *response); -extern int semanage_bool_count( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_bool_count(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_bool_iterate( - semanage_handle_t* handle, - int (*handler) ( - const semanage_bool_t* record, - void* varg), - void* handler_arg); +extern int semanage_bool_iterate(semanage_handle_t * handle, + int (*handler) (const semanage_bool_t * record, + void *varg), + void *handler_arg); -extern int semanage_bool_list( - semanage_handle_t* handle, - semanage_bool_t*** records, - unsigned int* count); +extern int semanage_bool_list(semanage_handle_t * handle, + semanage_bool_t *** records, unsigned int *count); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/context_record.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* Copyright (C) 2005 Red Hat, Inc. */ #ifndef _SEMANAGE_CONTEXT_RECORD_H_ -#define _SEMANAGE_CONTEXT_RECORD_H_ +#define _SEMANAGE_CONTEXT_RECORD_H_ #include @@ -12,63 +12,50 @@ #endif /* User */ -extern const char* semanage_context_get_user( - const semanage_context_t* con); +extern const char *semanage_context_get_user(const semanage_context_t * con); -extern int semanage_context_set_user( - semanage_handle_t* handle, - semanage_context_t* con, - const char* user); +extern int semanage_context_set_user(semanage_handle_t * handle, + semanage_context_t * con, + const char *user); /* Role */ -extern const char* semanage_context_get_role( - const semanage_context_t* con); +extern const char *semanage_context_get_role(const semanage_context_t * con); -extern int semanage_context_set_role( - semanage_handle_t* handle, - semanage_context_t* con, - const char* role); +extern int semanage_context_set_role(semanage_handle_t * handle, + semanage_context_t * con, + const char *role); /* Type */ -extern const char* semanage_context_get_type( - const semanage_context_t* con); +extern const char *semanage_context_get_type(const semanage_context_t * con); -extern int semanage_context_set_type( - semanage_handle_t* handle, - semanage_context_t* con, - const char* type); +extern int semanage_context_set_type(semanage_handle_t * handle, + semanage_context_t * con, + const char *type); /* MLS */ -extern const char* semanage_context_get_mls( - const semanage_context_t* con); +extern const char *semanage_context_get_mls(const semanage_context_t * con); -extern int semanage_context_set_mls( - semanage_handle_t* handle, - semanage_context_t* con, - const char* mls_range); +extern int semanage_context_set_mls(semanage_handle_t * handle, + semanage_context_t * con, + const char *mls_range); /* Create/Clone/Destroy */ -extern int semanage_context_create( - semanage_handle_t* handle, - semanage_context_t** con_ptr); +extern int semanage_context_create(semanage_handle_t * handle, + semanage_context_t ** con_ptr); + +extern int semanage_context_clone(semanage_handle_t * handle, + const semanage_context_t * con, + semanage_context_t ** con_ptr); -extern int semanage_context_clone( - semanage_handle_t* handle, - const semanage_context_t* con, - semanage_context_t** con_ptr); +extern void semanage_context_free(semanage_context_t * con); -extern void semanage_context_free( - semanage_context_t* con); - /* Parse to/from string */ -extern int semanage_context_from_string( - semanage_handle_t* handle, - const char* str, - semanage_context_t** con); +extern int semanage_context_from_string(semanage_handle_t * handle, + const char *str, + semanage_context_t ** con); -extern int semanage_context_to_string( - semanage_handle_t* handle, - const semanage_context_t* con, - char** str_ptr); +extern int semanage_context_to_string(semanage_handle_t * handle, + const semanage_context_t * con, + char **str_ptr); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/debug.h#2 (text+ko) ==== @@ -29,30 +29,26 @@ #define SEMANAGE_MSG_WARN 2 #define SEMANAGE_MSG_INFO 3 -extern int semanage_msg_get_level( - semanage_handle_t* handle); +extern int semanage_msg_get_level(semanage_handle_t * handle); -extern const char* semanage_msg_get_channel( - semanage_handle_t* handle); +extern const char *semanage_msg_get_channel(semanage_handle_t * handle); -extern const char* semanage_msg_get_fname( - semanage_handle_t* handle); +extern const char *semanage_msg_get_fname(semanage_handle_t * handle); /* Set the messaging callback. * By the default, the callback will print * the message on standard output, in a * particular format. Passing NULL here * indicates that messaging should be suppressed */ -extern void semanage_msg_set_callback( - semanage_handle_t* handle, +extern void semanage_msg_set_callback(semanage_handle_t * handle, #ifdef __GNUC__ - __attribute__ ((format (printf, 3, 4))) + __attribute__ ((format(printf, 3, 4))) #endif - void (*msg_callback) ( - void* varg, - semanage_handle_t* handle, - const char* fmt, - ...), - void* msg_callback_arg); + void (*msg_callback) (void *varg, + semanage_handle_t * + handle, + const char *fmt, + ...), + void *msg_callback_arg); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontext_record.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* Copyright (C) 2005 Red Hat, Inc. */ #ifndef _SEMANAGE_FCONTEXT_RECORD_H_ -#define _SEMANAGE_FCONTEXT_RECORD_H_ +#define _SEMANAGE_FCONTEXT_RECORD_H_ #include #include @@ -15,36 +15,30 @@ #endif /* Key */ -extern int semanage_fcontext_compare( - const semanage_fcontext_t* fcontext, - const semanage_fcontext_key_t* key); +extern int semanage_fcontext_compare(const semanage_fcontext_t * fcontext, + const semanage_fcontext_key_t * key); -extern int semanage_fcontext_compare2( - const semanage_fcontext_t* fcontext, - const semanage_fcontext_t* fcontext2); +extern int semanage_fcontext_compare2(const semanage_fcontext_t * fcontext, + const semanage_fcontext_t * fcontext2); -extern int semanage_fcontext_key_create( - semanage_handle_t* handle, - const char* expr, - int type, - semanage_fcontext_key_t** key_ptr); +extern int semanage_fcontext_key_create(semanage_handle_t * handle, + const char *expr, + int type, + semanage_fcontext_key_t ** key_ptr); -extern int semanage_fcontext_key_extract( - semanage_handle_t* handle, - const semanage_fcontext_t* fcontext, - semanage_fcontext_key_t** key_ptr); +extern int semanage_fcontext_key_extract(semanage_handle_t * handle, + const semanage_fcontext_t * fcontext, + semanage_fcontext_key_t ** key_ptr); -extern void semanage_fcontext_key_free( - semanage_fcontext_key_t* key); +extern void semanage_fcontext_key_free(semanage_fcontext_key_t * key); /* Regexp */ -extern const char* semanage_fcontext_get_expr( - const semanage_fcontext_t* fcontext); +extern const char *semanage_fcontext_get_expr(const semanage_fcontext_t * + fcontext); -extern int semanage_fcontext_set_expr( - semanage_handle_t* handle, - semanage_fcontext_t* fcontext, - const char* expr); +extern int semanage_fcontext_set_expr(semanage_handle_t * handle, + semanage_fcontext_t * fcontext, + const char *expr); /* Type */ #define SEMANAGE_FCONTEXT_ALL 0 @@ -56,36 +50,29 @@ #define SEMANAGE_FCONTEXT_LINK 6 #define SEMANAGE_FCONTEXT_PIPE 7 -extern int semanage_fcontext_get_type( - const semanage_fcontext_t* fcontext); +extern int semanage_fcontext_get_type(const semanage_fcontext_t * fcontext); -extern const char* semanage_fcontext_get_type_str( - int type); +extern const char *semanage_fcontext_get_type_str(int type); -extern void semanage_fcontext_set_type( - semanage_fcontext_t* fcontext, - int type); +extern void semanage_fcontext_set_type(semanage_fcontext_t * fcontext, + int type); /* Context */ -extern semanage_context_t* semanage_fcontext_get_con( - const semanage_fcontext_t* fcontext); +extern semanage_context_t *semanage_fcontext_get_con(const semanage_fcontext_t * + fcontext); -extern int semanage_fcontext_set_con( - semanage_handle_t* handle, - semanage_fcontext_t* fcontext, - semanage_context_t* con); +extern int semanage_fcontext_set_con(semanage_handle_t * handle, + semanage_fcontext_t * fcontext, + semanage_context_t * con); /* Create/Clone/Destroy */ -extern int semanage_fcontext_create( - semanage_handle_t* handle, - semanage_fcontext_t** fcontext_ptr); +extern int semanage_fcontext_create(semanage_handle_t * handle, + semanage_fcontext_t ** fcontext_ptr); -extern int semanage_fcontext_clone( - semanage_handle_t* handle, - const semanage_fcontext_t* fcontext, - semanage_fcontext_t** fcontext_ptr); +extern int semanage_fcontext_clone(semanage_handle_t * handle, + const semanage_fcontext_t * fcontext, + semanage_fcontext_t ** fcontext_ptr); -extern void semanage_fcontext_free( - semanage_fcontext_t* fcontext); +extern void semanage_fcontext_free(semanage_fcontext_t * fcontext); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontexts_local.h#2 (text+ko) ==== @@ -6,39 +6,32 @@ #include #include -extern int semanage_fcontext_modify_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - const semanage_fcontext_t* data); +extern int semanage_fcontext_modify_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + const semanage_fcontext_t * data); -extern int semanage_fcontext_del_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key); +extern int semanage_fcontext_del_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key); -extern int semanage_fcontext_query_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - semanage_fcontext_t** response); +extern int semanage_fcontext_query_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + semanage_fcontext_t ** response); -extern int semanage_fcontext_exists_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - int* response); +extern int semanage_fcontext_exists_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + int *response); -extern int semanage_fcontext_count_local( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_fcontext_count_local(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_fcontext_iterate_local( - semanage_handle_t* handle, - int (*handler) ( - const semanage_fcontext_t* record, - void* varg), - void* handler_arg); +extern int semanage_fcontext_iterate_local(semanage_handle_t * handle, + int (*handler) (const + semanage_fcontext_t * + record, void *varg), + void *handler_arg); -extern int semanage_fcontext_list_local( - semanage_handle_t* handle, - semanage_fcontext_t*** records, - unsigned int* count); +extern int semanage_fcontext_list_local(semanage_handle_t * handle, + semanage_fcontext_t *** records, + unsigned int *count); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontexts_policy.h#2 (text+ko) ==== @@ -6,30 +6,24 @@ #include #include -extern int semanage_fcontext_query( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - semanage_fcontext_t** response); +extern int semanage_fcontext_query(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + semanage_fcontext_t ** response); -extern int semanage_fcontext_exists( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - int* response); +extern int semanage_fcontext_exists(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + int *response); -extern int semanage_fcontext_count( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_fcontext_count(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_fcontext_iterate( - semanage_handle_t* handle, - int (*handler) ( - const semanage_fcontext_t* record, - void* varg), - void* handler_arg); +extern int semanage_fcontext_iterate(semanage_handle_t * handle, + int (*handler) (const semanage_fcontext_t * + record, void *varg), + void *handler_arg); -extern int semanage_fcontext_list( - semanage_handle_t* handle, - semanage_fcontext_t*** records, - unsigned int* count); +extern int semanage_fcontext_list(semanage_handle_t * handle, + semanage_fcontext_t *** records, + unsigned int *count); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/handle.h#2 (text+ko) ==== @@ -41,33 +41,33 @@ /* This is the type of connection to the store, for now only * direct is supported */ enum semanage_connect_type { - SEMANAGE_CON_INVALID = 0, SEMANAGE_CON_DIRECT, - SEMANAGE_CON_POLSERV_LOCAL, SEMANAGE_CON_POLSERV_REMOTE + SEMANAGE_CON_INVALID = 0, SEMANAGE_CON_DIRECT, + SEMANAGE_CON_POLSERV_LOCAL, SEMANAGE_CON_POLSERV_REMOTE }; /* This function allows you to specify the store to connect to. * It must be called after semanage_handle_create but before * semanage_connect. The argument should be the full path to the store. */ -void semanage_select_store(semanage_handle_t *handle, char *path, - enum semanage_connect_type storetype); +void semanage_select_store(semanage_handle_t * handle, char *path, + enum semanage_connect_type storetype); /* Just reload the policy */ -int semanage_reload_policy(semanage_handle_t *handle); +int semanage_reload_policy(semanage_handle_t * handle); /* set whether to reload the policy or not after a commit, * 1 for yes (default), 0 for no */ -void semanage_set_reload(semanage_handle_t *handle, int do_reload); +void semanage_set_reload(semanage_handle_t * handle, int do_reload); /* set whether to rebuild the policy on commit, even if no * changes were performed. * 1 for yes, 0 for no (default) */ -void semanage_set_rebuild(semanage_handle_t *handle, int do_rebuild); +void semanage_set_rebuild(semanage_handle_t * handle, int do_rebuild); /* create the store if it does not exist, this only has an effect on * direct connections and must be called before semanage_connect * 1 for yes, 0 for no (default) */ -void semanage_set_create_store(semanage_handle_t *handle, int create_store); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:37:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C21F216A4DD for ; Tue, 15 Aug 2006 18:37:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB60E43D78 for ; Tue, 15 Aug 2006 18:37:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8563C46B1C for ; Tue, 15 Aug 2006 14:37:16 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2A50655835; Tue, 15 Aug 2006 18:36:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 270BD16A4DF; Tue, 15 Aug 2006 18:36:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 008B616A4DD for ; Tue, 15 Aug 2006 18:36:59 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F49E43D5E for ; Tue, 15 Aug 2006 18:36:50 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIaoOJ043483 for ; Tue, 15 Aug 2006 18:36:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIamTm043480 for perforce@freebsd.org; Tue, 15 Aug 2006 18:36:49 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:36:49 GMT Message-Id: <200608151836.k7FIamTm043480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104092 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:37:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=104092 Change 104092 by millert@millert_macbook on 2006/08/15 18:36:39 Update to policycoreutils 1.30.25 from sourceforge Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow.1#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/avc.py#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2why/audit2why.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/load_policy/load_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/POTFILES#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/POTFILES.in#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/af.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/am.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ar.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/be.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bg.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bn.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bn_IN.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ca.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/cs.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/cy.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/da.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/de.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/el.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/en_GB.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/es.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/et.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/eu_ES.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fa.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fi.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fr.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/gl.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/gu.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/he.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hi.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hr.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hu.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hy.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/id.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/is.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/it.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ja.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ka.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/kn.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ko.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ku.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lo.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lt.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lv.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/mk.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ml.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/mr.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ms.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/my.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nb.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nl.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nn.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/no.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nso.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/or.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pa.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pl.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/policycoreutils.pot#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pt.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pt_BR.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ro.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ru.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/si.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sk.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sl.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sq.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sr.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sv.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ta.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/te.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/th.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/tr.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/uk.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ur.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/vi.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zh_CN.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zh_TW.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zu.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecon/restorecon.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecon/restorecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.8#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.init#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/stringslist.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/stringslist.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/utmpwatcher.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/utmpwatcher.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/run_init/open_init_pty.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/run_init/run_init.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/chcat#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/fixfiles#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/genhomedircon#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/secon/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/secon/secon.1#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/secon/secon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/semanage#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/semanage.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/seobject.py#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule/semodule.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule/semodule.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_deps/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_deps/semodule_deps.8#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_deps/semodule_deps.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_expand/semodule_expand.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_link/semodule_link.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_package/semodule_package.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/sestatus/sestatus.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setfiles/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setfiles/setfiles.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setsebool/setsebool.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setsebool/setsebool.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,106 @@ +1.30.25 2006-08-03 + * Merged patch from Dan Walsh with: + * audit2allow: process MAC_POLICY_LOAD events + * newrole: run shell with - prefix to start a login shell + * po: po file updates + * restorecond: bail if SELinux not enabled + * fixfiles: omit -q + * genhomedircon: fix exit code if non-root + * semodule_deps: install man page + +1.30.24 2006-08-03 + * Merged secon Makefile fix from Joshua Brindle. + +1.30.23 2006-08-03 + * Merged netfilter contexts support patch from Chris PeBenito. + +1.30.22 2006-07-28 + * Merged restorecond size_t fix from Joshua Brindle. + +1.30.21 2006-07-28 + * Merged secon keycreate patch from Michael LeMay. + +1.30.20 2006-07-26 + * Merged restorecond fixes from Dan Walsh. + Merged updated po files from Dan Walsh. + +1.30.19 2006-07-26 + * Merged python gettext patch from Stephen Bennett. + +1.30.18 2006-07-25 + * Merged semodule_deps from Karl MacMillan. + +1.30.17 2006-06-29 + * Lindent. + +1.30.16 2006-06-26 + * Merged patch from Dan Walsh with: + * -p option (progress) for setfiles and restorecon. + * disable context translation for setfiles and restorecon. + * on/off values for setsebool. + +1.30.15 2006-06-26 + * Merged setfiles and semodule_link fixes from Joshua Brindle. + +1.30.14 2006-06-16 + * Merged fix for setsebool error path from Serge Hallyn. + +1.30.13 2006-06-16 + * Merged patch from Dan Walsh with: + * Updated po files. + * Fixes for genhomedircon and seobject. + * Audit message for mass relabel by setfiles. + +1.30.12 2006-06-02 + * Updated fixfiles script for new setfiles location in /sbin. + +1.30.11 2006-05-26 + * Merged more translations from Dan Walsh. + * Merged patch to relocate setfiles to /sbin for early relabel + when /usr might not be mounted from Dan Walsh. + * Merged semanage/seobject patch to preserve fcontext ordering in list. + * Merged secon patch from James Antill. + +1.30.10 2006-05-22 + * Merged patch with updates to audit2allow, secon, genhomedircon, + and semanage from Dan Walsh. + +1.30.9 2006-05-08 + * Fixed audit2allow and po Makefiles for DESTDIR= builds. + * Merged .po file patch from Dan Walsh. + * Merged bug fix for genhomedircon. + +1.30.8 2006-05-08 + * Merged patch from Dan Walsh. + This includes audit2allow changes for analysis plugins, + internationalization support for several additional programs + and added po files, some fixes for semanage, and several cleanups. + It also adds a new secon utility. + +1.30.7 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.30.6 2006-04-14 + * Merged semanage prefix support from Russell Coker. + +1.30.5 2006-04-11 + * Added a test to setfiles to check that the spec file is + a regular file. + +1.30.4 2006-03-29 + * Merged audit2allow fixes for refpolicy from Dan Walsh. + * Merged fixfiles patch from Dan Walsh. + * Merged restorecond daemon from Dan Walsh. + +1.30.3 2006-03-29 + * Merged semanage non-MLS fixes from Chris PeBenito. + +1.30.2 2006-03-29 + * Merged semanage and semodule man page examples from Thomas Bleher. + +1.30.1 2006-03-20 + * Merged semanage labeling prefix patch from Ivan Gyurdiev. + 1.30 2006-03-14 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/Makefile#2 (text+ko) ==== @@ -1,7 +1,8 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po all install relabel clean: @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done +test: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30 +1.30.25 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/Makefile#2 (text+ko) ==== @@ -1,8 +1,11 @@ # Installation directories. PREFIX ?= ${DESTDIR}/usr BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale +PYLIBVER ?= python2.4 +PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) TARGETS=audit2allow @@ -13,6 +16,8 @@ install -m 755 $(TARGETS) $(BINDIR) -mkdir -p $(MANDIR)/man1 install -m 644 audit2allow.1 $(MANDIR)/man1/ + test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages + install -m 755 avc.py $(PYTHONLIBDIR)/site-packages clean: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow#2 (text+ko) ==== @@ -24,438 +24,23 @@ # 02111-1307 USA # # -import commands, sys, os, pwd, string, getopt, re, selinux - -obj="(\{[^\}]*\}|[^ \t:]*)" -allow_regexp="allow[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj) - -awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\ - IFACEFILE=FILENAME\n\ - IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\ - IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\ -}\n\ -\n\ -/^[[:blank:]]*allow[[:blank:]]+.*;[[:blank:]]*$/ {\n\ -\n\ - if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\ - ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\ - ALLOW = gensub(";[[:blank:]]*$","","g",$0)\n\ - print FILENAME "\\t" IFACENAME "\\t" ALLOW;\n\ - }\n\ -}\ -' - -class accessTrans: - def __init__(self): - self.dict={} - try: - fd=open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt") - except IOError, error: - raise IOError("Reference policy generation requires the policy development package.\n%s" % error) - records=fd.read().split("\n") - regexp="^define *\(`([^']*)' *, *` *\{([^}]*)}'" - for r in records: - m=re.match(regexp,r) - if m!=None: - self.dict[m.groups()[0]] = m.groups()[1].split() - fd.close() - def get(self, var): - l=[] - for v in var: - if v in self.dict.keys(): - l += self.dict[v] - else: - if v not in ("{", "}"): - l.append(v) - return l - -class interfaces: - def __init__(self): - self.dict={} - trans=accessTrans() - (input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null") - input.write(awk_script) - input.close() - records=output.read().split("\n") - input.close() - if len(records) > 0: - regexp="([^ \t]*)[ \t]+([^ \t]*)[ \t]+%s" % allow_regexp - for r in records: - m=re.match(regexp,r) - if m==None: - continue - else: - val=m.groups() - file=os.path.basename(val[0]).split(".")[0] - iface=val[1] - Scon=val[2].split() - Tcon=val[3].split() - Class=val[4].split() - Access=trans.get(val[5].split()) - for s in Scon: - for t in Tcon: - for c in Class: - if (s, t, c) not in self.dict.keys(): - self.dict[(s, t, c)]=[] - self.dict[(s, t, c)].append((Access, file, iface)) - def out(self): - keys=self.dict.keys() - keys.sort() - for k in keys: - print k - for i in self.dict[k]: - print "\t", i - - def match(self, Scon, Tcon, Class, Access): - keys=self.dict.keys() - ret=[] - if (Scon, Tcon, Class) in keys: - for i in self.dict[(Scon, Tcon, Class)]: - if Access in i[0]: - if i[2].find(Access) >= 0: - ret.insert(0, i) - else: - ret.append(i) - return ret - if ("$1", Tcon, Class) in keys: - for i in self.dict[("$1", Tcon, Class)]: - if Access in i[0]: - if i[2].find(Access) >= 0: - ret.insert(0, i) - else: - ret.append(i) - return ret - if (Scon, "$1", Class) in keys: - for i in self.dict[(Scon, "$1", Class)]: - if Access in i[0]: - if i[2].find(Access) >= 0: - ret.insert(0, i) - else: - ret.append(i) - return ret - else: - return ret - - -class serule: - def __init__(self, type, source, target, seclass): - self.type=type - self.source=source - self.target=target - self.seclass=seclass - self.avcinfo={} - self.iface=None - - def add(self, avc): - for a in avc[0]: - if a not in self.avcinfo.keys(): - self.avcinfo[a]=[] - - self.avcinfo[a].append(avc[1:]) - - def getAccess(self): - if len(self.avcinfo.keys()) == 1: - for i in self.avcinfo.keys(): - return i - else: - keys=self.avcinfo.keys() - keys.sort() - ret="{" - for i in keys: - ret=ret + " " + i - ret=ret+" }" - return ret - def out(self, verbose=0): - ret="" - ret=ret+"%s %s %s:%s %s;" % (self.type, self.source, self.gettarget(), self.seclass, self.getAccess()) - if verbose: - keys=self.avcinfo.keys() - keys.sort() - for i in keys: - for x in self.avcinfo[i]: - ret=ret+"\n\t#TYPE=AVC MSG=%s " % x[0] - if len(x[1]): - ret=ret+"COMM=%s " % x[1] - if len(x[2]): - ret=ret+"NAME=%s " % x[2] - ret=ret + " : " + i - return ret - - def gen_reference_policy(self, iface): - ret="" - Scon=self.source - Tcon=self.gettarget() - Class=self.seclass - Access=self.getAccess() - m=iface.match(Scon,Tcon,Class,Access) - if len(m)==0: - return self.out() - else: - file=m[0][1] - ret="\n#%s\n"% self.out() - ret += "optional_policy(`%s', `\n" % m[0][1] - first=True - for i in m: - if file != i[1]: - ret += "')\ngen_require(`%s', `\n" % i[1] - file = i[1] - first=True - if first: - ret += "\t%s(%s)\n" % (i[2], Scon) - first=False - else: - ret += "#\t%s(%s)\n" % (i[2], Scon) - ret += "');" - return ret - - def gettarget(self): - if self.source == self.target: - return "self" - else: - return self.target - -class seruleRecords: - def __init__(self, input, last_reload=0, verbose=0, te_ind=0): - self.last_reload=last_reload - self.seRules={} - self.seclasses={} - self.types=[] - self.roles=[] - self.load(input, te_ind) - self.gen_ref_policy = False - - def gen_reference_policy(self): - self.gen_ref_policy = True - self.iface=interfaces() - - def warning(self, error): - sys.stderr.write("%s: " % sys.argv[0]) - sys.stderr.write("%s\n" % error) - sys.stderr.flush() - - def load(self, input, te_ind=0): - VALID_CMDS=("allow", "dontaudit", "auditallow", "role") - - avc=[] - found=0 - line = input.readline() - if te_ind: - while line: - rec=line.split() - if len(rec) and rec[0] in VALID_CMDS: - self.add_terule(line) - line = input.readline() - - else: - while line: - rec=line.split() - for i in rec: - if i=="avc:" or i=="message=avc:" or i=="msg='avc:": - - found=1 - else: - avc.append(i) - if found: - self.add(avc) - found=0 - avc=[] - line = input.readline() - - - def get_target(self, i, rule): - target=[] - if rule[i][0] == "{": - for t in rule[i].split("{"): - if len(t): - target.append(t) - i=i+1 - for s in rule[i:]: - if s.find("}") >= 0: - for s1 in s.split("}"): - if len(s1): - target.append(s1) - i=i+1 - return (i, target) - - target.append(s) - i=i+1 - else: - if rule[i].find(";") >= 0: - for s1 in rule[i].split(";"): - if len(s1): - target.append(s1) - else: - target.append(rule[i]) - - i=i+1 - return (i, target) - - def rules_split(self, rules): - (idx, target ) = self.get_target(0, rules) - (idx, subject) = self.get_target(idx, rules) - return (target, subject) - - def add_terule(self, rule): - rc = rule.split(":") - rules=rc[0].split() - type=rules[0] - if type == "role": - print type - (sources, targets) = self.rules_split(rules[1:]) - rules=rc[1].split() - (seclasses, access) = self.rules_split(rules) - for scon in sources: - for tcon in targets: - for seclass in seclasses: - self.add_rule(type, scon, tcon, seclass,access) - - def add_rule(self, rule_type, scon, tcon, seclass, access, msg="", comm="", name=""): - self.add_seclass(seclass, access) - self.add_type(tcon) - self.add_type(scon) - if (rule_type, scon, tcon, seclass) not in self.seRules.keys(): - self.seRules[(rule_type, scon, tcon, seclass)]=serule(rule_type, scon, tcon, seclass) - - self.seRules[(rule_type, scon, tcon, seclass)].add((access, msg, comm, name )) - - def add(self,avc): - scon="" - tcon="" - seclass="" - comm="" - name="" - msg="" - access=[] - if "security_compute_sid" in avc: - return - - if "load_policy" in avc and self.last_reload: - self.seRules={} - - if "granted" in avc: - return - try: - for i in range (0, len(avc)): - if avc[i]=="{": - i=i+1 - while i 0: - for i in self.roles: - rec += "\trole %s; \n" % i - rec += "\n" - - for i in keys: - access=self.seclasses[i] - if len(access) > 1: - access.sort() - rec += "\tclass %s {" % i - for a in access: - rec += " %s" % a - rec += " }; \n" - else: - rec += "\tclass %s %s;\n" % (i, access[0]) - - rec += "\n" - - for i in self.types: - rec += "\ttype %s; \n" % i - rec += " };\n\n\n" - return rec - - def out(self, require=0, module=""): - rec="" - if len(self.seRules.keys())==0: - raise(ValueError("No AVC messages found.")) - if module != "": - rec += self.gen_module(module) - rec += self.gen_requires() - else: - if requires: - rec+=self.gen_requires() - - keys=self.seRules.keys() - keys.sort() - for i in keys: - if self.gen_ref_policy: - rec += self.seRules[i].gen_reference_policy(self.iface)+"\n" - else: - rec += self.seRules[i].out(verbose)+"\n" - return rec - if __name__ == '__main__': - + import commands, sys, os, getopt, selinux + import gettext + try: + gettext.install('policycoreutils') + except: + pass def get_mls_flag(): if selinux.is_selinux_mls_enabled(): return "-M" else: return "" - def usage(msg=""): - print 'audit2allow [-adhilrv] [-t file ] [ -f fcfile ] [-i ] [[-m|-M] ] [-o ]\n\ + def usage(msg = ""): + print _('audit2allow [-adhilrv] [-t file ] [ -f fcfile ] [-i ] [[-m|-M] ] [-o ]\n\ -a, --all read input from audit and message log, conflicts with -i\n\ -d, --dmesg read input from output of /bin/dmesg\n\ -h, --help display this message\n\ @@ -465,10 +50,11 @@ -M generate loadable module package, conflicts with -o\n\ -o, --output append output to , conflicts with -M\n\ -r, --requires generate require output \n\ - -t, --tefile Indicates input is Existing Type Enforcement file\n\ + -t, --tefile Add input from Existing Type Enforcement file\n\ -f, --fcfile Existing Type Enforcement file, requires -M\n\ -v, --verbose verbose output\n\ - ' + -A, --analyze Analyze output\n\ + ') if msg != "": print msg sys.exit(1) @@ -483,24 +69,26 @@ # # try: - last_reload=0 - input=sys.stdin - output=sys.stdout - module="" - requires=0 - verbose=0 - auditlogs=0 - buildPP=0 - input_ind=0 - output_ind=0 - ref_ind=False - te_ind=0 + last_reload = 0 + inputfd = sys.stdin + output = sys.stdout + module = "" + requires = 0 + verbose = 0 + auditlogs = 0 + buildPP = 0 + input_ind = 0 + output_ind = 0 + ref_ind = False + analyze = False + te_inputs = [] - fc_file="" + fc_file = "" gopts, cmds = getopt.getopt(sys.argv[1:], - 'adf:hi:lm:M:o:rtvR', + 'Aadf:hi:lm:M:o:rt:vR', ['all', - 'dmesg', + 'analyze', + 'dmesg', 'fcfile=', 'help', 'input=', @@ -509,57 +97,61 @@ 'output=', 'requires', 'reference', - 'tefile', + 'tefile=', 'verbose' ]) for o,a in gopts: if o == "-a" or o == "--all": - if input_ind or te_ind: + if input_ind: usage() - input=open("/var/log/messages", "r") - auditlogs=1 + inputfd = open("/var/log/messages", "r") + auditlogs = 1 if o == "-d" or o == "--dmesg": - input=os.popen("/bin/dmesg", "r") + inputfd = os.popen("/bin/dmesg", "r") if o == "-f" or o == "--fcfile": - if a[0]=="-": + if a[0] == "-": usage() - fc_file=a + fc_file = a if o == "-h" or o == "--help": usage() if o == "-i"or o == "--input": - if auditlogs or a[0]=="-": + if auditlogs or a[0] == "-": usage() - input_ind=1 - input=open(a, "r") + input_ind = 1 + inputfd = open(a, "r") if o == '--lastreload' or o == "-l": - last_reload=1 + last_reload = 1 if o == "-m" or o == "--module": - if module != "" or a[0]=="-": + if module != "" or a[0] == "-": usage() - module=a + module = a if o == "-M": - if module != "" or output_ind or a[0]=="-": + if module != "" or output_ind or a[0] == "-": usage() - module=a - outfile=a+".te" - buildPP=1 - output=open(outfile, "w") + module = a + outfile = a+".te" + buildPP = 1 + if not os.path.exists("/usr/bin/checkmodule"): + errorExit("-M Requires the checkmodule command, you need to install the checkpolicy rpm package") + output = open(outfile, "w") if o == "-r" or o == "--requires": - requires=1 + requires = 1 if o == "-t" or o == "--tefile": - if auditlogs: - usage() - te_ind=1 + te_inputs.append(open(a, "r")) + if o == "-R" or o == "--reference": - ref_ind=True + ref_ind = True if o == "-o" or o == "--output": - if module != "" or a[0]=="-": + if module != "" or a[0] == "-": usage() - output=open(a, "a") - output_ind=1 + output = open(a, "a") + output_ind = 1 if o == "-v" or o == "--verbose": - verbose=1 + verbose = 1 + + if o == "-A" or o == "--analyze": + analyze = True if len(cmds) != 0: usage() @@ -567,42 +159,52 @@ if fc_file != "" and not buildPP: usage("Error %s: Option -fc requires -M" % sys.argv[0]) - out=seruleRecords(input, last_reload, verbose, te_ind) + serules = SERules(last_reload, verbose) + + for i in te_inputs: + te = TERules(serules) + te.load(i) + + serules.load(inputfd) if ref_ind: - out.gen_reference_policy() + serules.gen_reference_policy() + + if analyze: + serules.analyze() + sys.exit(0) - if auditlogs: - input=os.popen("ausearch -m avc") - out.load(input) + if auditlogs and os.path.exists("/var/log/audit/audit.log"): + inputfd = os.popen("ausearch -m avc,MAC_POLICY_LOAD") + serules.load(inputfd) if buildPP: - print ("Generating type enforcment file: %s.te" % module) - output.write(out.out(requires, module)) + print (_("Generating type enforcment file: %s.te") % module) + output.write(serules.out(requires, module)) output.flush() if buildPP: - cmd="checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module) - print "Compiling policy" + cmd = "checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module) + print _("Compiling policy") print cmd - rc=commands.getstatusoutput(cmd) - if rc[0]==0: - cmd="semodule_package -o %s.pp -m %s.mod" % (module, module) + rc = commands.getstatusoutput(cmd) + if rc[0] == 0: + cmd = "semodule_package -o %s.pp -m %s.mod" % (module, module) if fc_file != "": cmd = "%s -f %s" % (cmd, fc_file) print cmd - rc=commands.getstatusoutput(cmd) - if rc[0]==0: - print ("\n******************** IMPORTANT ***********************\n") - print ("In order to load this newly created policy package into the kernel,\nyou are required to execute \n\nsemodule -i %s.pp\n\n" % module) + rc = commands.getstatusoutput(cmd) + if rc[0] == 0: + print _("\n******************** IMPORTANT ***********************\n") + print (_("In order to load this newly created policy package into the kernel,\nyou are required to execute \n\nsemodule -i %s.pp\n\n") % module) else: errorExit(rc[1]) else: errorExit(rc[1]) except getopt.error, error: - errorExit("Options Error " + error.msg) + errorExit(_("Options Error: %s ") % error.msg) except ValueError, error: errorExit(error.args[0]) except IOError, error: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow.1#2 (text+ko) ==== @@ -66,7 +66,7 @@ Generate require output syntax for loadable modules. .TP .B "\-R" | "\-\-reference" -Generate reference policy using installed macros +Generate reference policy using installed macros. Requires the selinux-policy-devel package. .TP .B "\-t " | "\-\-tefile" Indicates input file is a te (type enforcement) file. This can be used to translate old te format to new policy format. @@ -98,6 +98,11 @@ .PP .SH EXAMPLE .nf +.B NOTE: These examples are for systems using the audit package. If you do +.B not use the audit package, the AVC messages will be in /var/log/messages. +.B Please substitute /var/log/messages for /var/log/audit/audit.log in the +.B examples. +.PP .B Using audit2allow to generate monolithic (non-module) policy $ cd /etc/selinux/$SELINUXTYPE/src/policy $ cat /var/log/audit/audit.log | audit2allow >> domains/misc/local.te ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2why/audit2why.c#2 (text+ko) ==== @@ -15,13 +15,14 @@ #define TCONTEXT "tcontext=" #define TCLASS "tclass=" -void usage(char *progname, int rc) +void usage(char *progname, int rc) { - fprintf(stderr, "usage: %s [-p policy] < /var/log/audit/audit.log\n", progname); + fprintf(stderr, "usage: %s [-p policy] < /var/log/audit/audit.log\n", + progname); exit(rc); } -int main(int argc, char **argv) +int main(int argc, char **argv) { char path[PATH_MAX]; char *buffer = NULL, *bufcopy = NULL; @@ -62,25 +63,30 @@ if (!set_path) { if (!is_selinux_enabled()) { - fprintf(stderr, "%s: Must specify -p policy on non-SELinux systems\n", argv[0]); + fprintf(stderr, + "%s: Must specify -p policy on non-SELinux systems\n", >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:41:16 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C22916A4DA for ; Tue, 15 Aug 2006 18:41:16 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92AAE43D7E for ; Tue, 15 Aug 2006 18:41:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 16CE546B09 for ; Tue, 15 Aug 2006 14:41:04 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E600555ADA; Tue, 15 Aug 2006 18:41:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E2FFC16A4E8; Tue, 15 Aug 2006 18:41:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C18A816A4DA for ; Tue, 15 Aug 2006 18:41:01 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78ED743D69 for ; Tue, 15 Aug 2006 18:40:56 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIeug9043803 for ; Tue, 15 Aug 2006 18:40:56 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIeuIl043800 for perforce@freebsd.org; Tue, 15 Aug 2006 18:40:56 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:40:56 GMT Message-Id: <200608151840.k7FIeuIl043800@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104094 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:41:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=104094 Change 104094 by millert@millert_macbook on 2006/08/15 18:40:51 Remove extra Makefiles Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/Makefile.new#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/Makefile.old#2 delete Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:48:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 70AC816A4DD for ; Tue, 15 Aug 2006 18:48:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8391E43D70 for ; Tue, 15 Aug 2006 18:47:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A214B46C3D for ; Tue, 15 Aug 2006 14:47:55 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0B8B65C2B6; Tue, 15 Aug 2006 18:46:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D2F1716A518; Tue, 15 Aug 2006 18:46:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92B0916A501 for ; Tue, 15 Aug 2006 18:46:10 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D3B343D72 for ; Tue, 15 Aug 2006 18:46:05 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIk5Pd045906 for ; Tue, 15 Aug 2006 18:46:05 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIk4OT045895 for perforce@freebsd.org; Tue, 15 Aug 2006 18:46:04 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:46:04 GMT Message-Id: <200608151846.k7FIk4OT045895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104096 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:48:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=104096 Change 104096 by millert@millert_macbook on 2006/08/15 18:45:13 Update to checkpolicy 1.30.10 from sourceforge Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/checkmodule.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/checkpolicy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/checkpolicy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/parse_util.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/parse_util.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_parse.y#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_scan.l#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/queue.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/queue.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/test/dismod.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/test/dispol.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/write.c#2 delete Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,30 @@ +1.30.10 2006-08-03 + * Merged symtab datum patch from Karl MacMillan. + +1.30.9 2006-06-29 + * Lindent. + +1.30.8 2006-06-29 + * Merged patch to remove TE rule conflict checking from the parser + from Joshua Brindle. This can only be done properly by the + expander. + +1.30.7 2006-06-27 + * Merged patch to make checkpolicy/checkmodule handling of + duplicate/conflicting TE rules the same as the expander + from Joshua Brindle. + +1.30.6 2006-06-26 + * Merged optionals in base take 2 patch set from Joshua Brindle. + +1.30.5 2006-05-05 + * Merged compiler cleanup patch from Karl MacMillan. + * Merged fix warnings patch from Karl MacMillan. + +1.30.4 2006-04-05 + * Changed require_class to reject permissions that have not been + declared if building a base module. + 1.30.3 2006-03-28 * Fixed checkmodule to call link_modules prior to expand_module to handle optionals. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/Makefile#2 (text+ko) ==== @@ -2,7 +2,8 @@ PROG= checkpolicy -OBJS = checkpolicy.o y.tab.o policy_scan.o queue.o module_compiler.o +OBJS = checkpolicy.o y.tab.o policy_scan.o queue.o module_compiler.o \ + parse_util.o CFLAGS+= -I../../libselinux/include -I../../libsepol/include LDADD+= -L../../libselinux/src -L../../libsepol/src -L../../libsecompat ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30.3 +1.30.10 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/checkmodule.c#2 (text+ko) ==== @@ -27,174 +27,124 @@ #include #include #include +#include #include "queue.h" #include "checkpolicy.h" +#include "parse_util.h" extern char *optarg; extern int optind; static sidtab_t sidtab; -extern policydb_t *policydbp; -extern queue_t id_queue; -extern unsigned int policydb_errors; -extern unsigned long policydb_lineno; -extern char source_file[]; extern int mlspol; -extern FILE *yyin; -extern void init_parser(int); -extern int yyparse(void); -extern void yyrestart(FILE *); - static char *txtfile = "policy.conf"; static char *binfile = "policy"; unsigned int policy_type = POLICY_BASE; unsigned int policyvers = MOD_POLICYDB_VERSION_MAX; -static int read_binary_policy(policydb_t *p, char *file, char *progname) +static int read_binary_policy(policydb_t * p, char *file, char *progname) { - int fd; + int fd; struct stat sb; - void *map; + void *map; struct policy_file f, *fp; - - fd = open(file, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "Can't open '%s': %s\n", - file, strerror(errno)); - return -1; - } - if (fstat(fd, &sb) < 0) { - fprintf(stderr, "Can't stat '%s': %s\n", - file, strerror(errno)); - return -1; - } - map = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); - if (map == MAP_FAILED) { - fprintf(stderr, "Can't map '%s': %s\n", - file, strerror(errno)); - return -1; - } - f.type = PF_USE_MEMORY; - f.data = map; - f.len = sb.st_size; - fp = &f; + + fd = open(file, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "Can't open '%s': %s\n", + file, strerror(errno)); + return -1; + } + if (fstat(fd, &sb) < 0) { + fprintf(stderr, "Can't stat '%s': %s\n", + file, strerror(errno)); + return -1; + } + map = + mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + if (map == MAP_FAILED) { + fprintf(stderr, "Can't map '%s': %s\n", file, strerror(errno)); + return -1; + } + f.type = PF_USE_MEMORY; + f.data = map; + f.len = sb.st_size; + fp = &f; if (policydb_init(p)) { - fprintf(stderr, "%s: policydb_init: Out of memory!\n", progname); + fprintf(stderr, "%s: policydb_init: Out of memory!\n", + progname); + return -1; + } + if (policydb_read(p, fp, 1)) { + fprintf(stderr, + "%s: error(s) encountered while parsing configuration\n", + progname); return -1; - } - if (policydb_read(p, fp, 1)) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", progname); - return -1; - } - - /* Check Policy Consistency */ - if (p->mls) { - if (!mlspol) { - fprintf(stderr,"%s: MLS policy, but non-MLS" - " is specified\n", progname); - return -1; - } - } else { - if (mlspol) { - fprintf(stderr,"%s: non-MLS policy, but MLS" - " is specified\n", progname); - return -1; - } - } - return 0; + } + + /* Check Policy Consistency */ + if (p->mls) { + if (!mlspol) { + fprintf(stderr, "%s: MLS policy, but non-MLS" + " is specified\n", progname); + return -1; + } + } else { + if (mlspol) { + fprintf(stderr, "%s: non-MLS policy, but MLS" + " is specified\n", progname); + return -1; + } + } + return 0; } -static int read_source_policy(policydb_t *p, char *file, char *progname) +static int write_binary_policy(policydb_t * p, char *file, char *progname) { - yyin = fopen(file, "r"); - if (!yyin) { - fprintf(stderr, "%s: unable to open %s\n", progname, - file); - return -1; - } - - if (policydb_init(p) || - ((id_queue = queue_create()) == NULL)) { - fprintf(stderr, "%s: out of memory!\n", progname); - return -1; - } + FILE *outfp = NULL; + struct policy_file pf; + int ret; - p->policy_type = policy_type; - p->mls = mlspol; + printf("%s: writing binary representation (version %d) to %s\n", + progname, policyvers, file); - init_parser(1); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", progname); - return -1; - } - rewind(yyin); - init_parser(2); - source_file[0] = '\0'; - yyrestart(yyin); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", progname); - return -1; - } - queue_destroy(id_queue); - - if (hierarchy_check_constraints(NULL, p)) { - return -1; - } - - if (policydb_errors) - return -1; + outfp = fopen(file, "w"); + if (!outfp) { + perror(file); + exit(1); + } - fclose(yyin); - return 0; -} - -static int write_binary_policy(policydb_t *p, char *file, char *progname) -{ - FILE *outfp = NULL; - struct policy_file pf; - int ret; - - printf("%s: writing binary representation (version %d) to %s\n", - progname, policyvers, file); - - outfp = fopen(file, "w"); - if (!outfp) { - perror(file); - exit(1); - } - p->policy_type = policy_type; p->policyvers = policyvers; - - pf.type = PF_USE_STDIO; - pf.fp = outfp; - ret = policydb_write(p, &pf); - if (ret) { - fprintf(stderr, "%s: error writing %s\n", - progname, file); - return -1; - } - fclose(outfp); - return 0; + + pf.type = PF_USE_STDIO; + pf.fp = outfp; + ret = policydb_write(p, &pf); + if (ret) { + fprintf(stderr, "%s: error writing %s\n", progname, file); + return -1; + } + fclose(outfp); + return 0; } static void usage(char *progname) { - printf("usage: %s [-V] [-b] [-m] [-M] [-o FILE] [INPUT]\n", - progname); - printf("Build base and policy modules.\n"); - printf("Options:\n"); - printf(" INPUT build module from INPUT (else read from \"%s\")\n", txtfile); - printf(" -V show policy versions created by this program\n"); - printf(" -b treat input as a binary policy file\n"); - printf(" -m build a policy module instead of a base module\n"); - printf(" -M enable MLS policy\n"); - printf(" -o FILE write module to FILE (else just check syntax)\n"); + printf("usage: %s [-V] [-b] [-m] [-M] [-o FILE] [INPUT]\n", progname); + printf("Build base and policy modules.\n"); + printf("Options:\n"); + printf(" INPUT build module from INPUT (else read from \"%s\")\n", + txtfile); + printf(" -V show policy versions created by this program\n"); + printf(" -b treat input as a binary policy file\n"); + printf(" -m build a policy module instead of a base module\n"); + printf(" -M enable MLS policy\n"); + printf(" -o FILE write module to FILE (else just check syntax)\n"); exit(1); } @@ -204,13 +154,13 @@ unsigned int binary = 0; int ch; int show_version = 0; - policydb_t modpolicydb; + policydb_t modpolicydb; while ((ch = getopt(argc, argv, "ho:dbVmM")) != EOF) { switch (ch) { - case 'h': - usage (argv [0]); - break; + case 'h': + usage(argv[0]); + break; case 'o': outfile = optarg; break; @@ -223,9 +173,9 @@ break; case 'm': policy_type = POLICY_MOD; - policyvers = MOD_POLICYDB_VERSION_MAX; + policyvers = MOD_POLICYDB_VERSION_MAX; break; - case 'M': + case 'M': mlspol = 1; break; default: @@ -234,8 +184,8 @@ } if (show_version) { - printf("Module versions %d-%d\n", - MOD_POLICYDB_VERSION_MIN, MOD_POLICYDB_VERSION_MAX); + printf("Module versions %d-%d\n", + MOD_POLICYDB_VERSION_MIN, MOD_POLICYDB_VERSION_MAX); exit(0); } @@ -244,27 +194,37 @@ if (optind != argc) usage(argv[0]); } - printf("%s: loading policy configuration from %s\n", argv[0], - file); + printf("%s: loading policy configuration from %s\n", argv[0], file); - /* Set policydb and sidtab used by libsepol service functions - to my structures, so that I can directly populate and - manipulate them. */ - sepol_set_policydb(&modpolicydb); - sepol_set_sidtab(&sidtab); + /* Set policydb and sidtab used by libsepol service functions + to my structures, so that I can directly populate and + manipulate them. */ + sepol_set_policydb(&modpolicydb); + sepol_set_sidtab(&sidtab); - policydbp = &modpolicydb; if (binary) { - if (read_binary_policy(policydbp, file, argv[0]) == -1) { - exit(1); - } + if (read_binary_policy(&modpolicydb, file, argv[0]) == -1) { + exit(1); + } } else { - if (read_source_policy(policydbp, file, argv[0]) == -1) { - exit(1); - } - } + if (policydb_init(&modpolicydb)) { + fprintf(stderr, "%s: out of memory!\n", argv[0]); + return -1; + } + + modpolicydb.policy_type = policy_type; + modpolicydb.mls = mlspol; + + if (read_source_policy(&modpolicydb, file, argv[0]) == -1) { + exit(1); + } + + if (hierarchy_check_constraints(NULL, &modpolicydb)) { + return -1; + } + } - if (policydbp->policy_type == POLICY_BASE) { + if (modpolicydb.policy_type == POLICY_BASE) { /* Verify that we can successfully expand the base module. */ policydb_t kernpolicydb; @@ -272,28 +232,31 @@ fprintf(stderr, "%s: policydb_init failed\n", argv[0]); exit(1); } - if (link_modules(NULL, policydbp, NULL, 0, 0)) { + if (link_modules(NULL, &modpolicydb, NULL, 0, 0)) { fprintf(stderr, "%s: link modules failed\n", argv[0]); exit(1); } - if (expand_module(NULL, policydbp, &kernpolicydb, 0, 1)) { + if (expand_module(NULL, &modpolicydb, &kernpolicydb, 0, 1)) { fprintf(stderr, "%s: expand module failed\n", argv[0]); exit(1); } policydb_destroy(&kernpolicydb); } - if (policydb_load_isids(policydbp, &sidtab)) + if (policydb_load_isids(&modpolicydb, &sidtab)) exit(1); + sepol_sidtab_destroy(&sidtab); + printf("%s: policy configuration loaded\n", argv[0]); if (outfile && - write_binary_policy(policydbp, outfile, argv[0]) == -1) { - exit(1); - } + write_binary_policy(&modpolicydb, outfile, argv[0]) == -1) { + exit(1); + } + policydb_destroy(&modpolicydb); + return 0; } /* FLASK */ - ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/checkpolicy.c#2 (text+ko) ==== @@ -80,6 +80,7 @@ #include "queue.h" #include "checkpolicy.h" +#include "parse_util.h" extern char *optarg; extern int optind; @@ -88,17 +89,8 @@ static sidtab_t sidtab; extern policydb_t *policydbp; -extern queue_t id_queue; -extern unsigned int policydb_errors; -extern unsigned long policydb_lineno; -extern char source_file[]; extern int mlspol; -extern FILE *yyin; -extern void init_parser(int); -extern int yyparse(void); -extern void yyrestart(FILE *); - static char *txtfile = "policy.conf"; static char *binfile = "policy"; @@ -106,8 +98,9 @@ void usage(char *progname) { - printf("usage: %s [-b] [-d] [-M] [-c policyvers (%d-%d)] [-o output_file] [input_file]\n", - progname, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX); + printf + ("usage: %s [-b] [-d] [-M] [-c policyvers (%d-%d)] [-o output_file] [input_file]\n", + progname, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX); exit(1); } @@ -118,7 +111,9 @@ exit(1);\ } static int print_sid(sepol_security_id_t sid, - context_struct_t * context __attribute__ ((unused)), void *data __attribute__ ((unused))) + context_struct_t * context + __attribute__ ((unused)), void *data + __attribute__ ((unused))) { sepol_security_context_t scontext; size_t scontext_len; @@ -146,7 +141,7 @@ perdatum = (perm_datum_t *) datum; - if (v->val == perdatum->value) { + if (v->val == perdatum->s.value) { v->name = key; return 1; } @@ -155,7 +150,7 @@ } #ifdef EQUIVTYPES -static int insert_type_rule(avtab_key_t *k, avtab_datum_t *d, +static int insert_type_rule(avtab_key_t * k, avtab_datum_t * d, struct avtab_node *type_rules) { struct avtab_node *p, *c, *n; @@ -168,10 +163,10 @@ */ if (k->source_type < c->key.source_type) break; - if (k->source_type == c->key.source_type && + if (k->source_type == c->key.source_type && k->target_type < c->key.target_type) break; - if (k->source_type == c->key.source_type && + if (k->source_type == c->key.source_type && k->target_type == c->key.target_type && k->target_class < c->key.target_class) break; @@ -191,7 +186,7 @@ return 0; } -static int create_type_rules(avtab_key_t *k, avtab_datum_t *d, void *args) +static int create_type_rules(avtab_key_t * k, avtab_datum_t * d, void *args) { struct avtab_node *type_rules = args; @@ -200,8 +195,10 @@ * Insert the rule into the lists for both * the source type and the target type. */ - if (insert_type_rule(k, d, &type_rules[k->source_type-1])) return -1; - if (insert_type_rule(k, d, &type_rules[k->target_type-1])) return -1; + if (insert_type_rule(k, d, &type_rules[k->source_type - 1])) + return -1; + if (insert_type_rule(k, d, &type_rules[k->target_type - 1])) + return -1; } return 0; @@ -218,24 +215,24 @@ } } -static int identify_equiv_types(void) +static int identify_equiv_types(void) { - struct avtab_node *type_rules, *l1, *l2; + struct avtab_node *type_rules, *l1, *l2; int i, j; /* * Create a list of access vector rules for each type * from the access vector table. */ - type_rules = malloc(sizeof(struct avtab_node)*policydb.p_types.nprim); + type_rules = malloc(sizeof(struct avtab_node) * policydb.p_types.nprim); if (!type_rules) { fprintf(stderr, "out of memory\n"); exit(1); } - memset(type_rules, 0, sizeof(struct avtab_node)*policydb.p_types.nprim); + memset(type_rules, 0, + sizeof(struct avtab_node) * policydb.p_types.nprim); if (avtab_map(&policydb.te_avtab, create_type_rules, type_rules)) exit(1); - /* * Compare the type lists and identify equivalent types. @@ -244,27 +241,29 @@ if (!type_rules[i].next) continue; for (j = i + 1; j < policydb.p_types.nprim; j++) { - for (l1 = type_rules[i].next, l2 = type_rules[j].next; l1 && l2; - l1 = l1->next, l2 = l2->next) { - if (l2->key.source_type == (j+1)) { - if (l1->key.source_type != (i+1)) + for (l1 = type_rules[i].next, l2 = type_rules[j].next; + l1 && l2; l1 = l1->next, l2 = l2->next) { + if (l2->key.source_type == (j + 1)) { + if (l1->key.source_type != (i + 1)) break; } else { - if (l1->key.source_type != l2->key.source_type) + if (l1->key.source_type != + l2->key.source_type) break; } - if (l2->key.target_type == (j+1)) { - if (l1->key.target_type != (i+1)) + if (l2->key.target_type == (j + 1)) { + if (l1->key.target_type != (i + 1)) break; } else { - if (l1->key.target_type != l2->key.target_type) + if (l1->key.target_type != + l2->key.target_type) break; } - if (l1->key.target_class != l2->key.target_class || - l1->datum.allowed != l2->datum.allowed) + if (l1->key.target_class != l2->key.target_class + || l1->datum.allowed != l2->datum.allowed) break; } - if (l1 || l2) + if (l1 || l2) continue; free_type_rules(type_rules[j].next); type_rules[j].next = NULL; @@ -272,37 +271,37 @@ policydb.p_type_val_to_name[i], policydb.p_type_val_to_name[j]); } - free_type_rules(type_rules[i].next); + free_type_rules(type_rules[i].next); type_rules[i].next = NULL; } - free(type_rules); + free(type_rules); return 0; } -#endif +#endif extern char *av_to_string(uint32_t tclass, sepol_access_vector_t av); - int display_bools() { int i; for (i = 0; i < policydbp->p_bools.nprim; i++) { printf("%s : %d\n", policydbp->p_bool_val_to_name[i], - policydbp->bool_val_to_struct[i]->state); + policydbp->bool_val_to_struct[i]->state); } return 0; } -void display_expr(cond_expr_t *exp) +void display_expr(cond_expr_t * exp) { cond_expr_t *cur; for (cur = exp; cur != NULL; cur = cur->next) { switch (cur->expr_type) { case COND_BOOL: - printf("%s ", policydbp->p_bool_val_to_name[cur->bool - 1]); + printf("%s ", + policydbp->p_bool_val_to_name[cur->bool - 1]); break; case COND_NOT: printf("! "); @@ -360,7 +359,9 @@ level_datum_t *levdatum = (level_datum_t *) datum; if (!levdatum->isalias && !levdatum->defined) { - fprintf(stderr, "Error: sensitivity %s was not used in a level definition!\n", key); + fprintf(stderr, + "Error: sensitivity %s was not used in a level definition!\n", + key); return -1; } return 0; @@ -389,7 +390,6 @@ int show_version = 0; struct policy_file pf; - while ((ch = getopt(argc, argv, "o:dbMVc:")) != EOF) { switch (ch) { case 'o': @@ -408,30 +408,36 @@ case 'M': mlspol = 1; break; - case 'c': { - long int n = strtol(optarg, NULL, 10); - if (errno) { - fprintf(stderr, "Invalid policyvers specified: %s\n", optarg); - usage(argv[0]); - exit(1); + case 'c':{ + long int n = strtol(optarg, NULL, 10); + if (errno) { + fprintf(stderr, + "Invalid policyvers specified: %s\n", + optarg); + usage(argv[0]); + exit(1); + } + if (n < POLICYDB_VERSION_MIN + || n > POLICYDB_VERSION_MAX) { + fprintf(stderr, + "policyvers value %ld not in range %d-%d\n", + n, POLICYDB_VERSION_MIN, + POLICYDB_VERSION_MAX); + usage(argv[0]); + exit(1); + } + if (policyvers != n) + policyvers = n; + break; } - if (n < POLICYDB_VERSION_MIN || n > POLICYDB_VERSION_MAX) { - fprintf(stderr, "policyvers value %ld not in range %d-%d\n", - n, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX); - usage(argv[0]); - exit(1); - } - if (policyvers != n) - policyvers = n; - break; - } default: usage(argv[0]); } } if (show_version) { - printf("%d (compatibility range %d-%d)\n", policyvers, POLICYDB_VERSION_MAX, POLICYDB_VERSION_MIN); + printf("%d (compatibility range %d-%d)\n", policyvers, + POLICYDB_VERSION_MAX, POLICYDB_VERSION_MIN); exit(0); } @@ -440,8 +446,7 @@ if (optind != argc) usage(argv[0]); } - printf("%s: loading policy configuration from %s\n", argv[0], - file); + printf("%s: loading policy configuration from %s\n", argv[0], file); /* Set policydb and sidtab used by libsepol service functions to my structures, so that I can directly populate and @@ -461,7 +466,9 @@ file, strerror(errno)); exit(1); } - map = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + map = + mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, + fd, 0); if (map == MAP_FAILED) { fprintf(stderr, "Can't map '%s': %s\n", file, strerror(errno)); @@ -471,12 +478,15 @@ pf.data = map; pf.len = sb.st_size; if (policydb_init(&policydb)) { - fprintf(stderr, "%s: policydb_init: Out of memory!\n", argv[0]); + fprintf(stderr, "%s: policydb_init: Out of memory!\n", + argv[0]); exit(1); } ret = policydb_read(&policydb, &pf, 1); if (ret) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); + fprintf(stderr, + "%s: error(s) encountered while parsing configuration\n", + argv[0]); exit(1); } policydbp = &policydb; @@ -484,27 +494,20 @@ /* Check Policy Consistency */ if (policydbp->mls) { if (!mlspol) { - fprintf(stderr,"%s: MLS policy, but non-MLS" - " is specified\n", argv[0]); + fprintf(stderr, "%s: MLS policy, but non-MLS" + " is specified\n", argv[0]); exit(1); } } else { if (mlspol) { - fprintf(stderr,"%s: non-MLS policy, but MLS" - " is specified\n", argv[0]); + fprintf(stderr, "%s: non-MLS policy, but MLS" + " is specified\n", argv[0]); exit(1); } } } else { - policydb_t parse_policy; + policydb_t parse_policy; - yyin = fopen(file, "r"); - if (!yyin) { - fprintf(stderr, "%s: unable to open %s\n", argv[0], - file); - exit(1); - } - if (policydb_init(&parse_policy)) exit(1); /* We build this as a base policy first since that is all the parser understands */ @@ -513,28 +516,9 @@ /* Let sepol know if we are dealing with MLS support */ parse_policy.mls = mlspol; - id_queue = queue_create(); - if (!id_queue) { - fprintf(stderr, "%s: out of memory\n", argv[0]); - exit(1); - } policydbp = &parse_policy; - init_parser(1); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); - exit(1); - } - rewind(yyin); - init_parser(2); - source_file[0] = '\0'; - yyrestart(yyin); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); - exit(1); - } - queue_destroy(id_queue); - if (policydb_errors) + if (read_source_policy(policydbp, file, "checkpolicy") < 0) exit(1); if (hashtab_map(policydbp->p_levels.table, check_level, NULL)) @@ -546,18 +530,17 @@ } /* Linking takes care of optional avrule blocks */ - if (link_modules(NULL, &parse_policy, NULL, 0, 0)) { + if (link_modules(NULL, &parse_policy, NULL, 0, 0)) { fprintf(stderr, "Error while resolving optionals\n"); exit(1); } if (expand_module(NULL, &parse_policy, &policydb, 0, 1)) { - fprintf(stderr, "Error while expanding policy\n"); + fprintf(stderr, "Error while expanding policy\n"); exit(1); - } + } policydb_destroy(&parse_policy); policydbp = &policydb; - fclose(yyin); } if (policydb_load_isids(&policydb, &sidtab)) @@ -566,8 +549,9 @@ printf("%s: policy configuration loaded\n", argv[0]); if (outfile) { - printf("%s: writing binary representation (version %d) to %s\n", - argv[0], policyvers, outfile); + printf + ("%s: writing binary representation (version %d) to %s\n", + argv[0], policyvers, outfile); outfp = fopen(outfile, "w"); if (!outfp) { perror(outfile); @@ -634,39 +618,51 @@ FGETS(ans, sizeof(ans), stdin); if (isdigit(ans[0])) { tclass = atoi(ans); - if (!tclass || tclass > policydb.p_classes.nprim) { + if (!tclass + || tclass > policydb.p_classes.nprim) { printf("\nNo such class.\n"); break; } - cladatum = policydb.class_val_to_struct[tclass - 1]; + cladatum = + policydb.class_val_to_struct[tclass - 1]; } else { ans[strlen(ans) - 1] = 0; - cladatum = (class_datum_t *) hashtab_search(policydb.p_classes.table, - ans); + cladatum = + (class_datum_t *) hashtab_search(policydb. + p_classes. + table, + ans); if (!cladatum) { printf("\nNo such class\n"); break; } - tclass = cladatum->value; + tclass = cladatum->s.value; } if (!cladatum->comdatum && !cladatum->permissions.nprim) { - printf("\nNo access vector definition for that class\n"); + printf + ("\nNo access vector definition for that class\n"); break; } - ret = sepol_compute_av(ssid, tsid, tclass, 0, - &avd); + ret = sepol_compute_av(ssid, tsid, tclass, 0, &avd); switch (ret) { case 0: printf("\nallowed {"); for (i = 1; i <= sizeof(avd.allowed) * 8; i++) { if (avd.allowed & (1 << (i - 1))) { v.val = i; - ret = hashtab_map(cladatum->permissions.table, - find_perm, &v); + ret = + hashtab_map(cladatum-> + permissions. + table, + find_perm, &v); if (!ret && cladatum->comdatum) { - ret = hashtab_map(cladatum->comdatum->permissions.table, - find_perm, &v); + ret = + hashtab_map + (cladatum-> + comdatum-> + permissions.table, + find_perm, &v); } if (ret) printf(" %s", v.name); @@ -686,7 +682,7 @@ FGETS(ans, sizeof(ans), stdin); ssid = atoi(ans); ret = sepol_sid_to_context(ssid, - &scontext, &scontext_len); + &scontext, &scontext_len); switch (ret) { case 0: printf("\nscontext %s\n", scontext); @@ -707,8 +703,7 @@ FGETS(ans, sizeof(ans), stdin); scontext_len = strlen(ans); ans[scontext_len - 1] = 0; - ret = sepol_context_to_sid(ans, scontext_len, - &ssid); + ret = sepol_context_to_sid(ans, scontext_len, &ssid); switch (ret) { case 0: printf("\nsid %d\n", ssid); @@ -739,27 +734,35 @@ FGETS(ans, sizeof(ans), stdin); if (isdigit(ans[0])) { tclass = atoi(ans); - if (!tclass || tclass > policydb.p_classes.nprim) { + if (!tclass + || tclass > policydb.p_classes.nprim) { printf("\nNo such class.\n"); break; } } else { ans[strlen(ans) - 1] = 0; - cladatum = (class_datum_t *) hashtab_search(policydb.p_classes.table, - ans); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:53:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B450E16A4E0 for ; Tue, 15 Aug 2006 18:53:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DEF143D78 for ; Tue, 15 Aug 2006 18:53:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5AC4246C65 for ; Tue, 15 Aug 2006 14:53:21 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6933C56649; Tue, 15 Aug 2006 18:53:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 647EA16A4E5; Tue, 15 Aug 2006 18:53:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3FD7716A4DA for ; Tue, 15 Aug 2006 18:53:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7683943D6E for ; Tue, 15 Aug 2006 18:53:15 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIrFEg046713 for ; Tue, 15 Aug 2006 18:53:15 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIrFCm046710 for perforce@freebsd.org; Tue, 15 Aug 2006 18:53:15 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:53:15 GMT Message-Id: <200608151853.k7FIrFCm046710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104098 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:53:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=104098 Change 104098 by millert@millert_macbook on 2006/08/15 18:52:24 Install binary policy files in /etc/sedarwin/policy Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile#2 (text+ko) ==== @@ -36,8 +36,8 @@ install: ./update_plist --policy=$(POLICY) --migscs=sebsd_migscs ../sedarwin/mac_sedarwin.kext/Contents/Info.plist && make -C ../sedarwin mac_sedarwin.kext.tar install - $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${DESTDIR} - $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 sebsd_migscs ${DESTDIR} + $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${DESTDIR}/private/etc/sedarwin/policy + $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 sebsd_migscs ${DESTDIR}/private/etc/sedarwin/policy $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 failsafe_context ${DESTDIR}/private/etc/sedarwin/contexts $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/sedarwin (cd $(CURDIR)/.. && tar -X policy/excludes -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/ && tar -xf -) From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 18:54:34 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF29516A4DF for ; Tue, 15 Aug 2006 18:54:34 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E395C43D7B for ; Tue, 15 Aug 2006 18:54:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 59ACB46C6F for ; Tue, 15 Aug 2006 14:54:22 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4F84957D7D; Tue, 15 Aug 2006 18:54:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B95716A4DF; Tue, 15 Aug 2006 18:54:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E735616A4E2 for ; Tue, 15 Aug 2006 18:54:17 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B9B943D5A for ; Tue, 15 Aug 2006 18:54:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIsH2W046779 for ; Tue, 15 Aug 2006 18:54:17 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIsHTu046776 for perforce@freebsd.org; Tue, 15 Aug 2006 18:54:17 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:54:17 GMT Message-Id: <200608151854.k7FIsHTu046776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104099 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:54:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=104099 Change 104099 by millert@millert_macbook on 2006/08/15 18:53:16 Send kextd SIGHUP after updating policy data in the plist file Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile.install#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile.install#2 (text+ko) ==== @@ -22,3 +22,4 @@ install: ./update_plist --policy=$(POLICY) --migscs=sebsd_migscs ../../../../System/Library/Extensions/mac_sedarwin.kext/Contents/Info.plist touch /System/Library/Extensions /System/Library/Extensions/mac_sedarwin.kext + killall -HUP kextd From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 19:25:04 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 863BA16A4E1 for ; Tue, 15 Aug 2006 19:25:04 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D190743D45 for ; Tue, 15 Aug 2006 19:25:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C5C3646C4A for ; Tue, 15 Aug 2006 15:24:57 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5BF3F55533; Tue, 15 Aug 2006 19:24:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 56D7916A4E1; Tue, 15 Aug 2006 19:24:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 33A5A16A4DA for ; Tue, 15 Aug 2006 19:24:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E14D043D46 for ; Tue, 15 Aug 2006 19:24:56 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FJOudr049502 for ; Tue, 15 Aug 2006 19:24:56 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FJOuN0049499 for perforce@freebsd.org; Tue, 15 Aug 2006 19:24:56 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 19:24:56 GMT Message-Id: <200608151924.k7FJOuN0049499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104102 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 19:25:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=104102 Change 104102 by millert@millert_g4tower on 2006/08/15 19:24:18 Set execute bit Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/build/mkPolicyInfoPlist.sh#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/newvers.pl#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/build/mkPolicyInfoPlist.sh#2 (xtext/text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/newvers.pl#2 (xtext/text+ko) ==== From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 19:42:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 68A1C16A4DD for ; Tue, 15 Aug 2006 19:42:28 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB0F143D64 for ; Tue, 15 Aug 2006 19:42:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 53BFC46B6B for ; Tue, 15 Aug 2006 15:42:21 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 304C472BC4; Tue, 15 Aug 2006 19:42:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2814D16A4DF; Tue, 15 Aug 2006 19:42:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00AC516A4DA for ; Tue, 15 Aug 2006 19:42:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C110B43D67 for ; Tue, 15 Aug 2006 19:42:18 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FJgIvi050388 for ; Tue, 15 Aug 2006 19:42:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FJgIBG050385 for perforce@freebsd.org; Tue, 15 Aug 2006 19:42:18 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 19:42:18 GMT Message-Id: <200608151942.k7FJgIBG050385@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104103 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 19:42:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=104103 Change 104103 by millert@millert_g4tower on 2006/08/15 19:41:52 Process yacc and lex input files correctly. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/Makefile#3 (text+ko) ==== @@ -2,6 +2,9 @@ CFLAGS += -Wall -I../include -I../../libselinux/include -I../../libsepol/include +LFLAGS = -s +YFLAGS = -d + LIB = semanage OBJS = boolean_record.o booleans_active.o booleans_activedb.o \ booleans_file.o booleans_local.o booleans_policy.o \ @@ -24,7 +27,15 @@ RANLIB = ranlib INSTALL = install -all: lib$(LIB).a +all: conf-scan.c conf-parse.c lib$(LIB).a + +conf-scan.c: conf-scan.l conf-parse.h + $(LEX) $(LFLAGS) -o$@ $< + +conf-parse.h: conf-parse.c + +conf-parse.c: conf-parse.y + $(YACC) $(YFLAGS) -psemanage_ -o$@ $< install: all $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 0644 lib$(LIB).a \ From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 21:11:28 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 08B9216A4E7 for ; Tue, 15 Aug 2006 21:11:27 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9497343D7C for ; Tue, 15 Aug 2006 21:11:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0DE0746C31 for ; Tue, 15 Aug 2006 17:11:16 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 44C98CF5ED; Tue, 15 Aug 2006 21:08:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3957516A4E0; Tue, 15 Aug 2006 21:08:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1593416A4DD for ; Tue, 15 Aug 2006 21:08:15 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA1E643D45 for ; Tue, 15 Aug 2006 21:08:14 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FL8Ehv064962 for ; Tue, 15 Aug 2006 21:08:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FL8E4w064959 for perforce@freebsd.org; Tue, 15 Aug 2006 21:08:14 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 21:08:14 GMT Message-Id: <200608152108.k7FL8E4w064959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104120 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:11:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=104120 Change 104120 by millert@millert_g4tower on 2006/08/15 21:07:15 Policies shouldn't need to include mac.h - the entire policy interface should be in mac_policy.h Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_alloc.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#2 (text+ko) ==== @@ -40,7 +40,6 @@ #include -#include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#6 (text+ko) ==== @@ -73,7 +73,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_alloc.c#2 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include -#include #include #include From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 21:13:31 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32E3E16A4DD for ; Tue, 15 Aug 2006 21:13:31 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E29643D7B for ; Tue, 15 Aug 2006 21:13:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A57F246C31 for ; Tue, 15 Aug 2006 17:13:24 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DFB8E7329A; Tue, 15 Aug 2006 21:13:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D4CA316A4DF; Tue, 15 Aug 2006 21:13:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B71516A4DA for ; Tue, 15 Aug 2006 21:13:22 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3D3D43D76 for ; Tue, 15 Aug 2006 21:13:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLDL4G065305 for ; Tue, 15 Aug 2006 21:13:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLDLvf065302 for perforce@freebsd.org; Tue, 15 Aug 2006 21:13:21 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 21:13:21 GMT Message-Id: <200608152113.k7FLDLvf065302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104121 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:13:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=104121 Change 104121 by millert@millert_g4tower on 2006/08/15 21:12:23 Boolean function cansignal() must return value FALSE rather than an error code. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_sig.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_sig.c#2 (text+ko) ==== @@ -286,7 +286,7 @@ error = mac_check_proc_signal(uc, q, signum); if (error) - return (error); + return (0); #endif /* you can signal yourself */ if (p == q) From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 21:18:44 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01FCA16A4E0 for ; Tue, 15 Aug 2006 21:18:44 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 594E943D5F for ; Tue, 15 Aug 2006 21:18:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CC45C46C25 for ; Tue, 15 Aug 2006 17:18:32 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D739A558E8; Tue, 15 Aug 2006 21:18:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id CBAFF16A4DF; Tue, 15 Aug 2006 21:18:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A832A16A4DA for ; Tue, 15 Aug 2006 21:18:29 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3DE3143D5D for ; Tue, 15 Aug 2006 21:18:29 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLISkR065711 for ; Tue, 15 Aug 2006 21:18:28 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLISpj065708 for perforce@freebsd.org; Tue, 15 Aug 2006 21:18:28 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 21:18:28 GMT Message-Id: <200608152118.k7FLISpj065708@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104122 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:18:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=104122 Change 104122 by millert@millert_g4tower on 2006/08/15 21:17:27 Add explicit int return value for mac_check_ipc_method() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#2 (text+ko) ==== @@ -241,6 +241,7 @@ return (error); } +int mac_check_ipc_method(struct label *task, struct label *port, int msgid) { int error; From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 21:20:14 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B03D416A4DA for ; Tue, 15 Aug 2006 21:20:14 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9799E43DB5 for ; Tue, 15 Aug 2006 21:19:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 262AB46C1E for ; Tue, 15 Aug 2006 17:19:48 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8B795559F4; Tue, 15 Aug 2006 21:19:44 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 803A416A4EA; Tue, 15 Aug 2006 21:19:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AE0E16A4E8 for ; Tue, 15 Aug 2006 21:19:44 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D94AC43D9A for ; Tue, 15 Aug 2006 21:19:31 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLJUZB065774 for ; Tue, 15 Aug 2006 21:19:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLJU0F065771 for perforce@freebsd.org; Tue, 15 Aug 2006 21:19:30 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 21:19:30 GMT Message-Id: <200608152119.k7FLJU0F065771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104123 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:20:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=104123 Change 104123 by millert@millert_g4tower on 2006/08/15 21:19:08 Add extattr_test policy. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/extattr_test/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/extattr_test/README#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/extattr_test/mac_extattr_test.c#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ SUBDIR= basetest color console count fwinteg ipctrace mls none \ - readonly stacktrace stub test vanity xattr + readonly stacktrace stub test vanity xattr extattr_test SUBDIR+= sedarwin include mk/subdir.mk From owner-trustedbsd-cvs@FreeBSD.ORG Tue Aug 15 21:25:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AD0A16A4DA for ; Tue, 15 Aug 2006 21:25:18 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F35AD43D9E for ; Tue, 15 Aug 2006 21:24:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 32E5746C39 for ; Tue, 15 Aug 2006 17:23:52 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CF7CFCF733; Tue, 15 Aug 2006 21:22:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C3CF616A4DD; Tue, 15 Aug 2006 21:22:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9DF0E16A4DF for ; Tue, 15 Aug 2006 21:22:37 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBA2943DA2 for ; Tue, 15 Aug 2006 21:21:43 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLLYmi066013 for ; Tue, 15 Aug 2006 21:21:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLLXMd066010 for perforce@freebsd.org; Tue, 15 Aug 2006 21:21:33 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 21:21:33 GMT Message-Id: <200608152121.k7FLLXMd066010@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104124 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:25:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=104124 Change 104124 by millert@millert_g4tower on 2006/08/15 21:20:37 Cruft removal: Remove unused reserved fields in struct label. Remove bogus definitions for atomic operations. Remove code for debugging inconsist vnode labels. Remove unneeded include of mac.h in policy modules. Remove MAC_DEBUG. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/conf/MASTER#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_msg.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_sem.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_shm.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/_label.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/conf/MASTER#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_label.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_posix_sem.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_posix_shm.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_sem.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_shm.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/basetest/mac_basetest.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/fwinteg/mac_fwinteg.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/conf/MASTER#2 (text+ko) ==== @@ -94,7 +94,6 @@ options HW_FOOTPRINT # Cache footprint support # options MAC # Mandatory ACcess Control options MAC_SOCKET # MAC socket labels -#options MAC_DEBUG options LCTX # Login Context options MACH # Standard Mach features # options MACH_ASSERT # Compile in assertions # ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_msg.c#2 (text+ko) ==== @@ -66,13 +66,6 @@ #define MSG_DEBUG #undef MSG_DEBUG_OK -/* Uncomment this line to see MAC debugging output. */ -/* #define MAC_DEBUG */ -#ifdef MAC_DEBUG -#define MPRINTF(a) printf(a) -#else -#define MPRINTF(a) -#endif static void msg_freehdr(struct msg *msghdr); typedef int sy_call_t(struct proc *, void *, int *); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_sem.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * support for mandatory and extensible security protections. This notice * is included in support of clause 2.2 (b) of the Apple Public License, * Version 2.0. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. */ #include @@ -62,14 +62,6 @@ /* Uncomment this line to see the debugging output */ /* #define SEM_DEBUG */ -/* Uncomment this line to see MAC debugging output. */ -/* #define MAC_DEBUG */ -#ifdef MAC_DEBUG -#define MPRINTF(a) printf(a) -#else -#define MPRINTF(a) -#endif - #define M_SYSVSEM M_TEMP ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_shm.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ * support for mandatory and extensible security protections. This notice * is included in support of clause 2.2 (b) of the Apple Public License, * Version 2.0. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. */ @@ -91,14 +91,6 @@ #include -/* Uncomment this line to see MAC debugging output. */ -/* #define MAC_DEBUG */ -#ifdef MAC_DEBUG -#define MPRINTF(a) printf a -#else -#define MPRINTF(a) -#endif - static void shminit(void *); #if 0 SYSINIT(sysv_shm, SI_SUB_SYSV_SHM, SI_ORDER_FIRST, shminit, NULL) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/_label.h#2 (text+ko) ==== @@ -45,8 +45,6 @@ #define MAC_MAX_SLOTS 8 #define MAC_FLAG_INITIALIZED 0x0000001 /* Is initialized for use. */ -#define MAC_FLAG_CLEAN 0x0000002 /* Is cleaned for re-use. */ -#define MAC_FLAG_ASSOC 0x0000004 /* */ struct label { int l_flags; @@ -54,9 +52,6 @@ void *l_ptr; long l_long; } l_perpolicy[MAC_MAX_SLOTS]; - void *reserved1; - void *reserved2; - void *reserved3; }; #endif /* !_SECURITY_LABEL_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/conf/MASTER#2 (text+ko) ==== @@ -55,5 +55,4 @@ options AUDIT # Security event auditing options MAC # Mandatory Access Controls options MAC_ALWAYS_LABEL_MBUF -#options MAC_DEBUG options LCTX # Login Context ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#2 (text+ko) ==== @@ -152,51 +152,6 @@ &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " "copy-on-write semantics, or by removing all write access"); -#ifdef MAC_DEBUG -SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, - "TrustedBSD MAC debug info"); - -static int mac_debug_label_fallback = 0; -SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, - &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" - "when label is corrupted."); -TUNABLE_INT("security.mac.debug_label_fallback", - &mac_debug_label_fallback); - -SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, - "TrustedBSD MAC object counters"); - -u_int nmaccreds=0, nmacmounts=0, nmactemp=0, nmacvnodes=0, - nmacdevfsdirents=0, nmacprocs=0, nmac_psem=0, nmac_pshm=0, - nmacsockets=0, - nmacsysvsemas=0, nmacsysvshms=0, nmacmbufs=0; - -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, creds, CTLFLAG_RD, - &nmaccreds, 0, "number of ucreds in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, procs, CTLFLAG_RD, - &nmacprocs, 0, "number of procs in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mounts, CTLFLAG_RD, - &nmacmounts, 0, "number of mounts in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, temp, CTLFLAG_RD, - &nmactemp, 0, "number of temporary labels in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, vnodes, CTLFLAG_RD, - &nmacvnodes, 0, "number of vnodes in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, sockets, CTLFLAG_RD, - &nmacsockets, 0, "number of sockets in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, devfsdirents, CTLFLAG_RD, - &nmacdevfsdirents, 0, "number of devfs dirents inuse"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, posix_sem, CTLFLAG_RD, - &nmac_psem, 0, "number of posix semaphore identifiers in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, posix_shm, CTLFLAG_RD, - &nmac_pshm, 0, "number of posix shared memory identifiers in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, sysv_sems, CTLFLAG_RD, - &nmacsysvsemas, 0, "number of sysv ipc semaphore identifiers inuse"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, sysv_shms, CTLFLAG_RD, - &nmacsysvsemas, 0, "number of sysv shared memory identifiers inuse"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mbufs, CTLFLAG_RD, - &nmacmbufs, 0, "number of mbuf identifiers inuse"); -#endif - /* * mac_static_base_mpc holds a pointer to the single instance of the base * policy MAC configuration structure. This pointer must be set at boot, @@ -488,22 +443,6 @@ sysctl_register_oid(&sysctl__security_mac_enforce_vm); sysctl_register_oid(&sysctl__security_mac_mmap_revocation); sysctl_register_oid(&sysctl__security_mac_mmap_revocation_via_cow); -#ifdef MAC_DEBUG - sysctl_register_oid(&sysctl__security_mac_debug); - sysctl_register_oid(&sysctl__security_mac_debug_label_fallback); - sysctl_register_oid(&sysctl__security_mac_debug_counters); - sysctl_register_oid(&sysctl__security_mac_debug_counters_creds); - sysctl_register_oid(&sysctl__security_mac_debug_counters_procs); - sysctl_register_oid(&sysctl__security_mac_debug_counters_mounts); - sysctl_register_oid(&sysctl__security_mac_debug_counters_temp); - sysctl_register_oid(&sysctl__security_mac_debug_counters_vnodes); - sysctl_register_oid(&sysctl__security_mac_debug_counters_devfsdirents); - sysctl_register_oid(&sysctl__security_mac_debug_counters_posix_sem); - sysctl_register_oid(&sysctl__security_mac_debug_counters_posix_shm); - sysctl_register_oid(&sysctl__security_mac_debug_counters_sysv_sems); - sysctl_register_oid(&sysctl__security_mac_debug_counters_sysv_shms); - sysctl_register_oid(&sysctl__security_mac_debug_counters_mbufs); -#endif printf("MAC Framework successfully initialized\n"); /* Call bsd init functions of already loaded policies */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#2 (text+ko) ==== @@ -66,20 +66,6 @@ SYSCTL_DECL(_security); SYSCTL_DECL(_security_mac); -#ifdef MAC_DEBUG -SYSCTL_DECL(_security_mac_debug); -SYSCTL_DECL(_security_mac_debug_counters); - -#define MAC_DEBUG_COUNTER_INC(x) atomic_add_int(x, 1); -#define MAC_DEBUG_COUNTER_DEC(x) atomic_subtract_int(x, 1); - -#else - -#define MAC_DEBUG_COUNTER_INC(x) -#define MAC_DEBUG_COUNTER_DEC(x) - -#endif /* MAC_DEBUG */ - extern int mac_late; LIST_HEAD(mac_policy_list_t, mac_policy_conf); @@ -164,8 +150,6 @@ void mac_labelzone_init(void); struct label *mac_labelzone_alloc(int flags); void mac_labelzone_free(struct label *label); -void mac_labelzone_clean(struct label *label); -void mac_labelzone_associate(struct label *label); void mac_init_label(struct label *label); void mac_destroy_label(struct label *label); @@ -540,9 +524,6 @@ #define ASSERT_VOP_LOCKED(vp,msg) -#define atomic_add_int(P, V) (*(u_int*)(P) += (V)) -#define atomic_subtract_int(P, V) (*(u_int*)(P) -= (V)) - struct __mac_get_pid_args; struct __mac_get_proc_args; struct __mac_set_proc_args; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_label.c#2 (text+ko) ==== @@ -58,10 +58,11 @@ l = (struct label *) zalloc_noblock(zone_label); if (l == NULL) return (NULL); - } else + } else { l = (struct label *) zalloc(zone_label); + } bzero(l, sizeof(struct label)); - l->l_flags = MAC_FLAG_INITIALIZED | MAC_FLAG_CLEAN; + l->l_flags = MAC_FLAG_INITIALIZED; return (l); } @@ -77,42 +78,3 @@ bzero(l, sizeof(struct label)); zfree(zone_label, l); } - -void -mac_labelzone_clean(struct label *l) -{ - - if (l == NULL) - panic("Clean of NULL MAC label\n"); - - if ((l->l_flags & MAC_FLAG_INITIALIZED) == 0) - panic("Clean of uninitialized label\n"); - -#if 0 - /* This case is probably OK */ - if (l->l_flags & MAC_FLAG_CLEAN) { - printf("Clean of already clean label, flags=%d\n", l->l_flags); - return; - } -#endif - - l->l_flags |= MAC_FLAG_CLEAN; - l->l_flags &= ~MAC_FLAG_ASSOC; -} - -void -mac_labelzone_associate(struct label *l) -{ - - if (l == NULL) - panic("Associate of NULL MAC label\n"); - - if ((l->l_flags & MAC_FLAG_INITIALIZED) == 0) - panic("Associate of uninitialized label\n"); - - if (l->l_flags & MAC_FLAG_ASSOC) - printf("Associate of already associated label\n"); - - l->l_flags &= ~MAC_FLAG_CLEAN; - l->l_flags |= MAC_FLAG_ASSOC; -} ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#2 (text+ko) ==== @@ -40,12 +40,8 @@ #include -#ifdef MAC_DEBUG -extern u_int nmacmbufs; -#endif +int mac_label_mbufs = 1; /* Exported via sysctl in mac_base.c */ -int mac_label_mbufs = 1; - struct label * mac_mbuf_to_label(struct mbuf *mbuf) { @@ -86,7 +82,7 @@ MAC_CHECK(init_mbuf_label, label, flag); if (error) printf("%s(): mpo_init_mbuf_label() failed!\n", __func__); - MAC_DEBUG_COUNTER_INC(&nmacmbufs); + return (error); } @@ -98,7 +94,6 @@ label = (struct label *)(tag + 1); MAC_PERFORM(destroy_mbuf_label, label); mac_destroy_label(label); - MAC_DEBUG_COUNTER_DEC(&nmacmbufs); return; } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#2 (text+ko) ==== @@ -49,12 +49,6 @@ &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); TUNABLE_INT("security.mac.enforce_pipe", &mac_enforce_pipe); -#ifdef MAC_DEBUG -static unsigned int nmacpipes; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, pipes, CTLFLAG_RD, - &nmacpipes, 0, "number of pipes in use"); -#endif - /* Define this to PIPE_LOCK_ASSERT(x, y) if mutex assertions are desired. */ #define MAC_PIPE_LOCK_ASSERT(x, y) @@ -65,7 +59,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(init_pipe_label, label); - MAC_DEBUG_COUNTER_INC(&nmacpipes); return (label); } @@ -82,7 +75,6 @@ MAC_PERFORM(destroy_pipe_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacpipes); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_posix_sem.c#2 (text+ko) ==== @@ -46,10 +46,6 @@ &mac_enforce_posix_sem, 0, "Enforce MAC policy on Posix Semaphores"); TUNABLE_INT("security.mac.enforce_posix_sem", &mac_enforce_posix_sem); -#ifdef MAC_DEBUG -extern u_int nmac_psem; -#endif - static struct label * mac_posix_sem_label_alloc(void) { @@ -57,7 +53,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_posix_sem_label, label); - MAC_DEBUG_COUNTER_INC(&nmac_psem); return (label); } @@ -74,7 +69,6 @@ MAC_PERFORM(destroy_posix_sem_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmac_psem); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_posix_shm.c#2 (text+ko) ==== @@ -46,10 +46,6 @@ &mac_enforce_pshm, 0, "Enforce MAC policy on Posix Shared memory"); TUNABLE_INT("security.mac.enforce_posix_shm", &mac_enforce_posix_shm); -#ifdef MAC_DEBUG -extern u_int nmac_pshm; -#endif - static struct label * mac_posix_shm_label_alloc(void) { @@ -57,7 +53,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_posix_shm_label, label); - MAC_DEBUG_COUNTER_INC(&nmac_pshm); return (label); } @@ -74,7 +69,6 @@ MAC_PERFORM(destroy_posix_shm_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmac_pshm); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#2 (text+ko) ==== @@ -47,10 +47,6 @@ #include -#ifdef MAC_DEBUG -extern u_int nmaccreds, nmacprocs; -#endif - struct label * mac_cred_label_alloc(void) { @@ -58,7 +54,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_cred_label, label); - MAC_DEBUG_COUNTER_INC(&nmaccreds); return (label); } @@ -76,7 +71,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_proc_label, label); - MAC_DEBUG_COUNTER_INC(&nmacprocs); return (label); } @@ -92,7 +86,6 @@ { MAC_PERFORM(destroy_cred_label, label); - MAC_DEBUG_COUNTER_DEC(&nmaccreds); mac_labelzone_free(label); } @@ -125,7 +118,6 @@ { MAC_PERFORM(destroy_proc_label, label); - MAC_DEBUG_COUNTER_DEC(&nmacprocs); mac_labelzone_free(label); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#2 (text+ko) ==== @@ -64,9 +64,6 @@ extern int mac_enforce_socket; -#ifdef MAC_DEBUG -extern u_int nmacsockets; -#endif struct label * mac_socket_label_alloc(int flag) @@ -84,7 +81,7 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacsockets); + return (label); } @@ -104,7 +101,7 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacsockets); + return (label); } @@ -130,7 +127,6 @@ MAC_PERFORM(destroy_socket_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsockets); } static void @@ -139,7 +135,6 @@ MAC_PERFORM(destroy_socket_peer_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsockets); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_sem.c#2 (text+ko) ==== @@ -52,10 +52,6 @@ &mac_enforce_sysv_sem, 0, "Enforce MAC policy on System V IPC Semaphores"); TUNABLE_INT("security.mac.enforce_sysv_sem", &mac_enforce_sysv_sem); -#ifdef MAC_DEBUG -extern u_int nmacsysvsemas; -#endif - static struct label * mac_sysv_sem_label_alloc(void) { @@ -63,7 +59,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_sysv_sem_label, label); - MAC_DEBUG_COUNTER_INC(&nmacsysvsemas); return (label); } @@ -80,7 +75,6 @@ MAC_PERFORM(destroy_sysv_sem_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsysvsemas); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_shm.c#2 (text+ko) ==== @@ -55,10 +55,6 @@ "Enforce MAC policy on System V IPC shared memory"); TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_shm); -#ifdef MAC_DEBUG -extern u_int nmacsysvshms; -#endif - static struct label * mac_sysv_shm_label_alloc(void) { @@ -66,7 +62,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_sysv_shm_label, label); - MAC_DEBUG_COUNTER_INC(&nmacsysvshms); return (label); } @@ -83,7 +78,6 @@ MAC_PERFORM(destroy_sysv_shm_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsysvshms); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#2 (text+ko) ==== @@ -48,15 +48,7 @@ #include -#ifdef MAC_DEBUG -extern u_int nmacmounts, nmacvnodes, nmaccleanvnodes, nmacassocvnodes, - nmacdevfsdirents; - -extern u_int nmacassocsingle, nmacassocxattr, nmacassoccreate, nmacassoccopy, - nmacassocdevfs; -#endif - static struct label * mac_devfsdirent_label_alloc(void) { @@ -64,7 +56,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_devfsdirent_label, label); - MAC_DEBUG_COUNTER_INC(&nmacdevfsdirents); return (label); } @@ -82,7 +73,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_mount_label, label); - MAC_DEBUG_COUNTER_INC(&nmacmounts); return (label); } @@ -93,7 +83,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_mount_fs_label, label); - MAC_DEBUG_COUNTER_INC(&nmacmounts); return (label); } @@ -120,7 +109,6 @@ { vp->v_label = mac_vnode_label_alloc(); - MAC_DEBUG_COUNTER_INC(&nmacvnodes); } /* @@ -132,18 +120,7 @@ mac_cleanup_vnode(vnode_t vp) { - if ((vp->v_label->l_flags & MAC_FLAG_CLEAN) && - ((vp->v_flag & VSYSTEM) == 0)) { - vprint("Second clean", vp); - printf(", vp=%x, vid=%d mp=%p fs=%s\n", - vp, vp->v_id, vp->v_mount, - vp->v_mount ? vp->v_mount->mnt_vfsstat.f_mntonname : "none" - ); - } - MAC_PERFORM(cleanup_vnode_label, vp->v_label); - mac_labelzone_clean(vp->v_label); - MAC_DEBUG_COUNTER_INC(&nmaccleanvnodes); } static void @@ -152,7 +129,6 @@ MAC_PERFORM(destroy_devfsdirent_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacdevfsdirents); } void @@ -169,7 +145,6 @@ MAC_PERFORM(destroy_mount_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacmounts); } static void @@ -178,7 +153,6 @@ MAC_PERFORM(destroy_mount_fs_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacmounts); } void @@ -202,7 +176,6 @@ MAC_PERFORM(destroy_vnode_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacvnodes); } void @@ -211,7 +184,6 @@ mac_vnode_label_free(vp->v_label); vp->v_label = NULL; - MAC_DEBUG_COUNTER_DEC(&nmacvnodes); } void @@ -219,8 +191,6 @@ { MAC_PERFORM(copy_vnode_label, src, dest); - mac_labelzone_associate(dest); - MAC_DEBUG_COUNTER_INC(&nmacassoccopy); } @@ -261,7 +231,6 @@ int error; MAC_INTERNALIZE_LIST(vnode, label, string); - mac_labelzone_associate(label); return (error); } @@ -272,7 +241,6 @@ int error; MAC_INTERNALIZE_LIST(mount_fs, label, string); - mac_labelzone_associate(label); return (error); } @@ -315,9 +283,6 @@ struct vnode *vp) { - mac_labelzone_associate(vp->v_label); - MAC_DEBUG_COUNTER_INC(&nmacassocdevfs); - MAC_PERFORM(associate_vnode_devfs, mp, mp ? mp->mnt_fslabel : NULL, de, de->dn_label, vp, vp->v_label); } @@ -332,10 +297,6 @@ MAC_CHECK(associate_vnode_extattr, mp, mp->mnt_fslabel, vp, vp->v_label); - mac_labelzone_associate(vp->v_label); - MAC_DEBUG_COUNTER_INC(&nmacassocxattr); - MAC_DEBUG_COUNTER_DEC(&nmaccleanvnodes); - return (error); } @@ -343,13 +304,8 @@ mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp) { - MAC_PERFORM(associate_vnode_singlelabel, mp, mp->mnt_fslabel, vp, - vp->v_label); - - mac_labelzone_associate(vp->v_label); - MAC_DEBUG_COUNTER_INC(&nmacassocvnodes); - MAC_DEBUG_COUNTER_DEC(&nmaccleanvnodes); - MAC_DEBUG_COUNTER_INC(&nmacassocsingle); + MAC_PERFORM(associate_vnode_singlelabel, mp, + mp ? mp->mnt_fslabel : NULL, vp, vp->v_label); } int @@ -361,10 +317,6 @@ ASSERT_VOP_LOCKED(dvp, __func__); ASSERT_VOP_LOCKED(vp, __func__); - mac_labelzone_associate(vp->v_label); - MAC_DEBUG_COUNTER_INC(&nmacassoccreate); - MAC_DEBUG_COUNTER_DEC(&nmaccleanvnodes); - MAC_CHECK(create_vnode_extattr, cred, mp, mp->mnt_fslabel, dvp, dvp->v_label, vp, vp->v_label, cnp); ==== //depot/projects/trustedbsd/sedarwin8/policies/basetest/mac_basetest.c#2 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include -#include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/fwinteg/mac_fwinteg.c#2 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include -#include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#2 (text+ko) ==== @@ -119,8 +119,6 @@ #ifdef APPLE #define TUNABLE_INT(x, y) -#define atomic_add_int(P, V) (*(u_int*)(P) += (V)) -#define atomic_subtract_int(P, V) (*(u_int*)(P) -= (V)) #endif /* APPLE */ #define SLOT(l) ((struct mac_mls *)LABEL_TO_SLOT((l), mac_mls_slot).l_ptr) @@ -147,10 +145,6 @@ &mac_mls_enabled, 0, "Enforce MAC/MLS policy"); TUNABLE_INT("security.mac.mls.enabled", &mac_mls_enabled); -static int destroyed_not_inited; -SYSCTL_INT(_security_mac_mls, OID_AUTO, destroyed_not_inited, CTLFLAG_RD, - &destroyed_not_inited, 0, "Count of labels destroyed but not inited"); - static int ptys_equal = 0; SYSCTL_INT(_security_mac_mls, OID_AUTO, ptys_equal, CTLFLAG_RW, &ptys_equal, 0, "Label pty devices as mls/equal on create"); @@ -200,7 +194,7 @@ if (mac_mls != NULL) mac_zfree(zone_mls, (void *)mac_mls); else - atomic_add_int(&destroyed_not_inited, 1); + panic("Mac MLS Module: mls_free called on NULL label"); } static int @@ -561,7 +555,6 @@ sysctl_register_oid(&sysctl__security_mac_mls); sysctl_register_oid(&sysctl__security_mac_mls_label_size); sysctl_register_oid(&sysctl__security_mac_mls_enabled); - sysctl_register_oid(&sysctl__security_mac_mls_destroyed_not_inited); sysctl_register_oid(&sysctl__security_mac_mls_ptys_equal); sysctl_register_oid(&sysctl__security_mac_mls_revocation_enabled); sysctl_register_oid(&sysctl__security_mac_mls_max_compartments); @@ -1925,26 +1918,6 @@ return (MAC_AUDIT_DEFAULT); } -#ifdef LATER -static int -mac_mls_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, - struct ifnet *ifnet, struct label *ifnetlabel) -{ - struct mac_mls *a, *b; - - if (!mac_mls_enabled) - return (0); - - a = SLOT(bpflabel); - b = SLOT(ifnetlabel); - - if (mac_mls_equal_effective(a, b)) - return (0); - - MLS_RETURN (EACCES); -} -#endif /* LATER */ - static int mac_mls_request_object_label (struct label *subj, struct label *obj, const char *serv, struct label *out) @@ -2705,6 +2678,15 @@ return (0); } +/* + * All System V shared memory operations modify struct shmid_ds. + * The MLS policy must require both read and write access for all operations. + */ + +/* + * shmat() modifies shmid_ds.shm_atime (last shmat() time) + * shmat() modifies shmid_ds.shm_nattch (# of current attaches) + */ static int mac_mls_check_sysv_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) @@ -2717,15 +2699,13 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmseglabel); - if (!mac_mls_dominate_effective(subj, obj)) - MLS_RETURN (EACCES); - if ((shmflg & SHM_RDONLY) == 0) - if (!mac_mls_dominate_effective(obj, subj)) - MLS_RETURN (EACCES); - - return (0); + MLS_RETURN_CHECK(MLS_CHECK_EQUAL); } +/* + * shmctl() modifies shmid_ds.shm_ctime (last change by shmctl()) + * shmctl() modifies shmid_ds.shm_lpid (pid of last shm op) + */ static int mac_mls_check_sysv_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int cmd) @@ -2738,28 +2718,12 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmseglabel); - switch(cmd) { - case IPC_RMID: - case IPC_SET: - if (!mac_mls_dominate_effective(obj, subj)) - MLS_RETURN (EACCES); - break; - - case IPC_STAT: - if (!mac_mls_dominate_effective(subj, obj)) - MLS_RETURN (EACCES); - break; - default: - MLS_RETURN (EACCES); - } - - return (0); + MLS_RETURN_CHECK(MLS_CHECK_EQUAL); } /* - * TODO: Do we check the integrity of the implicit write access caused - * by the bookkeeping tasks associated with the shmdt call, which may - * modify/delete the shmseg meta-data and/or the shared segment itself? + * shmdt() modifies shmid_ds.shm_dtime (last shmdt() time) + * shmdt() modifies shmid_ds.shm_nattch (# of current attaches) */ static int mac_mls_check_sysv_shmdt(struct ucred *cred, struct shmid_kernel *shmsegptr, @@ -2773,12 +2737,12 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmseglabel); - if (!mac_mls_dominate_effective(obj, subj)) - return (EACCES); - - return (0); + MLS_RETURN_CHECK(MLS_CHECK_EQUAL); } +/* + * shmget() modifies shmid_ds.shm_lpid (pid of last shm op) + */ static int mac_mls_check_sysv_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) @@ -2791,10 +2755,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmseglabel); - if (!mac_mls_dominate_effective(subj, obj)) - MLS_RETURN (EACCES); - - return (0); + MLS_RETURN_CHECK(MLS_CHECK_EQUAL); } static int @@ -3180,18 +3141,26 @@ struct label *vlabel) { struct mac_mls *subj, *obj; + int error; if (!mac_mls_enabled) return (0); - /* XXXMAC: should we ever deny permission to turn accounting off? */ - if (vlabel == NULL) - return (0); + subj = SLOT(cred->cr_label); + error = mac_mls_subject_privileged(subj); - subj = SLOT(cred->cr_label); - obj = SLOT(vlabel); + if (error == 0) { + if (vlabel == NULL) { + KASSERT((vp == NULL), + ("mac_mls_check_system_acct: no label for vp")); + } else { + obj = SLOT(vlabel); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 12:40:20 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BA1016A4DA for ; Wed, 16 Aug 2006 12:40:20 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7E6943DDD for ; Wed, 16 Aug 2006 12:36:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8390546D20 for ; Wed, 16 Aug 2006 08:36:01 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5C12F58CF7; Wed, 16 Aug 2006 12:36:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 51A4216A4DF; Wed, 16 Aug 2006 12:36:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1596316A4DD for ; Wed, 16 Aug 2006 12:36:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57DE443EC2 for ; Wed, 16 Aug 2006 12:32:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GCWPF8057256 for ; Wed, 16 Aug 2006 12:32:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GCWPv7057253 for perforce@freebsd.org; Wed, 16 Aug 2006 12:32:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 12:32:25 GMT Message-Id: <200608161232.k7GCWPv7057253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104209 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:40:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=104209 Change 104209 by rwatson@rwatson_zoo on 2006/08/16 12:31:56 Comment no longer needed, values confirmed in OpenSolaris. Annotate meaning of constants. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#22 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#22 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#22 $ */ #ifndef _LIBBSM_H_ @@ -82,11 +82,10 @@ #define BSM_TEXTBUFSZ MAX_AUDITSTRING_LEN /* OpenSSH compatibility */ /* - * These are referenced in Solaris 9 au_open(3BSM); values are guesses. - * Provided for OpenSSH compatibility. + * Arguments to au_close(3). */ -#define AU_TO_NO_WRITE 0 -#define AU_TO_WRITE 1 +#define AU_TO_NO_WRITE 0 /* Abandon audit record. */ +#define AU_TO_WRITE 1 /* Commit audit record. */ __BEGIN_DECLS struct au_event_ent { From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 12:42:32 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D6A916A559 for ; Wed, 16 Aug 2006 12:42:32 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 939E943D46 for ; Wed, 16 Aug 2006 12:38:52 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2377746B9F for ; Wed, 16 Aug 2006 08:38:52 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A8EB256501; Wed, 16 Aug 2006 12:38:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9516816A513; Wed, 16 Aug 2006 12:38:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A5B816A510 for ; Wed, 16 Aug 2006 12:38:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 895D343E0F for ; Wed, 16 Aug 2006 12:34:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GCYUvm057467 for ; Wed, 16 Aug 2006 12:34:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GCYSAu057464 for perforce@freebsd.org; Wed, 16 Aug 2006 12:34:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 12:34:28 GMT Message-Id: <200608161234.k7GCYSAu057464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104211 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:42:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=104211 Change 104211 by rwatson@rwatson_zoo on 2006/08/16 12:33:42 Rename MAX_ARGS and MAX_ENV by inserting BSM_ in front, in order to reduce the chances of a name space collision. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#23 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#23 $ */ #ifndef _LIBBSM_H_ @@ -37,8 +37,8 @@ * solely to allow OpenSSH to compile; Darwin/Apple code should not use them. */ -#define MAX_ARGS 10 -#define MAX_ENV 10 +#define BSM_MAX_ARGS 10 +#define BSM_MAX_ENV 10 #include #include @@ -227,7 +227,7 @@ */ typedef struct { u_int32_t count; - char *text[MAX_ARGS]; + char *text[BSM_MAX_ARGS]; } au_execarg_t; /* @@ -236,7 +236,7 @@ */ typedef struct { u_int32_t count; - char *text[MAX_ENV]; + char *text[BSM_MAX_ENV]; } au_execenv_t; /* From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 12:45:03 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 900AB16A4DF for ; Wed, 16 Aug 2006 12:45:03 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F184F43D66 for ; Wed, 16 Aug 2006 12:44:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 69B1846C30 for ; Wed, 16 Aug 2006 08:44:32 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C783573AA9; Wed, 16 Aug 2006 12:44:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B817916A4FB; Wed, 16 Aug 2006 12:44:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 79A7F16A4DE for ; Wed, 16 Aug 2006 12:44:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8B0E43DC4 for ; Wed, 16 Aug 2006 12:43:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GChhnr057959 for ; Wed, 16 Aug 2006 12:43:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GChhD1057956 for perforce@freebsd.org; Wed, 16 Aug 2006 12:43:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 12:43:43 GMT Message-Id: <200608161243.k7GChhD1057956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104212 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:45:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=104212 Change 104212 by rwatson@rwatson_zoo on 2006/08/16 12:42:40 Remove unused data type. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#24 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#24 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#23 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#24 $ */ #ifndef _LIBBSM_H_ @@ -38,7 +38,7 @@ */ #define BSM_MAX_ARGS 10 -#define BSM_MAX_ENV 10 +#define BSM_MAX_ENV 10 #include #include @@ -137,15 +137,6 @@ __BEGIN_DECLS -/* - * Internal representation of audit user in libnsl. - */ -typedef struct au_user_str_s { - char *au_name; - char *au_always; - char *au_never; -} au_user_str_t; - typedef struct au_tid32 { u_int32_t port; u_int32_t addr; From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 12:45:35 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 175B316A4DF for ; Wed, 16 Aug 2006 12:45:35 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0870643D60 for ; Wed, 16 Aug 2006 12:45:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7915A46C25 for ; Wed, 16 Aug 2006 08:45:12 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CCEBC56BE1; Wed, 16 Aug 2006 12:45:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C1CD816A4E6; Wed, 16 Aug 2006 12:45:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8879216A4DA for ; Wed, 16 Aug 2006 12:45:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99DD543D58 for ; Wed, 16 Aug 2006 12:44:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GCij7K057998 for ; Wed, 16 Aug 2006 12:44:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GCijNS057995 for perforce@freebsd.org; Wed, 16 Aug 2006 12:44:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 12:44:45 GMT Message-Id: <200608161244.k7GCijNS057995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104213 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:45:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=104213 Change 104213 by rwatson@rwatson_zoo on 2006/08/16 12:43:52 Update comment: yes it does. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#25 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#25 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#24 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#25 $ */ #ifndef _LIBBSM_H_ @@ -719,8 +719,6 @@ /* * Functions relating to querying audit event information. - * - * XXXRW: getauevnonam() has no _r version? */ void setauevent(void); void endauevent(void); From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 12:51:42 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5392616A4DD for ; Wed, 16 Aug 2006 12:51:42 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42F6743D49 for ; Wed, 16 Aug 2006 12:51:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C78A446C25 for ; Wed, 16 Aug 2006 08:51:40 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E85165620A; Wed, 16 Aug 2006 12:50:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DCC6A16A4E2; Wed, 16 Aug 2006 12:50:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B080E16A4DA for ; Wed, 16 Aug 2006 12:50:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7ADE143D49 for ; Wed, 16 Aug 2006 12:50:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GCosP0066115 for ; Wed, 16 Aug 2006 12:50:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GCosTX066109 for perforce@freebsd.org; Wed, 16 Aug 2006 12:50:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 12:50:54 GMT Message-Id: <200608161250.k7GCosTX066109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104215 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:51:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=104215 Change 104215 by rwatson@rwatson_zoo on 2006/08/16 12:50:19 Improve annotation of Apple-specific APIs. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#26 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#26 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#25 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#26 $ */ #ifndef _LIBBSM_H_ @@ -758,6 +758,11 @@ char *del, char raw, char sfrm); __END_DECLS +/* + * The remaining APIs are associated with Apple's BSM implementation, in + * particular as relates to Mach IPC auditing and triggers passed via Mach + * IPC. + */ #ifdef __APPLE__ #include From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 13:10:10 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E1E716A4DF for ; Wed, 16 Aug 2006 13:10:10 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C855043D45 for ; Wed, 16 Aug 2006 13:10:07 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 18E0146CEE for ; Wed, 16 Aug 2006 09:10:07 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8B0B55BC64; Wed, 16 Aug 2006 13:09:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DD3516A4E1; Wed, 16 Aug 2006 13:09:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 56DB716A4DE for ; Wed, 16 Aug 2006 13:09:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4EBC43D55 for ; Wed, 16 Aug 2006 13:09:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GD9JXX068300 for ; Wed, 16 Aug 2006 13:09:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GD9JFg068296 for perforce@freebsd.org; Wed, 16 Aug 2006 13:09:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 13:09:19 GMT Message-Id: <200608161309.k7GD9JFg068296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104216 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:10:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=104216 Change 104216 by rwatson@rwatson_zoo on 2006/08/16 13:09:12 When operating in record generation mode, generate records and not tokens. This change must have gotten lost somewhere between keyboard and perforce. Add record generation for a few more types. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#5 $ */ /* @@ -144,6 +144,17 @@ write_token(directory, token_filename, file_token); } +static void +generate_file_record(const char *directory, const char *record_filename) +{ + token_t *file_token; + + file_token = au_to_file("test", file_token_timeval); + if (file_token == NULL) + err(EX_UNAVAILABLE, "au_to_file"); + write_record(directory, record_filename, file_token, AUE_NULL); +} + /* * AUT_OHEADER */ @@ -326,6 +337,32 @@ write_token(directory, buf, subject32ex_token); } +static void +generate_subject32ex_record(const char *directory, const char *record_filename, + u_int32_t type) +{ + token_t *subject32ex_token; + char *buf; + + buf = (char *)malloc(strlen(record_filename) + 6); + if (type == AU_IPv6) { + inet_pton(AF_INET6, "fe80::1", subject32_tid_addr.at_addr); + subject32_tid_addr.at_type = AU_IPv6; + sprintf(buf, "%s%s", record_filename, "-IPv6"); + } else { + subject32_tid_addr.at_addr[0] = inet_addr("127.0.0.1"); + subject32_tid_addr.at_type = AU_IPv4; + sprintf(buf, "%s%s", record_filename, "-IPv4"); + } + + subject32ex_token = au_to_subject32_ex(subject32_auid, subject32_euid, + subject32_egid, subject32_ruid, subject32_rgid, subject32_pid, + subject32_sid, &subject32_tid_addr); + if (subject32ex_token == NULL) + err(EX_UNAVAILABLE, "au_to_subject32_ex"); + write_record(directory, record_filename, subject32ex_token, AUE_NULL); +} + static au_id_t process32_auid = 0x12345678; static uid_t process32_euid = 0x01234567; static gid_t process32_egid = 0x23456789; @@ -382,6 +419,22 @@ write_token(directory, token_filename, process32ex_token); } +static void +generate_process32ex_record(const char *directory, const char *record_filename) +{ + token_t *process32ex_token; + + process32_tid_addr.at_addr[0] = inet_addr("127.0.0.1"); + process32_tid_addr.at_type = AU_IPv4; + + process32ex_token = au_to_process32_ex(process32_auid, process32_euid, + process32_egid, process32_ruid, process32_rgid, process32_pid, + process32_sid, &process32_tid_addr); + if (process32ex_token == NULL) + err(EX_UNAVAILABLE, "au_to_process32_ex"); + write_record(directory, record_filename, process32ex_token, AUE_NULL); +} + static char return32_status = 0xd7; static uint32_t return32_ret = 0x12345678; @@ -777,29 +830,29 @@ } if (do_records) { - generate_file_token(directory, "file_token"); - generate_trailer_token(directory, "trailer_token"); - generate_header32_token(directory, "header32_token"); - generate_data_token(directory, "data_record"); - generate_ipc_token(directory, "ipc_record"); - generate_path_token(directory, "path_record"); - generate_subject32_token(directory, "subject32_record"); - generate_subject32ex_token(directory, "subject32ex_record", AU_IPv4); - generate_subject32ex_token(directory, "subject32ex_record", AU_IPv6); - generate_process32_token(directory, "process32_record"); - generate_process32ex_token(directory, "process32ex_token"); - generate_return32_token(directory, "return32_record"); - generate_text_token(directory, "text_record"); - generate_opaque_token(directory, "opaque_record"); - generate_in_addr_token(directory, "in_addr_record"); - generate_ip_token(directory, "ip_record"); - generate_iport_token(directory, "iport_record"); - generate_arg32_token(directory, "arg32_record"); - generate_seq_token(directory, "seq_record"); - generate_attr_token(directory, "attr_record"); - generate_ipc_perm_token(directory, "ipc_perm_record"); - generate_groups_token(directory, "groups_record"); - generate_attr32_token(directory, "attr32_record"); + generate_file_record(directory, "file_record"); + generate_data_record(directory, "data_record"); + generate_ipc_record(directory, "ipc_record"); + generate_path_record(directory, "path_record"); + generate_subject32_record(directory, "subject32_record"); + generate_subject32ex_record(directory, "subject32ex_record", + AU_IPv4); + generate_subject32ex_record(directory, "subject32ex_record", + AU_IPv6); + generate_process32_record(directory, "process32_record"); + generate_process32ex_record(directory, "process32ex_record"); + generate_return32_record(directory, "return32_record"); + generate_text_record(directory, "text_record"); + generate_opaque_record(directory, "opaque_record"); + generate_in_addr_record(directory, "in_addr_record"); + generate_ip_record(directory, "ip_record"); + generate_iport_record(directory, "iport_record"); + generate_arg32_record(directory, "arg32_record"); + generate_seq_record(directory, "seq_record"); + generate_attr_record(directory, "attr_record"); + generate_ipc_perm_record(directory, "ipc_perm_record"); + generate_groups_record(directory, "groups_record"); + generate_attr32_record(directory, "attr32_record"); } return (0); From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 13:11:43 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5108A16A4DA for ; Wed, 16 Aug 2006 13:11:43 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 902DA43D53 for ; Wed, 16 Aug 2006 13:11:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2DB8C46D26 for ; Wed, 16 Aug 2006 09:11:42 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6B37564788; Wed, 16 Aug 2006 13:10:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B88C316A4E7; Wed, 16 Aug 2006 13:10:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9270716A4FA for ; Wed, 16 Aug 2006 13:10:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B9CE43D45 for ; Wed, 16 Aug 2006 13:10:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDALKV068439 for ; Wed, 16 Aug 2006 13:10:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDALB1068436 for perforce@freebsd.org; Wed, 16 Aug 2006 13:10:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 13:10:21 GMT Message-Id: <200608161310.k7GDALB1068436@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104217 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:11:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=104217 Change 104217 by rwatson@rwatson_zoo on 2006/08/16 13:09:57 Provide MAXAUDITATA constant, as documented in audit.2, and use it in preference in the include file. Bump the maximum record limit up to OpenSolaris's default, as argument/environmental data can be quite large. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#18 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#18 $ */ #ifndef _BSM_AUDIT_H @@ -38,7 +38,8 @@ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 -#define MAX_AUDIT_RECORD_SIZE 4096 +#define MAXAUDITDATA (0x8000 - 1) +#define MAX_AUDIT_RECORD_SIZE MAXAUDITDATA #define MIN_AUDIT_FILE_SIZE (512 * 1024) /* From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 13:14:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DE6D16A4E5 for ; Wed, 16 Aug 2006 13:14:30 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6E3B43D46 for ; Wed, 16 Aug 2006 13:14:29 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 38B9D46C21 for ; Wed, 16 Aug 2006 09:14:29 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9949755403; Wed, 16 Aug 2006 13:14:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D53A16A4DF; Wed, 16 Aug 2006 13:14:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62BF216A4DA for ; Wed, 16 Aug 2006 13:14:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 127CF43D46 for ; Wed, 16 Aug 2006 13:14:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDEQOA068735 for ; Wed, 16 Aug 2006 13:14:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDEQQx068732 for perforce@freebsd.org; Wed, 16 Aug 2006 13:14:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 13:14:26 GMT Message-Id: <200608161314.k7GDEQQx068732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104218 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:14:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=104218 Change 104218 by rwatson@rwatson_zoo on 2006/08/16 13:13:52 Clean up audit.h some more: expand/fix comments, remove old world order flags. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#19 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#19 $ */ #ifndef _BSM_AUDIT_H @@ -43,7 +43,7 @@ #define MIN_AUDIT_FILE_SIZE (512 * 1024) /* - * Triggers for the audit daemon + * Triggers for the audit daemon. */ #define AUDIT_TRIGGER_MIN 1 #define AUDIT_TRIGGER_LOW_SPACE 1 @@ -54,7 +54,8 @@ #define AUDIT_TRIGGER_MAX 5 /* - * File that will be read for trigger events from the kernel + * Special file that will be read for trigger events from the kernel + * (FreeBSD). */ #define AUDIT_TRIGGER_FILE "/dev/audit" @@ -102,7 +103,7 @@ #define AU_ALL 0xffffffff /* - * IPC types + * IPC types. */ #define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ #define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */ @@ -147,23 +148,10 @@ /* * Audit policy controls. */ -#ifdef OLD_WORLD_ORDER #define AUDIT_CNT 0x0001 #define AUDIT_AHLT 0x0002 #define AUDIT_ARGV 0x0004 #define AUDIT_ARGE 0x0008 -#define AUDIT_PASSWD 0x0010 -#define AUDIT_SEQ 0x0020 -#define AUDIT_WINDATA 0x0040 -#define AUDIT_USER 0x0080 -#define AUDIT_GROUP 0x0100 -#define AUDIT_TRAIL 0x0200 -#define AUDIT_PATH 0x0400 -#else /* !OLD_WORLD_ORDER */ -#define AUDIT_CNT 0x0001 -#define AUDIT_AHLT 0x0002 -#define AUDIT_ARGV 0x0004 -#define AUDIT_ARGE 0x0008 #define AUDIT_SEQ 0x0010 #define AUDIT_WINDATA 0x0020 #define AUDIT_USER 0x0040 @@ -174,10 +162,9 @@ #define AUDIT_PUBLIC 0x0800 #define AUDIT_ZONENAME 0x1000 #define AUDIT_PERZONE 0x2000 -#endif /* !OLD_WORLD_ORDER */ /* - * Audit queue control parameters + * Audit queue control parameters. */ #define AQ_HIWATER 100 #define AQ_MAXHIGH 10000 From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 13:30:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB62D16A4DA for ; Wed, 16 Aug 2006 13:30:52 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC1DB43D45 for ; Wed, 16 Aug 2006 13:30:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C14A646CE6 for ; Wed, 16 Aug 2006 09:30:49 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 32D555BE6A; Wed, 16 Aug 2006 13:30:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 276C116A4E6; Wed, 16 Aug 2006 13:30:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDF1C16A4E2 for ; Wed, 16 Aug 2006 13:30:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECFA143D4C for ; Wed, 16 Aug 2006 13:30:47 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDUlOU069629 for ; Wed, 16 Aug 2006 13:30:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDUls2069626 for perforce@freebsd.org; Wed, 16 Aug 2006 13:30:47 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 13:30:47 GMT Message-Id: <200608161330.k7GDUls2069626@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104219 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:30:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=104219 Change 104219 by millert@millert_macbook on 2006/08/16 13:30:07 Introduce a reference count to struct mac_label_element so that we don't have to loop through every policy in mac_policy_removefrom_labellist() to tell whether or not another policy is interested in the label namespace. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#3 (text+ko) ==== @@ -518,6 +518,7 @@ LIST_FOREACH(mle, &mac_static_label_element_list, mle_list) { if (strcmp(name, mle->mle_name) == 0) { + /* ref count unused for static list */ found = TRUE; break; } @@ -526,12 +527,14 @@ LIST_FOREACH(mle, &mac_label_element_list, mle_list) { if (strcmp(name, mle->mle_name) == 0) { + mle->mle_refs++; found = TRUE; break; } } if (!found) { strcpy(new_mles[midx]->mle_name, name); + new_mles[midx]->mle_refs = 1; LIST_INSERT_HEAD(list, new_mles[midx], mle_list); midx++; @@ -556,10 +559,8 @@ mac_policy_removefrom_labellist(struct mac_policy_conf *mpc) { struct mac_label_element *mle; - struct mac_policy_conf *lmpc; - const char *name, *name2; - u_int idx, idx2; - int found; + const char *name; + u_int idx; if (mpc->mpc_labelnames == NULL) return; @@ -567,7 +568,8 @@ if (mpc->mpc_labelname_count == 0) return; - /* Check each label namespace managed by the policy and remove + /* + * Check each label namespace managed by the policy and remove * it from the non-static list only if no other policy is interested * in that label namespace. */ @@ -575,33 +577,15 @@ mac_policy_grab_exclusive(); for (idx = 0; idx < mpc->mpc_labelname_count; idx++) { name = mpc->mpc_labelnames[idx]; - found = FALSE; - LIST_FOREACH(lmpc, &mac_static_policy_list, mpc_list) - for (idx2 = 0; idx2 < lmpc->mpc_labelname_count; - idx2++) { - name2 = lmpc->mpc_labelnames[idx2]; - if (strcmp(name, name2) == 0) { - found = TRUE; - break; - } - } - if (!found) /* No 'static' policy manages the namespace */ - LIST_FOREACH(lmpc, &mac_policy_list, mpc_list) - for (idx2 = 0; idx2 < lmpc->mpc_labelname_count; - idx2++) { - name2 = lmpc->mpc_labelnames[idx2]; - if (strcmp(name, name2) == 0) { - found = TRUE; - break; - } - } - - if (!found) /* No policy manages this namespace */ - LIST_FOREACH(mle, &mac_label_element_list, mle_list) - if (strcmp(name, mle->mle_name) == 0) { + LIST_FOREACH(mle, &mac_label_element_list, mle_list) { + if (strcmp(name, mle->mle_name) == 0) { + if (--mle->mle_refs == 0) { LIST_REMOVE(mle, mle_list); FREE(mle, M_MACTEMP); } + break; + } + } } if (mac_late) mac_policy_release_exclusive(); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#3 (text+ko) ==== @@ -80,6 +80,7 @@ * Type of list used to manage label namespace names. */ struct mac_label_element { + int mle_refs; char mle_name[MAC_MAX_LABEL_ELEMENT_NAME]; LIST_ENTRY(mac_label_element) mle_list; }; From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 13:34:25 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8C04B16A51B for ; Wed, 16 Aug 2006 13:34:25 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF33C43D53 for ; Wed, 16 Aug 2006 13:34:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1D2E146CE6 for ; Wed, 16 Aug 2006 09:34:23 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8EC4A5CF49; Wed, 16 Aug 2006 13:34:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BA6716A4E8; Wed, 16 Aug 2006 13:34:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 43B6116A53A for ; Wed, 16 Aug 2006 13:34:22 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3592D43DCD for ; Wed, 16 Aug 2006 13:34:08 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDXqXJ069897 for ; Wed, 16 Aug 2006 13:33:52 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDXqEA069894 for perforce@freebsd.org; Wed, 16 Aug 2006 13:33:52 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 13:33:52 GMT Message-Id: <200608161333.k7GDXqEA069894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104220 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:34:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=104220 Change 104220 by millert@millert_macbook on 2006/08/16 13:33:44 Include userspace avc in libselinux Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#3 (text+ko) ==== @@ -4,21 +4,20 @@ -I../include -I../../libsepol/include -I../../libsecompat -Wall LIB = selinux -OBJS = booleans.o canonicalize_context.o checkAccess.o check_context.o \ - compute_av.o compute_create.o compute_member.o compute_relabel.o \ - compute_user.o context.o disable.o enabled.o fgetfilecon.o freecon.o \ - freeconary.o fsetfilecon.o get_context_list.o get_default_type.o \ - get_file_contexts.o getcon.o getenforce.o getexeccon.o getfilecon.o \ - getpeercon.o getpidcon.o getprevcon.o init.o is_customizable_type.o \ - lgetfilecon.o load_migscs.o load_policy.o lsetfilecon.o \ - matchmediacon.o matchpathcon.o policyvers.o query_user_context.o \ - sedarwin_config.o setcon.o setenforce.o setfilecon.o \ - setrans_client.o seusers.o +OBJS = + avc.o avc_internal.o avc_sidtab.o booleans.o canonicalize_context.o \ + checkAccess.o check_context.o compute_av.o compute_create.o \ + compute_member.o compute_relabel.o compute_user.o context.o \ + disable.o enabled.o fgetfilecon.o freecon.o freeconary.o \ + fsetfilecon.o get_context_list.o get_default_type.o \ + get_file_contexts.o getcon.o getenforce.o getexeccon.o \ + getfilecon.o getpeercon.o getpidcon.o getprevcon.o init.o \ + is_customizable_type.o lgetfilecon.o load_migscs.o load_policy.o \ + lsetfilecon.o matchmediacon.o matchpathcon.o policyvers.o \ + query_user_context.o sedarwin_config.o setcon.o setenforce.o \ + setfilecon.o setrans_client.o seusers.o -# The user-space AVC is not currently built -#OBJS += avc.o avc_internal.o avc_sidtab.o - -# The following require support for fs and exec contexts +# The following require kernel support for fs and exec contexts #OBJS += getfscreatecon.o setfscreatecon.o setexeccon.o # The following are Linux-specific ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#3 (text+ko) ==== @@ -186,7 +186,9 @@ struct avc_callback_node *next; }; +#ifdef __linux__ static void *avc_netlink_thread = NULL; +#endif static void *avc_lock = NULL; static void *avc_log_lock = NULL; static struct avc_node *avc_node_freelist = NULL; @@ -306,6 +308,7 @@ } avc_enforcing = rc; +#ifdef __linux__ rc = avc_netlink_open(avc_using_threads); if (rc < 0) { avc_log("%s: can't open netlink socket: %d (%s)\n", avc_prefix, @@ -316,6 +319,7 @@ avc_netlink_thread = avc_create_thread(&avc_netlink_loop); avc_netlink_trouble = 0; } +#endif out: return rc; } @@ -672,9 +676,11 @@ avc_get_lock(avc_lock); +#ifdef __linux__ if (avc_using_threads) avc_stop_thread(avc_netlink_thread); avc_netlink_close(); +#endif for (i = 0; i < AVC_CACHE_SLOTS; i++) { node = avc_cache.slots[i]; @@ -901,9 +907,11 @@ access_vector_t denied; struct avc_entry_ref ref; +#ifdef __linux__ if (!avc_using_threads) { (void)avc_netlink_check_nb(); } +#endif if (!aeref) { avc_entry_ref_init(&ref); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.c#3 (text+ko) ==== @@ -16,9 +16,11 @@ #include #include #include -//#include +#ifdef __linux__ +#include #include #include "selinux_netlink.h" +#endif #include "avc_internal.h" #ifndef NETLINK_SELINUX @@ -44,6 +46,8 @@ /* message prefix string and avc enforcing mode */ char avc_prefix[AVC_PREFIX_SIZE] = "uavc"; int avc_enforcing = 1; + +#ifdef __linux__ int avc_netlink_trouble = 0; /* netlink socket code */ @@ -294,3 +298,4 @@ avc_log("%s: netlink thread: errors encountered, terminating\n", avc_prefix); } +#endif /* __linux__ */ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 13:34:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C043016A4E9 for ; Wed, 16 Aug 2006 13:34:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 730CF43D49 for ; Wed, 16 Aug 2006 13:34:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 0DB3F46D5A for ; Wed, 16 Aug 2006 09:34:55 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8E1A7727D3; Wed, 16 Aug 2006 13:34:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8380A16A4EB; Wed, 16 Aug 2006 13:34:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 617DD16A4E1 for ; Wed, 16 Aug 2006 13:34:54 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23C6C43D4C for ; Wed, 16 Aug 2006 13:34:54 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDYsU5069960 for ; Wed, 16 Aug 2006 13:34:54 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDYr5d069957 for perforce@freebsd.org; Wed, 16 Aug 2006 13:34:53 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 13:34:53 GMT Message-Id: <200608161334.k7GDYr5d069957@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104221 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:34:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=104221 Change 104221 by millert@millert_macbook on 2006/08/16 13:34:52 asort() is a gawk extension, use the qsort() function from the awk book instead. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/flask/mkaccess_vector.sh#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/flask/mkaccess_vector.sh#2 (text+ko) ==== @@ -15,6 +15,23 @@ av_perm_to_string="av_perm_to_string.h" cat $* | $awk " + # Quicksort function for awk arrays, from The AWK Programming + # Language, by Aho, Kernighan and Weinberger. + # Call qsort(array, smallestindex, largestindex) + function qsort(a,left,right, i,last) { + if (left >= right) return + swap(a, left, left + int((right-left+1)*rand())) + last = left + for (i=left+1; i<=right; i++) + if (a[i] < a[left]) swap(a, ++last, i) + swap(a, left, last) + qsort(a, left, last-1) + qsort(a, last+1, right) + } + function swap(a,i,j, t) { + t = a[i]; a[i] = a[j]; a[j] = t; + } + BEGIN { outfile = \"$av_permissions\" inheritfile = \"$av_inherit\" @@ -102,12 +119,12 @@ } } - j = 1; + n = 0; for (i in inherited_perms) { - ind[j] = i + 0; - j++; + n++; + ind[n] = i + 0; } - n = asort(ind); + qsort(ind, 1, n); for (i = 1; i <= n; i++) { perm = inherited_perms[ind[i]]; printf("#define %s__%s", toupper(tclass), toupper(perm)) > outfile; From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 13:37:00 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6646716A55A for ; Wed, 16 Aug 2006 13:37:00 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8B1343D49 for ; Wed, 16 Aug 2006 13:36:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7A60946CEC for ; Wed, 16 Aug 2006 09:36:59 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E2D3A57BCF; Wed, 16 Aug 2006 13:36:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D818316A4DF; Wed, 16 Aug 2006 13:36:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A54B16A4DD for ; Wed, 16 Aug 2006 13:36:58 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 341D443D49 for ; Wed, 16 Aug 2006 13:36:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDavv2070116 for ; Wed, 16 Aug 2006 13:36:57 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDauim070113 for perforce@freebsd.org; Wed, 16 Aug 2006 13:36:56 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 13:36:56 GMT Message-Id: <200608161336.k7GDauim070113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104222 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:37:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=104222 Change 104222 by millert@millert_macbook on 2006/08/16 13:36:47 Do not assume that all typedefs in mac_policy.h refer to entrypoints. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/count/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/stacktrace/module/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/stub/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/count/Makefile#2 (text+ko) ==== @@ -16,7 +16,7 @@ policy.in: $(EXPORT_HDRS)/security/security/mac_policy.h @cpp $(DARWIN_HDRS) -P $< \ | grep -v ^\$ \ - | awk 'RS=";" { if ($$1 == "typedef") { print $$0";" } }' \ + | awk 'RS=";" { if ($$1 == "typedef" && $$0 ~ /\(/) { print $$0";" } }' \ | tr -d "\n\t" \ | tr ";" "\n" \ | sed -e 's/typedef //g' \ ==== //depot/projects/trustedbsd/sedarwin8/policies/stacktrace/module/Makefile#2 (text+ko) ==== @@ -18,7 +18,7 @@ policy.in: $(EXPORT_HDRS)/security/security/mac_policy.h @cpp $(DARWIN_HDRS) -P $< \ | grep -v ^\$ \ - | awk 'RS=";" { if ($$1 == "typedef") { print $$0";" } }' \ + | awk 'RS=";" { if ($$1 == "typedef" && $$0 ~ /\(/) { print $$0";" } }' \ | tr -d "\n\t" \ | tr ";" "\n" \ | sed -e 's/typedef //g' \ ==== //depot/projects/trustedbsd/sedarwin8/policies/stub/Makefile#2 (text+ko) ==== @@ -15,7 +15,7 @@ policy.in: $(EXPORT_HDRS)/security/security/mac_policy.h @cpp $(DARWIN_HDRS) -P $< \ | grep -v ^\$ \ - | awk 'RS=";" { if ($$1 == "typedef") { print $$0";" } }' \ + | awk 'RS=";" { if ($$1 == "typedef" && $$0 ~ /\(/) { print $$0";" } }' \ | tr -d "\n\t" \ | tr ";" "\n" \ | sed -e 's/typedef //g' \ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 14:13:00 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37E1816A682 for ; Wed, 16 Aug 2006 14:13:00 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F14D43D45 for ; Wed, 16 Aug 2006 14:12:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 42D1346C87 for ; Wed, 16 Aug 2006 10:12:58 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BD9269193D; Wed, 16 Aug 2006 14:12:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E883216A588; Wed, 16 Aug 2006 14:12:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C5DF916A4DF for ; Wed, 16 Aug 2006 14:12:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2521A43D46 for ; Wed, 16 Aug 2006 14:12:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GEChpj073359 for ; Wed, 16 Aug 2006 14:12:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GECg4F073355 for perforce@freebsd.org; Wed, 16 Aug 2006 14:12:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 14:12:42 GMT Message-Id: <200608161412.k7GECg4F073355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104227 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:13:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=104227 Change 104227 by rwatson@rwatson_zoo on 2006/08/16 14:12:28 sync to millert's cleanups in sedarwin: remove MAC_DEBUG -- this was originally added when doing early labeling work as part of the MAC Framework implementation, and has basically not been used since. Creating a policy module to do the same thing is trivial. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/conf/NOTES#3 edit .. //depot/projects/trustedbsd/mac2/sys/conf/options#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#5 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_inet.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_internal.h#5 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_label.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_net.c#4 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_pipe.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_posix_sem.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_process.c#4 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_socket.c#4 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_system.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_msg.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_sem.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_shm.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_vfs.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/conf/NOTES#3 (text+ko) ==== @@ -998,7 +998,6 @@ options MAC options MAC_BIBA options MAC_BSDEXTENDED -options MAC_DEBUG options MAC_IFOFF options MAC_LOMAC options MAC_MLS ==== //depot/projects/trustedbsd/mac2/sys/conf/options#3 (text+ko) ==== @@ -103,7 +103,6 @@ MAC_ALWAYS_LABEL_MBUF opt_mac.h MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h -MAC_DEBUG opt_mac.h MAC_IFOFF opt_dontuse.h MAC_LOMAC opt_dontuse.h MAC_MLS opt_dontuse.h ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#5 (text+ko) ==== @@ -137,17 +137,6 @@ int mac_labelmbufs = 0; #endif -#ifdef MAC_DEBUG -SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, - "TrustedBSD MAC debug info"); -SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, - "TrustedBSD MAC object counters"); - -static unsigned int nmactemp; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, temp, CTLFLAG_RD, - &nmactemp, 0, "number of temporary labels in use"); -#endif - static int mac_policy_register(struct mac_policy_conf *mpc); static int mac_policy_unregister(struct mac_policy_conf *mpc); ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_inet.c#3 (text+ko) ==== @@ -70,15 +70,6 @@ #include -#ifdef MAC_DEBUG -static unsigned int nmacinpcbs, nmacipqs; - -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, inpcbs, CTLFLAG_RD, - &nmacinpcbs, 0, "number of inpcbs in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipqs, CTLFLAG_RD, - &nmacipqs, 0, "number of ipqs in use"); -#endif - static struct label * mac_inpcb_label_alloc(int flag) { @@ -94,7 +85,6 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacinpcbs); return (label); } @@ -124,7 +114,6 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacipqs); return (label); } @@ -144,7 +133,6 @@ MAC_PERFORM(inpcb_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacinpcbs); } void @@ -161,7 +149,6 @@ MAC_PERFORM(ipq_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacipqs); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_internal.h#5 (text+ko) ==== @@ -46,10 +46,6 @@ #ifdef SYSCTL_DECL SYSCTL_DECL(_security); SYSCTL_DECL(_security_mac); -#ifdef MAC_DEBUG -SYSCTL_DECL(_security_mac_debug); -SYSCTL_DECL(_security_mac_debug_counters); -#endif #endif /* SYSCTL_DECL */ /* @@ -75,18 +71,6 @@ #endif /* - * MAC Framework object/access counter primitives, conditionally - * compiled. - */ -#ifdef MAC_DEBUG -#define MAC_DEBUG_COUNTER_INC(x) atomic_add_int(x, 1); -#define MAC_DEBUG_COUNTER_DEC(x) atomic_subtract_int(x, 1); -#else -#define MAC_DEBUG_COUNTER_INC(x) -#define MAC_DEBUG_COUNTER_DEC(x) -#endif - -/* * MAC Framework infrastructure functions. */ int mac_error_select(int error1, int error2); ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_label.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_net.c#4 (text+ko) ==== @@ -77,17 +77,6 @@ &mac_enforce_network, 0, "Enforce MAC policy on network packets"); TUNABLE_INT("security.mac.enforce_network", &mac_enforce_network); -#ifdef MAC_DEBUG -static unsigned int nmacbpfdescs, nmacifnets, nmacmbufs; - -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, bpfdescs, CTLFLAG_RD, - &nmacbpfdescs, 0, "number of bpfdescs in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ifnets, CTLFLAG_RD, - &nmacifnets, 0, "number of ifnets in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mbufs, CTLFLAG_RD, - &nmacmbufs, 0, "number of mbufs in use"); -#endif - /* * XXXRW: struct ifnet locking is incomplete in the network code, so we * use our own global mutex for struct ifnet. Non-ideal, but should help @@ -120,7 +109,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(bpfdesc_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacbpfdescs); return (label); } @@ -138,7 +126,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(ifnet_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacifnets); return (label); } @@ -162,8 +149,6 @@ if (error) { MAC_PERFORM(mbuf_destroy_label, label); mac_destroy_label(label); - } else { - MAC_DEBUG_COUNTER_INC(&nmacmbufs); } return (error); } @@ -203,7 +188,6 @@ MAC_PERFORM(bpfdesc_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacbpfdescs); } void @@ -220,7 +204,6 @@ MAC_PERFORM(ifnet_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacifnets); } void @@ -240,7 +223,6 @@ MAC_PERFORM(mbuf_destroy_label, label); mac_destroy_label(label); - MAC_DEBUG_COUNTER_DEC(&nmacmbufs); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_pipe.c#3 (text+ko) ==== @@ -61,12 +61,6 @@ &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); TUNABLE_INT("security.mac.enforce_pipe", &mac_enforce_pipe); -#ifdef MAC_DEBUG -static unsigned int nmacpipes; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, pipes, CTLFLAG_RD, - &nmacpipes, 0, "number of pipes in use"); -#endif - struct label * mac_pipe_label_alloc(void) { @@ -74,7 +68,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(pipe_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacpipes); return (label); } @@ -91,7 +84,6 @@ MAC_PERFORM(pipe_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacpipes); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_posix_sem.c#3 (text+ko) ==== @@ -54,12 +54,6 @@ &mac_enforce_posix_sem, 0, "Enforce MAC policy on global POSIX semaphores"); TUNABLE_INT("security.mac.enforce_posix_sem", &mac_enforce_posix_sem); -#ifdef MAC_DEBUG -static unsigned int nmacposixsems; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, posix_sems, CTLFLAG_RD, - &nmacposixsems, 0, "number of posix global semaphores inuse"); -#endif - static struct label * mac_posix_sem_label_alloc(void) { @@ -67,7 +61,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(posix_sem_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacposixsems); return (label); } @@ -83,7 +76,6 @@ { MAC_PERFORM(posix_sem_destroy_label, label); - MAC_DEBUG_COUNTER_DEC(&nmacposixsems); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_process.c#4 (text+ko) ==== @@ -96,14 +96,6 @@ &mac_enforce_suid, 0, "Enforce MAC policy on suid/sgid operations"); TUNABLE_INT("security.mac.enforce_suid", &mac_enforce_suid); -#ifdef MAC_DEBUG -static unsigned int nmaccreds, nmacprocs; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, creds, CTLFLAG_RD, - &nmaccreds, 0, "number of ucreds in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, procs, CTLFLAG_RD, - &nmacprocs, 0, "number of procs in use"); -#endif - static void mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred, struct vm_map *map); @@ -114,7 +106,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(cred_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmaccreds); return (label); } @@ -132,7 +123,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(proc_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacprocs); return (label); } @@ -149,7 +139,6 @@ MAC_PERFORM(cred_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmaccreds); } void @@ -166,7 +155,6 @@ MAC_PERFORM(proc_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacprocs); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_socket.c#4 (text+ko) ==== @@ -81,13 +81,6 @@ &mac_enforce_socket, 0, "Enforce MAC policy on socket operations"); TUNABLE_INT("security.mac.enforce_socket", &mac_enforce_socket); -#ifdef MAC_DEBUG -static unsigned int nmacsockets; - -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, sockets, CTLFLAG_RD, - &nmacsockets, 0, "number of sockets in use"); -#endif - struct label * mac_socket_label_alloc(int flag) { @@ -104,7 +97,6 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacsockets); return (label); } @@ -124,7 +116,6 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacsockets); return (label); } @@ -150,7 +141,6 @@ MAC_PERFORM(socket_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsockets); } static void @@ -159,7 +149,6 @@ MAC_PERFORM(socket_peer_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsockets); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_system.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_msg.c#3 (text+ko) ==== @@ -63,14 +63,6 @@ "Enforce MAC policy on System V IPC Message Queues"); TUNABLE_INT("security.mac.enforce_sysv_msg", &mac_enforce_sysv_msg); -#ifdef MAC_DEBUG -static unsigned int nmacipcmsgs, nmacipcmsqs; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_msgs, CTLFLAG_RD, - &nmacipcmsgs, 0, "number of sysv ipc messages inuse"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_msqs, CTLFLAG_RD, - &nmacipcmsqs, 0, "number of sysv ipc message queue identifiers inuse"); -#endif - static struct label * mac_sysvmsg_label_alloc(void) { @@ -78,7 +70,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(sysvmsg_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacipcmsgs); return (label); } @@ -96,7 +87,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(sysvmsq_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacipcmsqs); return (label); } @@ -113,7 +103,6 @@ MAC_PERFORM(sysvmsg_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacipcmsgs); } void @@ -130,7 +119,6 @@ MAC_PERFORM(sysvmsq_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacipcmsqs); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_sem.c#3 (text+ko) ==== @@ -62,12 +62,6 @@ &mac_enforce_sysv_sem, 0, "Enforce MAC policy on System V IPC Semaphores"); TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_sem); -#ifdef MAC_DEBUG -static unsigned int nmacipcsemas; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_semas, CTLFLAG_RD, - &nmacipcsemas, 0, "number of sysv ipc semaphore identifiers inuse"); -#endif - static struct label * mac_sysvsem_label_alloc(void) { @@ -75,7 +69,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(sysvsem_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacipcsemas); return (label); } @@ -92,7 +85,6 @@ MAC_PERFORM(sysvsem_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacipcsemas); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_shm.c#3 (text+ko) ==== @@ -63,12 +63,6 @@ "Enforce MAC policy on System V IPC shared memory"); TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_shm); -#ifdef MAC_DEBUG -static unsigned int nmacipcshms; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_shms, CTLFLAG_RD, - &nmacipcshms, 0, "number of sysv ipc shm identifiers inuse"); -#endif - static struct label * mac_sysvshm_label_alloc(void) { @@ -76,7 +70,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(sysvshm_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacipcshms); return (label); } @@ -93,7 +86,6 @@ MAC_PERFORM(sysvshm_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacipcshms); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_vfs.c#5 (text+ko) ==== @@ -83,23 +83,6 @@ &mac_enforce_fs, 0, "Enforce MAC policy on file system objects"); TUNABLE_INT("security.mac.enforce_fs", &mac_enforce_fs); -#ifdef MAC_DEBUG -static int mac_debug_label_fallback = 0; -SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, - &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" - "when label is corrupted."); -TUNABLE_INT("security.mac.debug_label_fallback", - &mac_debug_label_fallback); - -static unsigned int nmacmounts, nmacvnodes, nmacdevfsdirents; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mounts, CTLFLAG_RD, - &nmacmounts, 0, "number of mounts in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, vnodes, CTLFLAG_RD, - &nmacvnodes, 0, "number of vnodes in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, devfsdirents, CTLFLAG_RD, - &nmacdevfsdirents, 0, "number of devfs dirents inuse"); -#endif - static int mac_vnode_setlabel_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); @@ -110,7 +93,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(devfs_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacdevfsdirents); return (label); } @@ -128,7 +110,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(mount_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacmounts); return (label); } @@ -146,7 +127,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(vnode_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacvnodes); return (label); } @@ -163,7 +143,6 @@ MAC_PERFORM(devfs_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacdevfsdirents); } void @@ -180,7 +159,6 @@ MAC_PERFORM(mount_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacmounts); } void @@ -197,7 +175,6 @@ MAC_PERFORM(vnode_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacvnodes); } void From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 14:25:18 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 781A816A4DF for ; Wed, 16 Aug 2006 14:25:18 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C24CA43D45 for ; Wed, 16 Aug 2006 14:25:17 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EA3AD46D50 for ; Wed, 16 Aug 2006 10:25:16 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 60D2A55429; Wed, 16 Aug 2006 14:25:14 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 54B5316A4E0; Wed, 16 Aug 2006 14:25:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F04B616A4DD for ; Wed, 16 Aug 2006 14:25:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EA0643D45 for ; Wed, 16 Aug 2006 14:25:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GEPDNQ074219 for ; Wed, 16 Aug 2006 14:25:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GEPDCZ074216 for perforce@freebsd.org; Wed, 16 Aug 2006 14:25:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 14:25:13 GMT Message-Id: <200608161425.k7GEPDCZ074216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104234 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:25:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=104234 Change 104234 by rwatson@rwatson_zoo on 2006/08/16 14:25:02 Integrate trustedbsd_mac2: nfsd associate prototype fix. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#24 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/param.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/swap_pager.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_fault.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_page.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.568 2006/08/01 19:06:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.569 2006/08/06 06:29:16 alc Exp $"); /* * Manages physical address maps. @@ -2506,7 +2506,6 @@ retry: p = vm_page_lookup(object, pindex); if (p != NULL) { - vm_page_lock_queues(); if (vm_page_sleep_if_busy(p, FALSE, "init4p")) goto retry; } else { @@ -2525,8 +2524,8 @@ p = vm_page_lookup(object, pindex); vm_page_lock_queues(); vm_page_wakeup(p); + vm_page_unlock_queues(); } - vm_page_unlock_queues(); ptepa = VM_PAGE_TO_PHYS(p); if (ptepa & (NBPDR - 1)) ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.61 2006/07/28 16:56:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.62 2006/08/05 22:04:21 rwatson Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" ==== //depot/projects/trustedbsd/mac2/sys/dev/usb/usbdevs#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.263 2006/07/24 19:47:00 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.264 2006/08/06 12:01:42 bms Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -890,6 +890,7 @@ product EPSON 1670 0x011f Perfection 1670 scanner product EPSON 1270 0x0120 Perfection 1270 scanner product EPSON 2480 0x0121 Perfection 2480 scanner +product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner /* e-TEK Labs products */ ==== //depot/projects/trustedbsd/mac2/sys/dev/usb/uscanner.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.71 2006/06/18 17:28:08 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.72 2006/08/06 12:01:42 bms Exp $"); /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -213,6 +213,7 @@ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USC_KEEP_OPEN }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2480 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3500 }, USC_KEEP_OPEN }, /* UMAX */ {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U }, 0 }, ==== //depot/projects/trustedbsd/mac2/sys/i386/i386/pmap.c#3 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.572 2006/08/01 19:06:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.573 2006/08/06 06:29:16 alc Exp $"); /* * Manages physical address maps. @@ -2581,7 +2581,6 @@ retry: p = vm_page_lookup(object, pindex); if (p != NULL) { - vm_page_lock_queues(); if (vm_page_sleep_if_busy(p, FALSE, "init4p")) goto retry; } else { @@ -2600,8 +2599,8 @@ p = vm_page_lookup(object, pindex); vm_page_lock_queues(); vm_page_wakeup(p); + vm_page_unlock_queues(); } - vm_page_unlock_queues(); ptepa = VM_PAGE_TO_PHYS(p); if (ptepa & (NBPDR - 1)) ==== //depot/projects/trustedbsd/mac2/sys/kern/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/sys/kern/Makefile,v 1.12 2005/07/13 20:50:17 jhb Exp $ +# $FreeBSD: src/sys/kern/Makefile,v 1.13 2006/08/05 19:25:14 jb Exp $ # Makefile for kernel tags files, init_sysent, etc. @@ -11,10 +11,11 @@ sysent: init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall.mk \ ../sys/sysproto.h -init_sysent.c syscalls.c ../sys/syscall.h \ +init_sysent.c syscalls.c systrace_args.c ../sys/syscall.h \ ../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master -mv -f init_sysent.c init_sysent.c.bak -mv -f syscalls.c syscalls.c.bak + -mv -f systrace_args.c systrace_args.c.bak -mv -f ../sys/syscall.h ../sys/syscall.h.bak -mv -f ../sys/syscall.mk ../sys/syscall.mk.bak -mv -f ../sys/sysproto.h ../sys/sysproto.h.bak ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.235 2006/08/04 05:53:20 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.236 2006/08/06 01:00:09 alc Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -2038,14 +2038,14 @@ VM_OBJECT_LOCK(obj); goto retry_lookup; } - } else { - vm_page_lock_queues(); - if (vm_page_sleep_if_busy(pg, TRUE, "sfpbsy")) - goto retry_lookup; + } else if (vm_page_sleep_if_busy(pg, TRUE, "sfpbsy")) + goto retry_lookup; + else { /* * Wire the page so it does not get ripped out from * under us. */ + vm_page_lock_queues(); vm_page_wire(pg); vm_page_unlock_queues(); } ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#6 (text+ko) ==== @@ -50,7 +50,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.184 2006/08/02 14:30:58 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.185 2006/08/06 10:39:21 rwatson Exp $"); #include "opt_mac.h" @@ -800,9 +800,6 @@ .pru_sense = uipc_sense, .pru_shutdown = uipc_shutdown, .pru_sockaddr = uipc_sockaddr, - .pru_sosend = sosend_generic, - .pru_soreceive = soreceive_generic, - .pru_sopoll = sopoll_generic, .pru_close = uipc_close, }; ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_lookup.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.91 2006/04/29 07:13:49 kris Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.93 2006/08/05 21:40:59 rwatson Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -88,7 +88,7 @@ "Enables/Disables shared locks for path name translation"); /* - * Convert a pathname into a pointer to a locked inode. + * Convert a pathname into a pointer to a locked vnode. * * The FOLLOW flag is set when symbolic links are to be followed * when they occur at the end of the name translation process. @@ -108,12 +108,11 @@ * } */ int -namei(ndp) - register struct nameidata *ndp; +namei(struct nameidata *ndp) { - register struct filedesc *fdp; /* pointer to file descriptor state */ - register char *cp; /* pointer into pathname argument */ - register struct vnode *dp; /* the directory we are searching */ + struct filedesc *fdp; /* pointer to file descriptor state */ + char *cp; /* pointer into pathname argument */ + struct vnode *dp; /* the directory we are searching */ struct iovec aiov; /* uio for reading symbolic links */ struct uio auio; int error, linklen; @@ -343,11 +342,10 @@ * if WANTPARENT set, return unlocked parent in ni_dvp */ int -lookup(ndp) - register struct nameidata *ndp; +lookup(struct nameidata *ndp) { - register char *cp; /* pointer into pathname argument */ - register struct vnode *dp = 0; /* the directory we are searching */ + char *cp; /* pointer into pathname argument */ + struct vnode *dp = 0; /* the directory we are searching */ struct vnode *tdp; /* saved dp */ struct mount *mp; /* mount table entry */ int docache; /* == 0 do not cache last component */ @@ -607,7 +605,7 @@ /* * We return with ni_vp NULL to indicate that the entry * doesn't currently exist, leaving a pointer to the - * (possibly locked) directory inode in ndp->ni_dvp. + * (possibly locked) directory vnode in ndp->ni_dvp. */ if (cnp->cn_flags & SAVESTART) { ndp->ni_startdir = ndp->ni_dvp; @@ -766,9 +764,7 @@ * Used by lookup to re-aquire things. */ int -relookup(dvp, vpp, cnp) - struct vnode *dvp, **vpp; - struct componentname *cnp; +relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp) { struct thread *td = cnp->cn_thread; struct vnode *dp = 0; /* the directory we are searching */ @@ -859,7 +855,7 @@ /* * We return with ni_vp NULL to indicate that the entry * doesn't currently exist, leaving a pointer to the - * (possibly locked) directory inode in ndp->ni_dvp. + * (possibly locked) directory vnode in ndp->ni_dvp. */ return (0); } @@ -910,9 +906,7 @@ * Free data allocated by namei(); see namei(9) for details. */ void -NDFREE(ndp, flags) - struct nameidata *ndp; - const u_int flags; +NDFREE(struct nameidata *ndp, const u_int flags) { int unlock_dvp; int unlock_vp; ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.678 2006/07/15 06:44:27 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.679 2006/08/06 10:43:35 rwatson Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -3134,6 +3134,9 @@ * and optional call-by-reference privused argument allowing vaccess() * to indicate to the caller whether privilege was used to satisfy the * request (obsoleted). Returns 0 on success, or an errno on failure. + * + * The ifdef'd CAPABILITIES version is here for reference, but is not + * actually used. */ int vaccess(enum vtype type, mode_t file_mode, uid_t file_uid, gid_t file_gid, @@ -3207,9 +3210,11 @@ /* * Build a capability mask to determine if the set of capabilities * satisfies the requirements when combined with the granted mask - * from above. - * For each capability, if the capability is required, bitwise - * or the request type onto the cap_granted mask. + * from above. For each capability, if the capability is required, + * bitwise or the request type onto the cap_granted mask. + * + * Note: This is never actually used, but is here for reference + * purposes. */ cap_granted = 0; @@ -3219,7 +3224,8 @@ * VEXEC requests, instead of CAP_DAC_EXECUTE. */ if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && - !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) + !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, + SUSER_ALLOWJAIL)) cap_granted |= VEXEC; } else { if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && ==== //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_usrreq.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * +1-313-764-2278 * netatalk@umich.edu * - * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.51 2006/07/21 17:11:13 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.52 2006/08/05 14:14:34 rwatson Exp $ */ #include @@ -217,6 +217,7 @@ DDP_LOCK(ddp); at_pcbdisconnect(ddp); DDP_UNLOCK(ddp); + soisdisconnected(so); } static void @@ -230,6 +231,7 @@ DDP_LOCK(ddp); at_pcbdisconnect(ddp); DDP_UNLOCK(ddp); + soisdisconnected(so); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac_biba/mac_biba.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.92 2006/07/10 19:13:32 csjp Exp $ + * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.93 2006/08/06 16:56:15 rwatson Exp $ */ /* @@ -3022,7 +3022,7 @@ return (0); } -static int +static void mac_biba_associate_nfsd_label(struct ucred *cred) { struct mac_biba *label; @@ -3031,7 +3031,6 @@ mac_biba_set_effective(label, MAC_BIBA_TYPE_LOW, 0, NULL); mac_biba_set_range(label, MAC_BIBA_TYPE_LOW, 0, NULL, MAC_BIBA_TYPE_HIGH, 0, NULL); - return (0); } static struct mac_policy_ops mac_biba_ops = ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#24 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac_policy.h,v 1.72 2006/04/26 14:18:55 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac_policy.h,v 1.73 2006/08/06 16:56:15 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. @@ -661,6 +661,7 @@ typedef int (*mpo_vnode_check_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); +typedef void (*mpo_associate_nfsd_label_t)(struct ucred *cred); struct mac_policy_ops { mpo_policy_destroy_t mpo_policy_destroy; ==== //depot/projects/trustedbsd/mac2/sys/sys/param.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.269 2006/07/29 19:44:07 simon Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.270 2006/08/05 20:35:11 jb Exp $ */ #ifndef _SYS_PARAM_H_ @@ -331,4 +331,20 @@ #define ctodb(db) /* calculates pages to devblks */ \ ((db) << (PAGE_SHIFT - DEV_BSHIFT)) +/* + * Solaris compatibility definitions. + */ +#ifdef _SOLARIS_C_SOURCE +#define PAGESIZE PAGE_SIZE + +/* + * The OpenSolaris version is set according to the version last imported + * from http://dlc.sun.com/osol/on/downloads/current/. In FreeBSD header + * files it can be used to detemine the level of compatibility that the + * FreeBSD headers provide to OpenSolaris code. Perhaps one day there + * will be a really, really Single Unix Specification. + */ +#define __OpenSolaris_version 20060731 +#endif + #endif /* _SYS_PARAM_H_ */ ==== //depot/projects/trustedbsd/mac2/sys/vm/swap_pager.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.280 2006/08/03 23:56:11 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.281 2006/08/05 19:07:07 alc Exp $"); #include "opt_mac.h" #include "opt_swap.h" @@ -1424,11 +1424,6 @@ * NOTE: for reads, m->dirty will probably * be overridden by the original caller of * getpages so don't play cute tricks here. - * - * XXX IT IS NOT LEGAL TO FREE THE PAGE HERE - * AS THIS MESSES WITH object->memq, and it is - * not legal to mess with object->memq from an - * interrupt. */ m->valid = 0; if (i != bp->b_pager.pg_reqpage) ==== //depot/projects/trustedbsd/mac2/sys/vm/vm_fault.c#3 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.217 2006/07/21 23:22:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.218 2006/08/06 00:17:17 alc Exp $"); #include #include @@ -389,10 +389,8 @@ VM_OBJECT_LOCK(fs.object); if (fs.m == vm_page_lookup(fs.object, fs.pindex)) { - vm_page_lock_queues(); - if (!vm_page_sleep_if_busy(fs.m, TRUE, - "vmpfw")) - vm_page_unlock_queues(); + vm_page_sleep_if_busy(fs.m, TRUE, + "vmpfw"); } vm_object_pip_wakeup(fs.object); VM_OBJECT_UNLOCK(fs.object); ==== //depot/projects/trustedbsd/mac2/sys/vm/vm_page.c#3 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.320 2006/08/03 23:56:11 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.321 2006/08/06 00:15:40 alc Exp $"); #include #include @@ -496,9 +496,10 @@ vm_page_sleep_if_busy(vm_page_t m, int also_m_busy, const char *msg) { - mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); if ((m->flags & PG_BUSY) || (also_m_busy && m->busy)) { + if (!mtx_owned(&vm_page_queue_mtx)) + vm_page_lock_queues(); vm_page_flag_set(m, PG_WANTED | PG_REFERENCED); vm_page_unlock_queues(); From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 14:49:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5983916A4E2 for ; Wed, 16 Aug 2006 14:49:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F203243D6D for ; Wed, 16 Aug 2006 14:49:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id CB7BC46CC4 for ; Wed, 16 Aug 2006 10:49:48 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4BF09581BB; Wed, 16 Aug 2006 14:48:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E20216A4E0; Wed, 16 Aug 2006 14:48:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16B7B16A4DD for ; Wed, 16 Aug 2006 14:48:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B170A43D49 for ; Wed, 16 Aug 2006 14:48:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GEmomJ076612 for ; Wed, 16 Aug 2006 14:48:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GEmmEm076609 for perforce@freebsd.org; Wed, 16 Aug 2006 14:48:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 14:48:48 GMT Message-Id: <200608161448.k7GEmmEm076609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104241 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:49:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=104241 Change 104241 by rwatson@rwatson_zoo on 2006/08/16 14:48:07 Update HISTORY. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#22 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#22 (text+ko) ==== @@ -12,6 +12,8 @@ are now deprecated numberings. - autoconf now detects clock_gettime(), which is not available on Darwin. - praudit output fixes relating to arg32 and arg64 tokens. +- Maximum record size updated to 64k-1 to match Solaris record size limit. +- Various style and comment cleanups in include files. OpenBSM 1.0 alpha 7 @@ -190,4 +192,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#21 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#22 $ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 15:01:11 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE83716A4E6 for ; Wed, 16 Aug 2006 15:01:10 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66DED43D45 for ; Wed, 16 Aug 2006 15:01:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 90A8946D47 for ; Wed, 16 Aug 2006 11:01:09 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D33A9565BD; Wed, 16 Aug 2006 15:01:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C4A7A16A4E2; Wed, 16 Aug 2006 15:01:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 64D8416A4DD for ; Wed, 16 Aug 2006 15:01:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 098E143D4C for ; Wed, 16 Aug 2006 15:01:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GF17mB077484 for ; Wed, 16 Aug 2006 15:01:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GF177a077481 for perforce@freebsd.org; Wed, 16 Aug 2006 15:01:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 15:01:07 GMT Message-Id: <200608161501.k7GF177a077481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104245 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 15:01:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=104245 Change 104245 by rwatson@rwatson_zoo on 2006/08/16 15:01:03 Merge OpenBSM 1.0a8 changes into the audit3 kernel. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#31 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#31 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#30 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#31 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.4 2006/06/05 12:55:45 rwatson Exp $ */ @@ -43,7 +43,8 @@ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 -#define MAX_AUDIT_RECORD_SIZE 4096 +#define MAXAUDITDATA (0x8000 - 1) +#define MAX_AUDIT_RECORD_SIZE MAXAUDITDATA #define MIN_AUDIT_FILE_SIZE (512 * 1024) /* @@ -55,7 +56,7 @@ #define AUDIT_HARD_LIMIT_FREE_BLOCKS 4 /* - * Triggers for the audit daemon + * Triggers for the audit daemon. */ #define AUDIT_TRIGGER_MIN 1 #define AUDIT_TRIGGER_LOW_SPACE 1 @@ -66,7 +67,8 @@ #define AUDIT_TRIGGER_MAX 5 /* - * File that will be read for trigger events from the kernel. + * Special file that will be read for trigger events from the kernel + * (FreeBSD). */ #define AUDIT_TRIGGER_FILE "/dev/audit" @@ -119,7 +121,7 @@ #define AU_ALL 0xffffffff /* - * IPC types + * IPC types. */ #define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ #define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */ @@ -164,19 +166,6 @@ /* * Audit policy controls. */ -#ifdef OLD_WORLD_ORDER -#define AUDIT_CNT 0x0001 -#define AUDIT_AHLT 0x0002 -#define AUDIT_ARGV 0x0004 -#define AUDIT_ARGE 0x0008 -#define AUDIT_PASSWD 0x0010 -#define AUDIT_SEQ 0x0020 -#define AUDIT_WINDATA 0x0040 -#define AUDIT_USER 0x0080 -#define AUDIT_GROUP 0x0100 -#define AUDIT_TRAIL 0x0200 -#define AUDIT_PATH 0x0400 -#else /* !OLD_WORLD_ORDER */ #define AUDIT_CNT 0x0001 #define AUDIT_AHLT 0x0002 #define AUDIT_ARGV 0x0004 @@ -191,10 +180,9 @@ #define AUDIT_PUBLIC 0x0800 #define AUDIT_ZONENAME 0x1000 #define AUDIT_PERZONE 0x2000 -#endif /* !OLD_WORLD_ORDER */ /* - * Audit queue control parameters + * Audit queue control parameters. */ #define AQ_HIWATER 100 #define AQ_MAXHIGH 10000 From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 15:01:14 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4951616A4E1 for ; Wed, 16 Aug 2006 15:01:14 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AC1743D45 for ; Wed, 16 Aug 2006 15:01:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C628246D5F for ; Wed, 16 Aug 2006 11:01:11 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1AF9D639DA; Wed, 16 Aug 2006 15:01:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F336416A540; Wed, 16 Aug 2006 15:01:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9215A16A4DE for ; Wed, 16 Aug 2006 15:01:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9B5143D49 for ; Wed, 16 Aug 2006 15:01:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GF17Mp077478 for ; Wed, 16 Aug 2006 15:01:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GF16YX077475 for perforce@freebsd.org; Wed, 16 Aug 2006 15:01:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 15:01:06 GMT Message-Id: <200608161501.k7GF16YX077475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104244 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 15:01:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=104244 Change 104244 by rwatson@rwatson_zoo on 2006/08/16 15:00:06 Integrate OpenBSM 1.0a8 changes into TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#16 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#9 (text+ko) ==== @@ -10,6 +10,10 @@ - OpenBSM-specific events assigned numbers in the 43xxx range to avoid future collisions with Solaris. Darwin events renamed to AUE_DARWIN_foo, as they are now deprecated numberings. +- autoconf now detects clock_gettime(), which is not available on Darwin. +- praudit output fixes relating to arg32 and arg64 tokens. +- Maximum record size updated to 64k-1 to match Solaris record size limit. +- Various style and comment cleanups in include files. OpenBSM 1.0 alpha 7 @@ -188,4 +192,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#8 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#9 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#14 (text+ko) ==== @@ -74,6 +74,7 @@ Olivier Houchard Christian Peron Martin Fong + Pawel Worach In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -95,4 +96,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#13 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#14 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#14 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#13 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#14 $ */ #ifndef _BSM_AUDIT_H @@ -38,11 +38,12 @@ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 -#define MAX_AUDIT_RECORD_SIZE 4096 +#define MAXAUDITDATA (0x8000 - 1) +#define MAX_AUDIT_RECORD_SIZE MAXAUDITDATA #define MIN_AUDIT_FILE_SIZE (512 * 1024) /* - * Triggers for the audit daemon + * Triggers for the audit daemon. */ #define AUDIT_TRIGGER_MIN 1 #define AUDIT_TRIGGER_LOW_SPACE 1 @@ -53,7 +54,8 @@ #define AUDIT_TRIGGER_MAX 5 /* - * File that will be read for trigger events from the kernel + * Special file that will be read for trigger events from the kernel + * (FreeBSD). */ #define AUDIT_TRIGGER_FILE "/dev/audit" @@ -101,7 +103,7 @@ #define AU_ALL 0xffffffff /* - * IPC types + * IPC types. */ #define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ #define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */ @@ -146,19 +148,6 @@ /* * Audit policy controls. */ -#ifdef OLD_WORLD_ORDER -#define AUDIT_CNT 0x0001 -#define AUDIT_AHLT 0x0002 -#define AUDIT_ARGV 0x0004 -#define AUDIT_ARGE 0x0008 -#define AUDIT_PASSWD 0x0010 -#define AUDIT_SEQ 0x0020 -#define AUDIT_WINDATA 0x0040 -#define AUDIT_USER 0x0080 -#define AUDIT_GROUP 0x0100 -#define AUDIT_TRAIL 0x0200 -#define AUDIT_PATH 0x0400 -#else /* !OLD_WORLD_ORDER */ #define AUDIT_CNT 0x0001 #define AUDIT_AHLT 0x0002 #define AUDIT_ARGV 0x0004 @@ -173,10 +162,9 @@ #define AUDIT_PUBLIC 0x0800 #define AUDIT_ZONENAME 0x1000 #define AUDIT_PERZONE 0x2000 -#endif /* !OLD_WORLD_ORDER */ /* - * Audit queue control parameters + * Audit queue control parameters. */ #define AQ_HIWATER 100 #define AQ_MAXHIGH 10000 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#14 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#13 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#14 $ */ #ifndef _LIBBSM_H_ @@ -37,8 +37,8 @@ * solely to allow OpenSSH to compile; Darwin/Apple code should not use them. */ -#define MAX_ARGS 10 -#define MAX_ENV 10 +#define BSM_MAX_ARGS 10 +#define BSM_MAX_ENV 10 #include #include @@ -82,11 +82,10 @@ #define BSM_TEXTBUFSZ MAX_AUDITSTRING_LEN /* OpenSSH compatibility */ /* - * These are referenced in Solaris 9 au_open(3BSM); values are guesses. - * Provided for OpenSSH compatibility. + * Arguments to au_close(3). */ -#define AU_TO_NO_WRITE 0 -#define AU_TO_WRITE 1 +#define AU_TO_NO_WRITE 0 /* Abandon audit record. */ +#define AU_TO_WRITE 1 /* Commit audit record. */ __BEGIN_DECLS struct au_event_ent { @@ -138,15 +137,6 @@ __BEGIN_DECLS -/* - * Internal representation of audit user in libnsl. - */ -typedef struct au_user_str_s { - char *au_name; - char *au_always; - char *au_never; -} au_user_str_t; - typedef struct au_tid32 { u_int32_t port; u_int32_t addr; @@ -228,7 +218,7 @@ */ typedef struct { u_int32_t count; - char *text[MAX_ARGS]; + char *text[BSM_MAX_ARGS]; } au_execarg_t; /* @@ -237,7 +227,7 @@ */ typedef struct { u_int32_t count; - char *text[MAX_ENV]; + char *text[BSM_MAX_ENV]; } au_execenv_t; /* @@ -729,8 +719,6 @@ /* * Functions relating to querying audit event information. - * - * XXXRW: getauevnonam() has no _r version? */ void setauevent(void); void endauevent(void); @@ -770,6 +758,11 @@ char *del, char raw, char sfrm); __END_DECLS +/* + * The remaining APIs are associated with Apple's BSM implementation, in + * particular as relates to Mach IPC auditing and triggers passed via Mach + * IPC. + */ #ifdef __APPLE__ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#5 (text+ko) ==== @@ -12,6 +12,9 @@ /* Define to 1 if your system has a working `chown' function. */ #undef HAVE_CHOWN +/* Define to 1 if you have the `clock_gettime' function. */ +#undef HAVE_CLOCK_GETTIME + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#8 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#23 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#26 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a7. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a8. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a7' -PACKAGE_STRING='OpenBSM 1.0a7' +PACKAGE_VERSION='1.0a8' +PACKAGE_STRING='OpenBSM 1.0a8' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a7 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a7:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a8:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a7 +OpenBSM configure 1.0a8 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a7, which was +It was created by OpenBSM $as_me 1.0a8, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a7 + VERSION=1.0a8 cat >>confdefs.h <<_ACEOF @@ -22833,7 +22833,8 @@ -for ac_func in bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul + +for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -23477,7 +23478,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a7, which was +This file was extended by OpenBSM $as_me 1.0a8, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23540,7 +23541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a7 +OpenBSM config.status 1.0a8 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#9 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a8], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#8 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#9 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -56,7 +56,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRFTIME -AC_CHECK_FUNCS([bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) +AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) # sys/queue.h exists on most systems, but its capabilities vary a great deal. # test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#10 $ */ #include @@ -62,27 +62,32 @@ evdesc = strtok_r(NULL, eventdelim, &last); evclass = strtok_r(NULL, eventdelim, &last); - if ((evno == NULL) || (evname == NULL) || (evdesc == NULL) || - (evclass == NULL)) + if ((evno == NULL) || (evname == NULL)) return (NULL); if (strlen(evname) >= AU_EVENT_NAME_MAX) return (NULL); strcpy(e->ae_name, evname); - if (strlen(evdesc) >= AU_EVENT_DESC_MAX) - return (NULL); - strcpy(e->ae_desc, evdesc); + if (evdesc != NULL) { + if (strlen(evdesc) >= AU_EVENT_DESC_MAX) + return (NULL); + strcpy(e->ae_desc, evdesc); + } else + strcpy(e->ae_desc, ""); e->ae_number = atoi(evno); /* * Find out the mask that corresponds to the given list of classes. */ - if (getauditflagsbin(evclass, &evmask) != 0) + if (evclass != NULL) { + if (getauditflagsbin(evclass, &evmask) != 0) + e->ae_class = AU_NULL; + else + e->ae_class = evmask.am_success; + } else e->ae_class = AU_NULL; - else - e->ae_class = evmask.am_success; return (e); } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#15 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#16 $ */ #include @@ -820,7 +820,7 @@ print_delim(fp, del); print_1_byte(fp, tok->tt.arg32.no, "%u"); print_delim(fp, del); - print_4_bytes(fp, tok->tt.arg32.val, "%#x"); + print_4_bytes(fp, tok->tt.arg32.val, "0x%x"); print_delim(fp, del); print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len); } @@ -859,7 +859,7 @@ print_delim(fp, del); print_1_byte(fp, tok->tt.arg64.no, "%u"); print_delim(fp, del); - print_8_bytes(fp, tok->tt.arg64.val, "%#llx"); + print_8_bytes(fp, tok->tt.arg64.val, "0x%llx"); print_delim(fp, del); print_string(fp, tok->tt.arg64.text, tok->tt.arg64.len); } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#4 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#5 $ */ /* @@ -144,6 +144,17 @@ write_token(directory, token_filename, file_token); } +static void +generate_file_record(const char *directory, const char *record_filename) +{ + token_t *file_token; + + file_token = au_to_file("test", file_token_timeval); + if (file_token == NULL) + err(EX_UNAVAILABLE, "au_to_file"); + write_record(directory, record_filename, file_token, AUE_NULL); +} + /* * AUT_OHEADER */ @@ -326,6 +337,32 @@ write_token(directory, buf, subject32ex_token); } +static void +generate_subject32ex_record(const char *directory, const char *record_filename, + u_int32_t type) +{ + token_t *subject32ex_token; + char *buf; + + buf = (char *)malloc(strlen(record_filename) + 6); + if (type == AU_IPv6) { + inet_pton(AF_INET6, "fe80::1", subject32_tid_addr.at_addr); + subject32_tid_addr.at_type = AU_IPv6; + sprintf(buf, "%s%s", record_filename, "-IPv6"); + } else { + subject32_tid_addr.at_addr[0] = inet_addr("127.0.0.1"); + subject32_tid_addr.at_type = AU_IPv4; + sprintf(buf, "%s%s", record_filename, "-IPv4"); + } + + subject32ex_token = au_to_subject32_ex(subject32_auid, subject32_euid, + subject32_egid, subject32_ruid, subject32_rgid, subject32_pid, + subject32_sid, &subject32_tid_addr); + if (subject32ex_token == NULL) + err(EX_UNAVAILABLE, "au_to_subject32_ex"); + write_record(directory, record_filename, subject32ex_token, AUE_NULL); +} + static au_id_t process32_auid = 0x12345678; static uid_t process32_euid = 0x01234567; static gid_t process32_egid = 0x23456789; @@ -382,6 +419,22 @@ write_token(directory, token_filename, process32ex_token); } +static void +generate_process32ex_record(const char *directory, const char *record_filename) +{ + token_t *process32ex_token; + + process32_tid_addr.at_addr[0] = inet_addr("127.0.0.1"); + process32_tid_addr.at_type = AU_IPv4; + + process32ex_token = au_to_process32_ex(process32_auid, process32_euid, + process32_egid, process32_ruid, process32_rgid, process32_pid, + process32_sid, &process32_tid_addr); + if (process32ex_token == NULL) + err(EX_UNAVAILABLE, "au_to_process32_ex"); + write_record(directory, record_filename, process32ex_token, AUE_NULL); +} + static char return32_status = 0xd7; static uint32_t return32_ret = 0x12345678; @@ -777,29 +830,29 @@ } if (do_records) { - generate_file_token(directory, "file_token"); - generate_trailer_token(directory, "trailer_token"); - generate_header32_token(directory, "header32_token"); - generate_data_token(directory, "data_record"); - generate_ipc_token(directory, "ipc_record"); - generate_path_token(directory, "path_record"); - generate_subject32_token(directory, "subject32_record"); - generate_subject32ex_token(directory, "subject32ex_record", AU_IPv4); - generate_subject32ex_token(directory, "subject32ex_record", AU_IPv6); - generate_process32_token(directory, "process32_record"); - generate_process32ex_token(directory, "process32ex_token"); - generate_return32_token(directory, "return32_record"); - generate_text_token(directory, "text_record"); - generate_opaque_token(directory, "opaque_record"); - generate_in_addr_token(directory, "in_addr_record"); - generate_ip_token(directory, "ip_record"); - generate_iport_token(directory, "iport_record"); - generate_arg32_token(directory, "arg32_record"); - generate_seq_token(directory, "seq_record"); - generate_attr_token(directory, "attr_record"); - generate_ipc_perm_token(directory, "ipc_perm_record"); - generate_groups_token(directory, "groups_record"); - generate_attr32_token(directory, "attr32_record"); + generate_file_record(directory, "file_record"); + generate_data_record(directory, "data_record"); + generate_ipc_record(directory, "ipc_record"); + generate_path_record(directory, "path_record"); + generate_subject32_record(directory, "subject32_record"); + generate_subject32ex_record(directory, "subject32ex_record", + AU_IPv4); + generate_subject32ex_record(directory, "subject32ex_record", + AU_IPv6); + generate_process32_record(directory, "process32_record"); + generate_process32ex_record(directory, "process32ex_record"); + generate_return32_record(directory, "return32_record"); + generate_text_record(directory, "text_record"); + generate_opaque_record(directory, "opaque_record"); + generate_in_addr_record(directory, "in_addr_record"); + generate_ip_record(directory, "ip_record"); + generate_iport_record(directory, "iport_record"); + generate_arg32_record(directory, "arg32_record"); + generate_seq_record(directory, "seq_record"); + generate_attr_record(directory, "attr_record"); + generate_ipc_perm_record(directory, "ipc_perm_record"); + generate_groups_record(directory, "groups_record"); + generate_attr32_record(directory, "attr32_record"); } return (0); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#3 (text+ko) ==== @@ -1,9 +1,9 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#3 $ # INCLUDES = -I$(top_srcdir) -bin_PROGRAMS = autool -autool_SOURCES = autool.c -autool_LDADD = $(top_builddir)/libbsm/libbsm.la +bin_PROGRAMS = audump +audump_SOURCES = audump.c +audump_LDADD = $(top_builddir)/libbsm/libbsm.la ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#3 $ # srcdir = @srcdir@ @@ -40,7 +40,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = autool$(EXEEXT) +bin_PROGRAMS = audump$(EXEEXT) subdir = tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -53,9 +53,9 @@ am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_autool_OBJECTS = autool.$(OBJEXT) -autool_OBJECTS = $(am_autool_OBJECTS) -autool_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la +am_audump_OBJECTS = audump.$(OBJEXT) +audump_OBJECTS = $(am_audump_OBJECTS) +audump_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -67,8 +67,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(autool_SOURCES) -DIST_SOURCES = $(autool_SOURCES) +SOURCES = $(audump_SOURCES) +DIST_SOURCES = $(audump_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -174,8 +174,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ INCLUDES = -I$(top_srcdir) -autool_SOURCES = autool.c -autool_LDADD = $(top_builddir)/libbsm/libbsm.la +audump_SOURCES = audump.c +audump_LDADD = $(top_builddir)/libbsm/libbsm.la all: all-am .SUFFIXES: @@ -237,9 +237,9 @@ echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -autool$(EXEEXT): $(autool_OBJECTS) $(autool_DEPENDENCIES) - @rm -f autool$(EXEEXT) - $(LINK) $(autool_LDFLAGS) $(autool_OBJECTS) $(autool_LDADD) $(LIBS) +audump$(EXEEXT): $(audump_OBJECTS) $(audump_DEPENDENCIES) + @rm -f audump$(EXEEXT) + $(LINK) $(audump_LDFLAGS) $(audump_OBJECTS) $(audump_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -247,7 +247,7 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autool.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audump.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 15:39:05 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 99DC316A4DA for ; Wed, 16 Aug 2006 15:39:05 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75B4743D45 for ; Wed, 16 Aug 2006 15:39:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 08C1946CA5 for ; Wed, 16 Aug 2006 11:39:03 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6312B58447; Wed, 16 Aug 2006 15:39:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D6ED16A4E7; Wed, 16 Aug 2006 15:39:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2953716A4DF for ; Wed, 16 Aug 2006 15:39:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FE0543D5A for ; Wed, 16 Aug 2006 15:38:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GFcxJ4080695 for ; Wed, 16 Aug 2006 15:38:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GFcxvY080692 for perforce@freebsd.org; Wed, 16 Aug 2006 15:38:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 15:38:59 GMT Message-Id: <200608161538.k7GFcxvY080692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104251 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 15:39:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=104251 Change 104251 by rwatson@rwatson_fledge on 2006/08/16 15:38:01 Add OpenBSM 1.0-alpha8 binary. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha8.tgz#1 add Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 15:43:38 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ACBEB16A4E8 for ; Wed, 16 Aug 2006 15:43:38 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEE3343D58 for ; Wed, 16 Aug 2006 15:43:31 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 166E746CDF for ; Wed, 16 Aug 2006 11:43:30 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BC0C992AB2; Wed, 16 Aug 2006 15:42:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id ACBF216A4DD; Wed, 16 Aug 2006 15:42:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 703ED16A4E1 for ; Wed, 16 Aug 2006 15:42:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 529C743D5C for ; Wed, 16 Aug 2006 15:42:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GFg4SL080955 for ; Wed, 16 Aug 2006 15:42:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GFg3x6080952 for perforce@freebsd.org; Wed, 16 Aug 2006 15:42:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 15:42:03 GMT Message-Id: <200608161542.k7GFg3x6080952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104253 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 15:43:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=104253 Change 104253 by rwatson@rwatson_fledge on 2006/08/16 15:41:49 OpenBSM 1.0a8 release. Add file sizes to other downloads. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#13 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#13 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#12 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#13 $ @@ -120,32 +120,40 @@ Please see the file README present in the OpenBSM distribution for build and installation instructions.

    +

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

    +

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

    + improvements. Download + (464K).

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

    + bug fixing. Download + (464K).

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

    + Linux. Download + (432K).

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

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

    From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 16:04:41 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F125616A4DA for ; Wed, 16 Aug 2006 16:04:41 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC00D43D45 for ; Wed, 16 Aug 2006 16:04:34 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C64F846CA0 for ; Wed, 16 Aug 2006 12:04:33 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 50CD2923AB; Wed, 16 Aug 2006 15:56:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 40F8116A4DF; Wed, 16 Aug 2006 15:56:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C7FB16A4DD for ; Wed, 16 Aug 2006 15:56:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90DC143D4C for ; Wed, 16 Aug 2006 15:56:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GFuMbd081687 for ; Wed, 16 Aug 2006 15:56:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GFuMVH081682 for perforce@freebsd.org; Wed, 16 Aug 2006 15:56:22 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 15:56:22 GMT Message-Id: <200608161556.k7GFuMVH081682@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104254 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 16:04:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=104254 Change 104254 by millert@millert_macbook on 2006/08/16 15:55:26 Fix editor goof Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#4 (text+ko) ==== @@ -4,8 +4,7 @@ -I../include -I../../libsepol/include -I../../libsecompat -Wall LIB = selinux -OBJS = - avc.o avc_internal.o avc_sidtab.o booleans.o canonicalize_context.o \ +OBJS = avc.o avc_internal.o avc_sidtab.o booleans.o canonicalize_context.o \ checkAccess.o check_context.o compute_av.o compute_create.o \ compute_member.o compute_relabel.o compute_user.o context.o \ disable.o enabled.o fgetfilecon.o freecon.o freeconary.o \ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 16:13:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F296F16A4DF for ; Wed, 16 Aug 2006 16:13:06 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D9F643D76 for ; Wed, 16 Aug 2006 16:12:54 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 48E3046CA0 for ; Wed, 16 Aug 2006 12:12:52 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9D18A92B94; Wed, 16 Aug 2006 16:09:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 89D8916A513; Wed, 16 Aug 2006 16:09:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C82B16A500 for ; Wed, 16 Aug 2006 16:09:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E73DD43DC0 for ; Wed, 16 Aug 2006 16:08:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GG8ddk083545 for ; Wed, 16 Aug 2006 16:08:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GG8dFd083542 for perforce@freebsd.org; Wed, 16 Aug 2006 16:08:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 16:08:39 GMT Message-Id: <200608161608.k7GG8dFd083542@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104256 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 16:13:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=104256 Change 104256 by rwatson@rwatson_fledge on 2006/08/16 16:08:37 Give ACLs their own web page. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#6 edit .. //depot/projects/trustedbsd/www/acls.page#1 add .. //depot/projects/trustedbsd/www/components.page#7 edit .. //depot/projects/trustedbsd/www/sidebar.xml#9 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#6 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#5 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#6 $ STYLESHEET= page.xsl @@ -46,6 +46,7 @@ SRCS+= sedarwin.page SRCS+= audit.page SRCS+= cap.page +SRCS+= acls.page IMGS= components.gif componentsgray.gif IMGS+= developers.gif developersgray.gif docs.gif ==== //depot/projects/trustedbsd/www/components.page#7 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/components.page#6 $ + $P4: //depot/projects/trustedbsd/www/components.page#7 $ @@ -83,13 +83,11 @@

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

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

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

    TrustedBSD News

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

      Components

        -
      • ACLs
        • +
      • ACLs
      • Audit
      • Extended Attributes and UFS2
      • Capabilities
        • From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 16:22:10 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A737416A4E9 for ; Wed, 16 Aug 2006 16:22:10 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D449843D58 for ; Wed, 16 Aug 2006 16:22:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 88CC846BCA for ; Wed, 16 Aug 2006 12:22:05 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0B7F05541A; Wed, 16 Aug 2006 16:22:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EF11016A4E2; Wed, 16 Aug 2006 16:22:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AED4216A4DA for ; Wed, 16 Aug 2006 16:22:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41F4843D46 for ; Wed, 16 Aug 2006 16:22:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GGM4CV084784 for ; Wed, 16 Aug 2006 16:22:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GGLuOT084672 for perforce@freebsd.org; Wed, 16 Aug 2006 16:21:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 16:21:56 GMT Message-Id: <200608161621.k7GGLuOT084672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104257 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 16:22:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=104257 Change 104257 by rwatson@rwatson_zoo on 2006/08/16 16:21:10 Integrate TrustedBSD base branch from FreeBSD CVS: - ipfilter upgrade to 4.1.13 - linuxulator update to 2.6.x - strstr() in libkern - more sockets and protocols cleanup - new DDB lock debugging bits - new audit syscalls.master details to improve module support - tun kqueue support - sysctl xint + xlong - usual plethora of arm support changes, device driver updates, etc. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#75 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#11 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#9 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/HISTORY#10 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/Makefile#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/bpf_filter.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/iplang_y.y#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipmon.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/sbpf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsend.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptests.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/lsock.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/resend.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sbpf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sock.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipt.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/addicmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/addkeep.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/facpri.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/icmpcode.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_tx.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/make_range.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/optprint.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printfr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printlog.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipmon.8#10 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/radix.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/samples/proxy.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#10 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i1#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i11#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i5#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i8#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i9#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in2#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in5#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i1#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i11#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i8#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i9#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in2#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in5#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/test.format#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/todo#4 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipf_y.y#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfcomp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipftest.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipmon.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipnat_y.y#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipsyncm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipsyncs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/smbutil/print.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/smbutil/view.c#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/contrib/mm/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#11 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#29 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/msgctl.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/syslog.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#30 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strcoll.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/connect.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getfsstat.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/write_ia64_disk.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_lastlog/pam_lastlog.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#22 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_pspinlock.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/tftpd/tftpd.8#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#105 integrate .. //depot/projects/trustedbsd/base/sbin/dump/main.c#24 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifclone.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#21 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/libipf/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.c#27 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#25 integrate .. //depot/projects/trustedbsd/base/share/examples/drivers/make_device_driver.sh#6 integrate .. //depot/projects/trustedbsd/base/share/examples/drivers/make_pseudo_driver.sh#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#28 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#21 integrate .. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_pppoe.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uscanner.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vlan.4#17 integrate .. //depot/projects/trustedbsd/base/share/man/man7/release.7#30 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sysctl.9#2 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#24 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#16 integrate .. //depot/projects/trustedbsd/base/sys/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/acpica/madt.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#34 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/support.S#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#28 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pmap.h#21 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/mem.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#17 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_st.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#14 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/assabet_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_machdep.c#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/Makefile#17 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#32 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pass.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#35 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#43 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_signal.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_util.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_proto.h#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscall.h#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscallnames.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sysent.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/syscalls.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#103 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#31 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#65 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#49 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#44 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acfreebsd.h#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#18 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.c#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_compat.h#15 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil.h#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_frag.c#12 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#10 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_log.c#13 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.c#15 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_proxy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.c#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_sync.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_sync.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ipl.h#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/mlfk_ipl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_ibm.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdMemory.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pci_link.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_video.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athioctl.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#56 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#54 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.h#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/exca/excareg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard_cis.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbreg.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10k1.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.h#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_ctl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#26 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_msdosfs.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#17 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#16 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#27 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/madt.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#62 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#68 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/support.s#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#50 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc_syscall.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc_sysent.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_proto.h#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_syscall.h#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysent.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix_syscall.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix_sysent.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.isc.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.xenix.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/pmap.h#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#33 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_dummy.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#25 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#30 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#23 integrate .. //depot/projects/trustedbsd/base/sys/i386/xbox/xbox.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/pmap.h#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_lock.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sx.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/makesyscalls.sh#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_turnstile.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/systrace_args.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_proto.c#7 delete .. //depot/projects/trustedbsd/base/sys/kern/uipc_sem.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#58 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#79 integrate .. //depot/projects/trustedbsd/base/sys/libkern/strstr.c#1 branch .. //depot/projects/trustedbsd/base/sys/modules/if_ef/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_ppp/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/modules/linprocfs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/linux/Makefile#15 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/mppc/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/sound/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#44 integrate .. //depot/projects/trustedbsd/base/sys/net/bridgestp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#34 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#38 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#20 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#22 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.h#13 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_pppoe.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_pppoe.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#64 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#50 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#26 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.h#12 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#32 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#47 integrate .. //depot/projects/trustedbsd/base/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/pc98_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#24 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#44 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#58 integrate .. //depot/projects/trustedbsd/base/sys/sys/dirent.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/domain.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/eventhandler.h#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/imgact.h#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/libkern.h#20 integrate .. //depot/projects/trustedbsd/base/sys/sys/lockmgr.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#57 integrate .. //depot/projects/trustedbsd/base/sys/sys/sx.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#56 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#56 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#31 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysent.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#57 integrate .. //depot/projects/trustedbsd/base/sys/vm/device_pager.c#20 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#48 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#48 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#61 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#64 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#32 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#47 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/athstats.c#4 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/athstats.h#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/main.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/statfoo.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/statfoo.h#1 branch .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/nanobsd.sh#8 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/README#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/w00t/libw00t/w00t.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/README#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/dics/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/dics/dics.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/udps/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/udps/udps.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/wesside/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/wesside/wesside.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/main.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/statfoo.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/statfoo.h#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/wlanstats.h#1 branch .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.history#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/hexdump/parse.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/split/split.1#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/split/split.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#53 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/mailwrapper.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/mailwrapper.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/named/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/main.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/url.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/version/perform.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.lockd/lockd_lock.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.statd/procs.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rtsold/rtsold.8#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/command.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/config.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/devices.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/disks.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/dispatch.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/dmenu.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/globals.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/install.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/keymap.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/sade/label.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/list.h#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/main.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/menus.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/misc.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/msg.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/rtermcap.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/sade/sade.8#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/sade.h#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/system.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/termcap.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/usb.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/sade/variable.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/wizard.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/yppush/yppush_main.c#8 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#75 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.550 2006/08/02 15:26:15 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.42 2006/08/04 21:29:22 brooks Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -745,6 +745,7 @@ OLD_FILES+=usr/bin/perlcc OLD_FILES+=usr/bin/perldoc OLD_FILES+=usr/bin/suidperl +OLD_FILES+=usr/lib/pam_ftp.so OLD_FILES+=usr/libdata/perl/5.00503/CGI/Apache.pm OLD_FILES+=usr/libdata/perl/5.00503/CGI/Carp.pm OLD_FILES+=usr/libdata/perl/5.00503/CGI/Cookie.pm @@ -2726,7 +2727,209 @@ OLD_FILES+=usr/games/worm OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump +OLD_FILES+=sbin/mount_reiserfs +OLD_FILES+=usr/bin/hesinfo +OLD_FILES+=usr/share/examples/etc/usbd.conf +OLD_FILES+=usr/share/examples/meteor/README +OLD_FILES+=usr/share/examples/meteor/rgb16.c +OLD_FILES+=usr/share/examples/meteor/rgb24.c +OLD_FILES+=usr/share/examples/meteor/test-n.c +OLD_FILES+=usr/share/examples/meteor/yuvpk.c +OLD_FILES+=usr/share/examples/meteor/yuvpl.c +OLD_FILES+=usr/share/examples/worm/README +OLD_FILES+=usr/share/examples/worm/makecdfs.sh +OLD_FILES+=usr/share/groff_font/devlj4/Makefile +OLD_FILES+=usr/share/groff_font/devlj4/text.map +OLD_FILES+=usr/share/groff_font/devlj4/special.map +OLD_FILES+=usr/share/misc/nslookup.help +OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4 +OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd +OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R +OLD_FILES+=usr/share/zoneinfo/Africa/Timbuktu +OLD_FILES+=usr/share/zoneinfo/America/Buenos_Aires +OLD_FILES+=usr/share/zoneinfo/America/Cordoba +OLD_FILES+=usr/share/zoneinfo/America/Jujuy +OLD_FILES+=usr/share/zoneinfo/America/Catamarca +OLD_FILES+=usr/share/zoneinfo/America/Mendoza +OLD_FILES+=usr/share/zoneinfo/America/Indianapolis +OLD_FILES+=usr/share/zoneinfo/America/Louisville +OLD_FILES+=usr/share/zoneinfo/America/Argentina/ComodRivadavia +OLD_FILES+=usr/share/zoneinfo/Europe/Belfast +OLD_FILES+=usr/share/zoneinfo/Pacific/Yap +OLD_FILES+=usr/share/zoneinfo/SystemV/YST9 +OLD_FILES+=usr/share/zoneinfo/SystemV/PST8 +OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT +OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT +OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT +OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT +OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT +OLD_FILES+=usr/share/zoneinfo/SystemV/HST10 +OLD_FILES+=usr/share/zoneinfo/SystemV/MST7 +OLD_FILES+=usr/share/zoneinfo/SystemV/EST5 +OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT +OLD_FILES+=usr/share/zoneinfo/SystemV/CST6 +OLD_FILES+=usr/share/zoneinfo/SystemV/AST4 +OLD_FILES+=usr/share/doc/ntp/accopt.htm +OLD_FILES+=usr/share/doc/ntp/assoc.htm +OLD_FILES+=usr/share/doc/ntp/audio.htm +OLD_FILES+=usr/share/doc/ntp/authopt.htm +OLD_FILES+=usr/share/doc/ntp/biblio.htm +OLD_FILES+=usr/share/doc/ntp/build.htm +OLD_FILES+=usr/share/doc/ntp/clockopt.htm +OLD_FILES+=usr/share/doc/ntp/config.htm +OLD_FILES+=usr/share/doc/ntp/confopt.htm +OLD_FILES+=usr/share/doc/ntp/copyright.htm +OLD_FILES+=usr/share/doc/ntp/debug.htm +OLD_FILES+=usr/share/doc/ntp/driver1.htm +OLD_FILES+=usr/share/doc/ntp/driver10.htm +OLD_FILES+=usr/share/doc/ntp/driver11.htm +OLD_FILES+=usr/share/doc/ntp/driver12.htm +OLD_FILES+=usr/share/doc/ntp/driver16.htm +OLD_FILES+=usr/share/doc/ntp/driver18.htm +OLD_FILES+=usr/share/doc/ntp/driver19.htm +OLD_FILES+=usr/share/doc/ntp/driver2.htm +OLD_FILES+=usr/share/doc/ntp/driver20.htm +OLD_FILES+=usr/share/doc/ntp/driver22.htm +OLD_FILES+=usr/share/doc/ntp/driver23.htm +OLD_FILES+=usr/share/doc/ntp/driver24.htm +OLD_FILES+=usr/share/doc/ntp/driver26.htm +OLD_FILES+=usr/share/doc/ntp/driver27.htm +OLD_FILES+=usr/share/doc/ntp/driver28.htm +OLD_FILES+=usr/share/doc/ntp/driver29.htm +OLD_FILES+=usr/share/doc/ntp/driver3.htm +OLD_FILES+=usr/share/doc/ntp/driver30.htm +OLD_FILES+=usr/share/doc/ntp/driver32.htm +OLD_FILES+=usr/share/doc/ntp/driver33.htm +OLD_FILES+=usr/share/doc/ntp/driver34.htm +OLD_FILES+=usr/share/doc/ntp/driver35.htm +OLD_FILES+=usr/share/doc/ntp/driver36.htm +OLD_FILES+=usr/share/doc/ntp/driver37.htm +OLD_FILES+=usr/share/doc/ntp/driver4.htm +OLD_FILES+=usr/share/doc/ntp/driver5.htm +OLD_FILES+=usr/share/doc/ntp/driver6.htm +OLD_FILES+=usr/share/doc/ntp/driver7.htm +OLD_FILES+=usr/share/doc/ntp/driver8.htm +OLD_FILES+=usr/share/doc/ntp/driver9.htm +OLD_FILES+=usr/share/doc/ntp/exec.htm +OLD_FILES+=usr/share/doc/ntp/extern.htm +OLD_FILES+=usr/share/doc/ntp/gadget.htm +OLD_FILES+=usr/share/doc/ntp/hints.htm +OLD_FILES+=usr/share/doc/ntp/howto.htm +OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm +OLD_FILES+=usr/share/doc/ntp/index.htm +OLD_FILES+=usr/share/doc/ntp/kern.htm +OLD_FILES+=usr/share/doc/ntp/kernpps.htm +OLD_FILES+=usr/share/doc/ntp/ldisc.htm +OLD_FILES+=usr/share/doc/ntp/measure.htm +OLD_FILES+=usr/share/doc/ntp/miscopt.htm +OLD_FILES+=usr/share/doc/ntp/monopt.htm +OLD_FILES+=usr/share/doc/ntp/mx4200data.htm +OLD_FILES+=usr/share/doc/ntp/notes.htm +OLD_FILES+=usr/share/doc/ntp/ntpd.htm +OLD_FILES+=usr/share/doc/ntp/ntpdate.htm +OLD_FILES+=usr/share/doc/ntp/ntpdc.htm +OLD_FILES+=usr/share/doc/ntp/ntpq.htm +OLD_FILES+=usr/share/doc/ntp/ntptime.htm +OLD_FILES+=usr/share/doc/ntp/ntptrace.htm +OLD_FILES+=usr/share/doc/ntp/parsedata.htm +OLD_FILES+=usr/share/doc/ntp/parsenew.htm +OLD_FILES+=usr/share/doc/ntp/patches.htm +OLD_FILES+=usr/share/doc/ntp/porting.htm +OLD_FILES+=usr/share/doc/ntp/pps.htm +OLD_FILES+=usr/share/doc/ntp/prefer.htm +OLD_FILES+=usr/share/doc/ntp/qth.htm +OLD_FILES+=usr/share/doc/ntp/quick.htm +OLD_FILES+=usr/share/doc/ntp/rdebug.htm +OLD_FILES+=usr/share/doc/ntp/refclock.htm +OLD_FILES+=usr/share/doc/ntp/release.htm +OLD_FILES+=usr/share/doc/ntp/tickadj.htm +OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz +OLD_FILES+=usr/share/doc/papers/px.ascii.gz +OLD_FILES+=usr/share/man/man1/hesinfo.1.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/hesiod.3.gz +OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz +OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz +OLD_FILES+=usr/share/man/man3/exp10.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbmb.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/hesiod.3.gz +OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz +OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz +OLD_FILES+=usr/share/man/man3/exp10.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbmb.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/fungetrune.3.gz +OLD_FILES+=usr/share/man/man3/fputrune.3.gz +OLD_FILES+=usr/share/man/man3/fgetrune.3.gz +OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz +OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz +.if ${TARGET_ARCH} != "i386" +OLD_FILES+=usr/share/man/man8/boot_i386.8.gz +.endif +OLD_FILES+=usr/share/man/man8/ofwdump.8.gz +OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz +OLD_FILES+=usr/share/man/man9/VFS_START.9.gz +OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz +OLD_FILES+=usr/share/man/man9/cpu_critical_enter.9.gz +OLD_FILES+=usr/share/info/annotate.info.gz +OLD_FILES+=usr/share/info/tar.info.gz +OLD_FILES+=usr/share/bsnmp/defs/tree.def +OLD_FILES+=usr/share/bsnmp/defs/mibII_tree.def +OLD_FILES+=usr/share/bsnmp/defs/netgraph_tree.def +OLD_FILES+=usr/share/bsnmp/mibs/FOKUS-MIB.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-MIB.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-SNMPD.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc +OLD_FILES+=usr/libdata/msdosfs/iso22dos +OLD_FILES+=usr/libdata/msdosfs/iso72dos +OLD_FILES+=usr/libdata/msdosfs/koi2dos +OLD_FILES+=usr/libdata/msdosfs/koi8u2dos +# The following files are *not* obsolete, they just don't get touched at +# install, so don't add them: +# - boot/loader.rc +# - usr/share/tmac/man.local +# - usr/share/tmac/mm/locale +# - usr/share/tmac/mm/se_locale +# - var/yp/Makefile + +# 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade +OLD_LIBS+=lib/libcrypto.so.4 +OLD_LIBS+=usr/lib/libssl.so.4 # 20060521: gethostbyaddr(3) ABI change OLD_LIBS+=usr/lib/libroken.so.8 OLD_LIBS+=lib/libatm.so.3 @@ -2950,7 +3153,14 @@ # 199909XX OLD_LIBS+=usr/lib/libc_r.so.3 # ??? +OLD_LIBS+=usr/lib/libarchive.so.2 +OLD_LIBS+=usr/lib/libbsnmp.so.1 +OLD_LIBS+=usr/lib/libc_r.so.6 +OLD_LIBS+=usr/lib/libcipher.so.2 OLD_LIBS+=usr/lib/libgssapi.so.6 +OLD_LIBS+=usr/lib/libkse.so.1 +OLD_LIBS+=usr/lib/liblwres.so.3 +OLD_LIBS+=usr/lib/pam_ftp.so.2 # 20040925: bind9 import OLD_DIRS+=usr/share/doc/bind/html ==== //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#9 (text+ko) ==== @@ -3,12 +3,13 @@ # # See the IPFILTER.LICENCE file for details on licencing. # +TOP=../.. BINDEST=/usr/sbin SBINDEST=/sbin MANDIR=/usr/share/man SEARCHDIRS!=echo $(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin | awk '{for(i=1;i&1 | sed -n 's/.*devfs.*/-DDEVFS/p' CPU!=uname -m INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch -DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) +DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) -fno-builtin IPDEF=$(DEF) -DGATEWAY -DDIRECTED_BROADCAST VNODESHDIR=/sys/kern MLD=$(ML) @@ -516,8 +517,8 @@ (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) coverage: - ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -n > report - sort -n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += $$F[0]/100*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,$$t/$$lc*100;' >> report + ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -k 1n -k 3n > report + sort -k 1n -k 3n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += ($$F[0]/100)*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,($$t/$$lc)*100;' >> report clean-coverage: /bin/rm -f *.gcov *.da ==== //depot/projects/trustedbsd/base/contrib/ipfilter/HISTORY#10 (text+ko) ==== @@ -10,6 +10,88 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +4.1.13 - Released 4 April 2006 + +fix bug where null pointers introduced by proxies could cause a crash + +pass out the rule flags with SIOCAUTHW + +force loading NAT rules with bad proxy labels to cause an error + +nat_state is used unsafely in calls to fr_addstate + +make return-rst and return-icmp* work with auth rules + +4.1.12 - Released 28 March 2006 + +poll support on FreeBSD/NetBSD needs to use selrecord/selwakeup + +make the fastroute code used by ipftest invoke state/NAT + +move verbose/debug macros out of fil.c and into ip_fil.h (for wider use) + +remove unused code in fr_fastroute + +fix NAT with rules that specify forward and reverise interfaces + +add missing ipfsync_canread() and ipfsync_canwrite() + +behaviour of \ on the end of a line in ipf.conf does not match older behaviour + +remove duplicate statistics line output with "ipfstat -s" +4.1.11 - Released 19 March 2006 + +Patch for NAT with ipfsync from N. Ersen (SESCI) - www.enderunix.org + +NetBSD coverity report fixes (from run 5) + +Possible to reacquire ipf_auth without releasing it in some circumstances + +Locking in FreeBSD's iplioctl for ipf_global isn't present like it shoudl be + +Add poll support for platforms I can build on: NetBSD, FreeBSD, Solaris, Linux + +Using auth rules to return "keep state" got broken with pushing fr_addstate +call into fr_firewall + +all use of '!' in map/rdr rules to match use in ipf configs + +add -L command line option to ipmon to set the default syslog facility + +looking up a port number is more complex than needed in ipft_tx.c + +allow lib/getport to work when neither tcp or udp are specified in a rule + +remove some dead code from lib/addicmpc, lib/facpri.c, lib/icmpcode.c + +program in some more cases where TCP packets fail an initial in-window +check but should be allowed to match + +filter rule added with NAT/state handling of SIOCSTPUT doesn't properly +initialise all fields, making it possible to panic + +simplify NAT ICMP error handling where it updates checksums + +rename "min" variables to "xmin" on NetBSD to avoid problems with the +macro "min" + +#ifdef's for NetBSD compile incorrect for pfil interface + +support select/poll on NetBSD + +copying out a packet with an auth rule fails (EFAULT) because the wrong +pointer is passed to copyoutptr + +ip_len/ip_off where byte swapped twice instead of once for packets +going to be stored on the auth queue + +change timeout queue manipulation functions to make fewer mutex calls + +fix use of skip rules with groups +fix coding problems discovered by the coverity project for FreeBSD + +update BPF program validation with FreeBSD changes + 4.1.10 - Released 6 December 2005 Expand regression testing to cover more features ==== //depot/projects/trustedbsd/base/contrib/ipfilter/Makefile#8 (text+ko) ==== @@ -5,8 +5,8 @@ # provided that this notice is preserved and due credit is given # to the original author and the contributors. # -# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.5 2005/12/30 11:52:22 guido Exp $ -# Id: Makefile,v 2.76.2.13 2004/11/08 18:42:40 darrenr Exp +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.6 2006/08/16 12:23:00 guido Exp $ +# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $ # SHELL=/bin/sh BINDEST=/usr/local/bin @@ -135,6 +135,7 @@ @echo "freebsd3 - compile for FreeBSD-3.x" @echo "freebsd4 - compile for FreeBSD-4.x" @echo "freebsd5 - compile for FreeBSD-5.x" + @echo "freebsd6 - compile for FreeBSD-6.x" @echo "bsd - compile for generic 4.4BSD systems" @echo "bsdi - compile for BSD/OS" @echo "irix - compile for SGI IRIX" @@ -187,7 +188,7 @@ fi make freebsd20 -freebsd5: include +freebsd5 freebsd6: include if [ x$(INET6) = x ] ; then \ echo "#undef INET6" > opt_inet6.h; \ else \ ==== //depot/projects/trustedbsd/base/contrib/ipfilter/bpf_filter.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.4 2005/12/30 11:52:22 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.5 2006/08/16 12:23:00 guido Exp $ */ /*- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -42,7 +42,7 @@ #if !(defined(lint) || defined(KERNEL) || defined(_KERNEL)) static const char rcsid[] = - "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.1 2005/06/18 02:41:30 darrenr Exp $ (LBL)"; + "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.2 2005/12/30 12:57:28 darrenr Exp $ (LBL)"; #endif #include @@ -468,9 +468,10 @@ /* * Return true if the 'fcode' is a valid filter program. * The constraints are that each jump be forward and to a valid - * code. The code must terminate with either an accept or reject. - * 'valid' is an array for use by the routine (it must be at least - * 'len' bytes long). + * code, that memory accesses are within valid ranges (to the + * extent that this can be checked statically; loads of packet + * data have to be, and are, also checked at run time), and that + * the code terminates with either an accept or reject. * * The kernel needs to be able to verify an application's filter code. * Otherwise, a bogus program could easily crash the system. @@ -480,38 +481,114 @@ struct bpf_insn *f; int len; { - register int i; - register struct bpf_insn *p; + u_int i, from; + const struct bpf_insn *p; + + if (len == 0) + return 1; + + if (len < 1 || len > BPF_MAXINSNS) + return 0; for (i = 0; i < len; ++i) { + p = &f[i]; + switch (BPF_CLASS(p->code)) { /* - * Check that that jumps are forward, and within - * the code block. + * Check that memory operations use valid addresses. */ - p = &f[i]; - if (BPF_CLASS(p->code) == BPF_JMP) { - register int from = i + 1; - - if (BPF_OP(p->code) == BPF_JA) { - if (from + p->k >= (unsigned)len) + case BPF_LD: + case BPF_LDX: + switch (BPF_MODE(p->code)) { + case BPF_IMM: + break; + case BPF_ABS: + case BPF_IND: + case BPF_MSH: + /* + * More strict check with actual packet length + * is done runtime. + */ +#if 0 + if (p->k >= bpf_maxbufsize) + return 0; +#endif + break; + case BPF_MEM: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_LEN: + break; + default: + return 0; + } + break; + case BPF_ST: + case BPF_STX: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_ALU: + switch (BPF_OP(p->code)) { + case BPF_ADD: + case BPF_SUB: + case BPF_OR: + case BPF_AND: + case BPF_LSH: + case BPF_RSH: + case BPF_NEG: + break; + case BPF_DIV: + /* + * Check for constant division by 0. + */ + if (BPF_RVAL(p->code) == BPF_K && p->k == 0) return 0; + default: + return 0; } - else if (from + p->jt >= len || from + p->jf >= len) + break; + case BPF_JMP: + /* + * Check that jumps are within the code block, + * and that unconditional branches don't go + * backwards as a result of an overflow. + * Unconditional branches have a 32-bit offset, + * so they could overflow; we check to make + * sure they don't. Conditional branches have + * an 8-bit offset, and the from address is <= + * BPF_MAXINSNS, and we assume that BPF_MAXINSNS + * is sufficiently small that adding 255 to it + * won't overflow. + * + * We know that len is <= BPF_MAXINSNS, and we + * assume that BPF_MAXINSNS is < the maximum size + * of a u_int, so that i + 1 doesn't overflow. + */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 17:46:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2353916A4DD for ; Wed, 16 Aug 2006 17:46:24 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58B1943D92 for ; Wed, 16 Aug 2006 17:45:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BB9B046CF8 for ; Wed, 16 Aug 2006 13:45:07 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5EBEA729CF; Wed, 16 Aug 2006 17:44:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D26C16A4E7; Wed, 16 Aug 2006 17:44:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E5EF16A4E2 for ; Wed, 16 Aug 2006 17:44:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3F8F43DFB for ; Wed, 16 Aug 2006 17:42:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GHfsQg001008 for ; Wed, 16 Aug 2006 17:41:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GHfmnQ001005 for perforce@freebsd.org; Wed, 16 Aug 2006 17:41:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 17:41:48 GMT Message-Id: <200608161741.k7GHfmnQ001005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104265 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 17:46:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=104265 Change 104265 by rwatson@rwatson_zoo on 2006/08/16 17:41:15 Integrate TrustedBSD audit3 branch from TrustedBSD base. Change list in @104257. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile.inc1#12 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/BSD/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/HISTORY#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/bpf_filter.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipf.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/iplang/iplang_y.y#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipmon.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsd/sbpf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/ipsend.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/iptests.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/lsock.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/resend.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/sbpf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/sock.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipt.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/addicmp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/addkeep.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/facpri.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/icmpcode.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/ipft_tx.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/make_range.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/optprint.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/printfr.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/printlog.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/man/ipmon.8#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/radix.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/samples/proxy.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i11#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i9#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/in2#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/in5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i11#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i9#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/in2#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/in5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/test.format#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipf_y.y#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipfcomp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipftest.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipmon.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipnat_y.y#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipsyncm.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipsyncs.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/smbfs/smbutil/print.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/smbfs/smbutil/view.c#3 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#15 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/libbfd/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/contrib/mm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/tmac/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/msgctl.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/syslog.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/string/strcoll.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/connect.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/getfsstat.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_init.c#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex.c#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_private.h#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_pspinlock.c#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/tftpd/tftpd.8#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 integrate .. //depot/projects/trustedbsd/audit3/sbin/dump/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/dump/optr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geli.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geom_eli.c#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifclone.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#10 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipf/libipf/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/trustedbsd/audit3/sbin/ping/ping.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/sysctl/sysctl.c#7 integrate .. //depot/projects/trustedbsd/audit3/share/examples/drivers/make_device_driver.sh#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/drivers/make_pseudo_driver.sh#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/acpi.4#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ata.4#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/if_bridge.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_pppoe.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uscanner.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/vlan.4#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/release.7#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/sysctl.9#2 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.cpu.mk#6 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/trustedbsd/audit3/sys/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/acpica/madt.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/pmap.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/mem.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/vm_machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_st.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pmap.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/assabet_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/iq31244_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#19 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_signal.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_util.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_proto.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_stream.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscall.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscallnames.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_sysent.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#25 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#10 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.post.mk#9 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.arm#8 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/fil.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_auth.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_frag.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_log.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_sync.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_sync.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ipl.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/Osd/OsdMemory.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pci_link.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_video.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em_hw.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em_hw.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/exca/excareg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_pci.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispvar.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephy.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccard/pccard_cis.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb_pci.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbbreg.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10k1.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nwfs/nwfs_io.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/smbfs/smbfs_io.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_ctl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_gpt.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_msdosfs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/XBOX#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/support.s#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_syscall.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_sysent.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_proto.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_syscall.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_sysent.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_syscall.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_sysent.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/pmap.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/isa/clock.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_dummy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysvec.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#18 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/xbox/xbox.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/include/pmap.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#33 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_lock.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mutex.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_subr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sx.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_time.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/makesyscalls.sh#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#24 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#38 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/systrace_args.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_proto.c#4 delete .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_sem.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_usrreq.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_bio.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/libkern/strstr.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/if_ef/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_ppp/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/linprocfs/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/linux/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/mppc/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/sound/sound/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bridgestp.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_tun.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_input.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netatalk/ddp_usrreq.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_pppoe.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_pppoe.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_bio.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/pc98/pc98_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_xl.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/dirent.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/domain.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/eventhandler.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/imgact.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/libkern.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/lockmgr.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mac_policy.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/param.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sx.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#23 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#24 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysent.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#27 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/device_pager.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/swap_pager.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_fault.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_object.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vnode_pager.c#9 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/athstats.c#4 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/athstats.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/main.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/statfoo.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/statfoo.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/nanobsd/nanobsd.sh#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/README#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/w00t/libw00t/w00t.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/README#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/dics/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/dics/dics.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/udps/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/udps/udps.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/wesside.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlaninject/wlaninject.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/main.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/statfoo.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/statfoo.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/wlanstats.h#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.history#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/hexdump/parse.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/split/split.1#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/split/split.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#18 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/kldxref/kldxref.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mailwrapper/mailwrapper.8#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mailwrapper/mailwrapper.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/named/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/main.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/url.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/version/perform.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.lockd/lockd_lock.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.statd/procs.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rtsold/rtsold.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/command.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/config.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/devices.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/disks.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/dispatch.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/dmenu.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/globals.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/install.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/keymap.c#2 delete .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/label.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/list.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/menus.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/misc.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/msg.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/rtermcap.c#2 delete .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/sade.8#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/sade.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/system.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/termcap.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/usb.c#2 delete .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/variable.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/wizard.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/yppush/yppush_main.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.550 2006/08/02 15:26:15 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.42 2006/08/04 21:29:22 brooks Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -745,6 +745,7 @@ OLD_FILES+=usr/bin/perlcc OLD_FILES+=usr/bin/perldoc OLD_FILES+=usr/bin/suidperl +OLD_FILES+=usr/lib/pam_ftp.so OLD_FILES+=usr/libdata/perl/5.00503/CGI/Apache.pm OLD_FILES+=usr/libdata/perl/5.00503/CGI/Carp.pm OLD_FILES+=usr/libdata/perl/5.00503/CGI/Cookie.pm @@ -2726,7 +2727,209 @@ OLD_FILES+=usr/games/worm OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump +OLD_FILES+=sbin/mount_reiserfs +OLD_FILES+=usr/bin/hesinfo +OLD_FILES+=usr/share/examples/etc/usbd.conf +OLD_FILES+=usr/share/examples/meteor/README +OLD_FILES+=usr/share/examples/meteor/rgb16.c +OLD_FILES+=usr/share/examples/meteor/rgb24.c +OLD_FILES+=usr/share/examples/meteor/test-n.c +OLD_FILES+=usr/share/examples/meteor/yuvpk.c +OLD_FILES+=usr/share/examples/meteor/yuvpl.c +OLD_FILES+=usr/share/examples/worm/README +OLD_FILES+=usr/share/examples/worm/makecdfs.sh +OLD_FILES+=usr/share/groff_font/devlj4/Makefile +OLD_FILES+=usr/share/groff_font/devlj4/text.map +OLD_FILES+=usr/share/groff_font/devlj4/special.map +OLD_FILES+=usr/share/misc/nslookup.help +OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4 +OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd +OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R +OLD_FILES+=usr/share/zoneinfo/Africa/Timbuktu +OLD_FILES+=usr/share/zoneinfo/America/Buenos_Aires +OLD_FILES+=usr/share/zoneinfo/America/Cordoba +OLD_FILES+=usr/share/zoneinfo/America/Jujuy +OLD_FILES+=usr/share/zoneinfo/America/Catamarca +OLD_FILES+=usr/share/zoneinfo/America/Mendoza +OLD_FILES+=usr/share/zoneinfo/America/Indianapolis +OLD_FILES+=usr/share/zoneinfo/America/Louisville +OLD_FILES+=usr/share/zoneinfo/America/Argentina/ComodRivadavia +OLD_FILES+=usr/share/zoneinfo/Europe/Belfast +OLD_FILES+=usr/share/zoneinfo/Pacific/Yap +OLD_FILES+=usr/share/zoneinfo/SystemV/YST9 +OLD_FILES+=usr/share/zoneinfo/SystemV/PST8 +OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT +OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT +OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT +OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT +OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT +OLD_FILES+=usr/share/zoneinfo/SystemV/HST10 +OLD_FILES+=usr/share/zoneinfo/SystemV/MST7 +OLD_FILES+=usr/share/zoneinfo/SystemV/EST5 +OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT +OLD_FILES+=usr/share/zoneinfo/SystemV/CST6 +OLD_FILES+=usr/share/zoneinfo/SystemV/AST4 +OLD_FILES+=usr/share/doc/ntp/accopt.htm +OLD_FILES+=usr/share/doc/ntp/assoc.htm +OLD_FILES+=usr/share/doc/ntp/audio.htm +OLD_FILES+=usr/share/doc/ntp/authopt.htm +OLD_FILES+=usr/share/doc/ntp/biblio.htm +OLD_FILES+=usr/share/doc/ntp/build.htm +OLD_FILES+=usr/share/doc/ntp/clockopt.htm +OLD_FILES+=usr/share/doc/ntp/config.htm +OLD_FILES+=usr/share/doc/ntp/confopt.htm +OLD_FILES+=usr/share/doc/ntp/copyright.htm +OLD_FILES+=usr/share/doc/ntp/debug.htm +OLD_FILES+=usr/share/doc/ntp/driver1.htm +OLD_FILES+=usr/share/doc/ntp/driver10.htm +OLD_FILES+=usr/share/doc/ntp/driver11.htm +OLD_FILES+=usr/share/doc/ntp/driver12.htm +OLD_FILES+=usr/share/doc/ntp/driver16.htm +OLD_FILES+=usr/share/doc/ntp/driver18.htm +OLD_FILES+=usr/share/doc/ntp/driver19.htm +OLD_FILES+=usr/share/doc/ntp/driver2.htm +OLD_FILES+=usr/share/doc/ntp/driver20.htm +OLD_FILES+=usr/share/doc/ntp/driver22.htm +OLD_FILES+=usr/share/doc/ntp/driver23.htm +OLD_FILES+=usr/share/doc/ntp/driver24.htm +OLD_FILES+=usr/share/doc/ntp/driver26.htm +OLD_FILES+=usr/share/doc/ntp/driver27.htm +OLD_FILES+=usr/share/doc/ntp/driver28.htm +OLD_FILES+=usr/share/doc/ntp/driver29.htm +OLD_FILES+=usr/share/doc/ntp/driver3.htm +OLD_FILES+=usr/share/doc/ntp/driver30.htm +OLD_FILES+=usr/share/doc/ntp/driver32.htm +OLD_FILES+=usr/share/doc/ntp/driver33.htm +OLD_FILES+=usr/share/doc/ntp/driver34.htm +OLD_FILES+=usr/share/doc/ntp/driver35.htm +OLD_FILES+=usr/share/doc/ntp/driver36.htm +OLD_FILES+=usr/share/doc/ntp/driver37.htm +OLD_FILES+=usr/share/doc/ntp/driver4.htm +OLD_FILES+=usr/share/doc/ntp/driver5.htm +OLD_FILES+=usr/share/doc/ntp/driver6.htm +OLD_FILES+=usr/share/doc/ntp/driver7.htm +OLD_FILES+=usr/share/doc/ntp/driver8.htm +OLD_FILES+=usr/share/doc/ntp/driver9.htm +OLD_FILES+=usr/share/doc/ntp/exec.htm +OLD_FILES+=usr/share/doc/ntp/extern.htm +OLD_FILES+=usr/share/doc/ntp/gadget.htm +OLD_FILES+=usr/share/doc/ntp/hints.htm +OLD_FILES+=usr/share/doc/ntp/howto.htm +OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm +OLD_FILES+=usr/share/doc/ntp/index.htm +OLD_FILES+=usr/share/doc/ntp/kern.htm +OLD_FILES+=usr/share/doc/ntp/kernpps.htm +OLD_FILES+=usr/share/doc/ntp/ldisc.htm +OLD_FILES+=usr/share/doc/ntp/measure.htm +OLD_FILES+=usr/share/doc/ntp/miscopt.htm +OLD_FILES+=usr/share/doc/ntp/monopt.htm +OLD_FILES+=usr/share/doc/ntp/mx4200data.htm +OLD_FILES+=usr/share/doc/ntp/notes.htm +OLD_FILES+=usr/share/doc/ntp/ntpd.htm +OLD_FILES+=usr/share/doc/ntp/ntpdate.htm +OLD_FILES+=usr/share/doc/ntp/ntpdc.htm +OLD_FILES+=usr/share/doc/ntp/ntpq.htm +OLD_FILES+=usr/share/doc/ntp/ntptime.htm +OLD_FILES+=usr/share/doc/ntp/ntptrace.htm +OLD_FILES+=usr/share/doc/ntp/parsedata.htm +OLD_FILES+=usr/share/doc/ntp/parsenew.htm +OLD_FILES+=usr/share/doc/ntp/patches.htm +OLD_FILES+=usr/share/doc/ntp/porting.htm +OLD_FILES+=usr/share/doc/ntp/pps.htm +OLD_FILES+=usr/share/doc/ntp/prefer.htm +OLD_FILES+=usr/share/doc/ntp/qth.htm +OLD_FILES+=usr/share/doc/ntp/quick.htm +OLD_FILES+=usr/share/doc/ntp/rdebug.htm +OLD_FILES+=usr/share/doc/ntp/refclock.htm +OLD_FILES+=usr/share/doc/ntp/release.htm +OLD_FILES+=usr/share/doc/ntp/tickadj.htm +OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz +OLD_FILES+=usr/share/doc/papers/px.ascii.gz +OLD_FILES+=usr/share/man/man1/hesinfo.1.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/hesiod.3.gz +OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz +OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz +OLD_FILES+=usr/share/man/man3/exp10.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbmb.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/hesiod.3.gz +OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz +OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz +OLD_FILES+=usr/share/man/man3/exp10.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbmb.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/fungetrune.3.gz +OLD_FILES+=usr/share/man/man3/fputrune.3.gz +OLD_FILES+=usr/share/man/man3/fgetrune.3.gz +OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz +OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz +.if ${TARGET_ARCH} != "i386" +OLD_FILES+=usr/share/man/man8/boot_i386.8.gz +.endif +OLD_FILES+=usr/share/man/man8/ofwdump.8.gz +OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz +OLD_FILES+=usr/share/man/man9/VFS_START.9.gz +OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz +OLD_FILES+=usr/share/man/man9/cpu_critical_enter.9.gz +OLD_FILES+=usr/share/info/annotate.info.gz +OLD_FILES+=usr/share/info/tar.info.gz +OLD_FILES+=usr/share/bsnmp/defs/tree.def +OLD_FILES+=usr/share/bsnmp/defs/mibII_tree.def +OLD_FILES+=usr/share/bsnmp/defs/netgraph_tree.def +OLD_FILES+=usr/share/bsnmp/mibs/FOKUS-MIB.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-MIB.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-SNMPD.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc +OLD_FILES+=usr/libdata/msdosfs/iso22dos +OLD_FILES+=usr/libdata/msdosfs/iso72dos +OLD_FILES+=usr/libdata/msdosfs/koi2dos +OLD_FILES+=usr/libdata/msdosfs/koi8u2dos +# The following files are *not* obsolete, they just don't get touched at +# install, so don't add them: +# - boot/loader.rc +# - usr/share/tmac/man.local +# - usr/share/tmac/mm/locale +# - usr/share/tmac/mm/se_locale +# - var/yp/Makefile + +# 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade +OLD_LIBS+=lib/libcrypto.so.4 +OLD_LIBS+=usr/lib/libssl.so.4 # 20060521: gethostbyaddr(3) ABI change OLD_LIBS+=usr/lib/libroken.so.8 OLD_LIBS+=lib/libatm.so.3 @@ -2950,7 +3153,14 @@ # 199909XX OLD_LIBS+=usr/lib/libc_r.so.3 # ??? +OLD_LIBS+=usr/lib/libarchive.so.2 +OLD_LIBS+=usr/lib/libbsnmp.so.1 +OLD_LIBS+=usr/lib/libc_r.so.6 +OLD_LIBS+=usr/lib/libcipher.so.2 OLD_LIBS+=usr/lib/libgssapi.so.6 +OLD_LIBS+=usr/lib/libkse.so.1 +OLD_LIBS+=usr/lib/liblwres.so.3 +OLD_LIBS+=usr/lib/pam_ftp.so.2 # 20040925: bind9 import OLD_DIRS+=usr/share/doc/bind/html ==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/BSD/Makefile#4 (text+ko) ==== @@ -3,12 +3,13 @@ # # See the IPFILTER.LICENCE file for details on licencing. # +TOP=../.. BINDEST=/usr/sbin SBINDEST=/sbin MANDIR=/usr/share/man SEARCHDIRS!=echo $(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin | awk '{for(i=1;i&1 | sed -n 's/.*devfs.*/-DDEVFS/p' CPU!=uname -m INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch -DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) +DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) -fno-builtin IPDEF=$(DEF) -DGATEWAY -DDIRECTED_BROADCAST VNODESHDIR=/sys/kern MLD=$(ML) @@ -516,8 +517,8 @@ (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) coverage: - ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -n > report - sort -n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += $$F[0]/100*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,$$t/$$lc*100;' >> report + ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -k 1n -k 3n > report + sort -k 1n -k 3n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += ($$F[0]/100)*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,($$t/$$lc)*100;' >> report clean-coverage: /bin/rm -f *.gcov *.da ==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/HISTORY#5 (text+ko) ==== @@ -10,6 +10,88 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +4.1.13 - Released 4 April 2006 + +fix bug where null pointers introduced by proxies could cause a crash + +pass out the rule flags with SIOCAUTHW + +force loading NAT rules with bad proxy labels to cause an error + +nat_state is used unsafely in calls to fr_addstate + +make return-rst and return-icmp* work with auth rules + +4.1.12 - Released 28 March 2006 + +poll support on FreeBSD/NetBSD needs to use selrecord/selwakeup + +make the fastroute code used by ipftest invoke state/NAT + +move verbose/debug macros out of fil.c and into ip_fil.h (for wider use) + +remove unused code in fr_fastroute + +fix NAT with rules that specify forward and reverise interfaces + +add missing ipfsync_canread() and ipfsync_canwrite() + +behaviour of \ on the end of a line in ipf.conf does not match older behaviour + +remove duplicate statistics line output with "ipfstat -s" +4.1.11 - Released 19 March 2006 + +Patch for NAT with ipfsync from N. Ersen (SESCI) - www.enderunix.org + +NetBSD coverity report fixes (from run 5) + +Possible to reacquire ipf_auth without releasing it in some circumstances + +Locking in FreeBSD's iplioctl for ipf_global isn't present like it shoudl be + +Add poll support for platforms I can build on: NetBSD, FreeBSD, Solaris, Linux + +Using auth rules to return "keep state" got broken with pushing fr_addstate +call into fr_firewall + +all use of '!' in map/rdr rules to match use in ipf configs + +add -L command line option to ipmon to set the default syslog facility + +looking up a port number is more complex than needed in ipft_tx.c + +allow lib/getport to work when neither tcp or udp are specified in a rule + +remove some dead code from lib/addicmpc, lib/facpri.c, lib/icmpcode.c + +program in some more cases where TCP packets fail an initial in-window +check but should be allowed to match + +filter rule added with NAT/state handling of SIOCSTPUT doesn't properly +initialise all fields, making it possible to panic + +simplify NAT ICMP error handling where it updates checksums + +rename "min" variables to "xmin" on NetBSD to avoid problems with the +macro "min" + +#ifdef's for NetBSD compile incorrect for pfil interface + +support select/poll on NetBSD + +copying out a packet with an auth rule fails (EFAULT) because the wrong +pointer is passed to copyoutptr + +ip_len/ip_off where byte swapped twice instead of once for packets +going to be stored on the auth queue + +change timeout queue manipulation functions to make fewer mutex calls + +fix use of skip rules with groups +fix coding problems discovered by the coverity project for FreeBSD + +update BPF program validation with FreeBSD changes + 4.1.10 - Released 6 December 2005 Expand regression testing to cover more features ==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/Makefile#5 (text+ko) ==== @@ -5,8 +5,8 @@ # provided that this notice is preserved and due credit is given # to the original author and the contributors. # -# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.5 2005/12/30 11:52:22 guido Exp $ -# Id: Makefile,v 2.76.2.13 2004/11/08 18:42:40 darrenr Exp +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.6 2006/08/16 12:23:00 guido Exp $ +# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $ # SHELL=/bin/sh BINDEST=/usr/local/bin @@ -135,6 +135,7 @@ @echo "freebsd3 - compile for FreeBSD-3.x" @echo "freebsd4 - compile for FreeBSD-4.x" @echo "freebsd5 - compile for FreeBSD-5.x" + @echo "freebsd6 - compile for FreeBSD-6.x" @echo "bsd - compile for generic 4.4BSD systems" @echo "bsdi - compile for BSD/OS" @echo "irix - compile for SGI IRIX" @@ -187,7 +188,7 @@ fi make freebsd20 -freebsd5: include +freebsd5 freebsd6: include if [ x$(INET6) = x ] ; then \ echo "#undef INET6" > opt_inet6.h; \ else \ ==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/bpf_filter.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.4 2005/12/30 11:52:22 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.5 2006/08/16 12:23:00 guido Exp $ */ /*- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -42,7 +42,7 @@ #if !(defined(lint) || defined(KERNEL) || defined(_KERNEL)) static const char rcsid[] = - "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.1 2005/06/18 02:41:30 darrenr Exp $ (LBL)"; + "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.2 2005/12/30 12:57:28 darrenr Exp $ (LBL)"; #endif #include @@ -468,9 +468,10 @@ /* * Return true if the 'fcode' is a valid filter program. * The constraints are that each jump be forward and to a valid - * code. The code must terminate with either an accept or reject. - * 'valid' is an array for use by the routine (it must be at least - * 'len' bytes long). + * code, that memory accesses are within valid ranges (to the + * extent that this can be checked statically; loads of packet + * data have to be, and are, also checked at run time), and that + * the code terminates with either an accept or reject. * * The kernel needs to be able to verify an application's filter code. * Otherwise, a bogus program could easily crash the system. @@ -480,38 +481,114 @@ struct bpf_insn *f; int len; { - register int i; - register struct bpf_insn *p; + u_int i, from; + const struct bpf_insn *p; + + if (len == 0) + return 1; + + if (len < 1 || len > BPF_MAXINSNS) + return 0; for (i = 0; i < len; ++i) { + p = &f[i]; + switch (BPF_CLASS(p->code)) { /* - * Check that that jumps are forward, and within - * the code block. + * Check that memory operations use valid addresses. */ - p = &f[i]; - if (BPF_CLASS(p->code) == BPF_JMP) { - register int from = i + 1; - - if (BPF_OP(p->code) == BPF_JA) { - if (from + p->k >= (unsigned)len) + case BPF_LD: + case BPF_LDX: + switch (BPF_MODE(p->code)) { + case BPF_IMM: + break; + case BPF_ABS: + case BPF_IND: + case BPF_MSH: + /* + * More strict check with actual packet length + * is done runtime. + */ +#if 0 + if (p->k >= bpf_maxbufsize) + return 0; +#endif + break; + case BPF_MEM: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_LEN: + break; + default: + return 0; + } + break; + case BPF_ST: + case BPF_STX: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_ALU: + switch (BPF_OP(p->code)) { + case BPF_ADD: + case BPF_SUB: + case BPF_OR: + case BPF_AND: + case BPF_LSH: + case BPF_RSH: + case BPF_NEG: + break; + case BPF_DIV: + /* + * Check for constant division by 0. + */ + if (BPF_RVAL(p->code) == BPF_K && p->k == 0) return 0; + default: + return 0; } - else if (from + p->jt >= len || from + p->jf >= len) + break; + case BPF_JMP: + /* + * Check that jumps are within the code block, + * and that unconditional branches don't go + * backwards as a result of an overflow. + * Unconditional branches have a 32-bit offset, + * so they could overflow; we check to make + * sure they don't. Conditional branches have + * an 8-bit offset, and the from address is <= + * BPF_MAXINSNS, and we assume that BPF_MAXINSNS + * is sufficiently small that adding 255 to it + * won't overflow. + * + * We know that len is <= BPF_MAXINSNS, and we >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 18:37:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2188716A4E0 for ; Wed, 16 Aug 2006 18:37:30 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2C7F43D6A for ; Wed, 16 Aug 2006 18:37:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4431946CBF for ; Wed, 16 Aug 2006 14:37:27 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3CF2F9252B; Wed, 16 Aug 2006 18:37:04 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C19516A4E5; Wed, 16 Aug 2006 18:37:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 06B7216A4DA for ; Wed, 16 Aug 2006 18:37:04 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B16B043D5A for ; Wed, 16 Aug 2006 18:37:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GIb3jM008777 for ; Wed, 16 Aug 2006 18:37:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GIb3at008774 for perforce@freebsd.org; Wed, 16 Aug 2006 18:37:03 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 18:37:03 GMT Message-Id: <200608161837.k7GIb3at008774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104267 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 18:37:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=104267 Change 104267 by millert@millert_macbook on 2006/08/16 18:36:49 g/c mac_copy_kbuf() proto; it was leftover from a previous module data implementation. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#2 (text+ko) ==== @@ -5352,6 +5352,4 @@ #define MAC_NOWAIT 1 /*@}*/ -int mac_copy_kbuf(struct proc *p, void *src, user_addr_t *dst, size_t len); - #endif /* !_SECURITY_MAC_POLICY_H_ */ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 18:39:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 95CF916A4E5 for ; Wed, 16 Aug 2006 18:39:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDE4D43D5C for ; Wed, 16 Aug 2006 18:39:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7EBE346CBF for ; Wed, 16 Aug 2006 14:39:54 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 9262E91BA2; Wed, 16 Aug 2006 18:39:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E7E716A4E6; Wed, 16 Aug 2006 18:39:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51D1316A4DE for ; Wed, 16 Aug 2006 18:39:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1F0E43D5A for ; Wed, 16 Aug 2006 18:39:06 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GId691008876 for ; Wed, 16 Aug 2006 18:39:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GId6ur008873 for perforce@freebsd.org; Wed, 16 Aug 2006 18:39:06 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 18:39:06 GMT Message-Id: <200608161839.k7GId6ur008873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104268 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 18:39:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=104268 Change 104268 by millert@millert_macbook on 2006/08/16 18:38:57 Use struct xsocket, not struct socket. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#3 (text+ko) ==== @@ -1464,7 +1464,7 @@ * Labeling event operations: network objects. */ static void -mac_mls_create_socket(struct ucred *cred, struct socket *so, +mac_mls_create_socket(struct ucred *cred, struct xsocket *so, struct label *solabel) { struct mac_mls *source, *dest; @@ -1477,8 +1477,8 @@ static void mac_mls_create_socket_from_socket( - struct socket *oldsock, struct label *oldlabel, - struct socket *newsock, struct label *newlabel) + struct xsocket *oldsock, struct label *oldlabel, + struct xsocket *newsock, struct label *newlabel) { struct mac_mls *source, *dest; @@ -1493,7 +1493,7 @@ } static void -mac_mls_relabel_socket(struct ucred *cred, struct socket *so, +mac_mls_relabel_socket(struct ucred *cred, struct xsocket *so, struct label *oldlabel, struct label *newlabel) { struct mac_mls *source, *dest; @@ -1536,7 +1536,7 @@ } static void -mac_mls_create_mbuf_from_socket(struct socket *so, struct label *socketlabel, +mac_mls_create_mbuf_from_socket(struct xsocket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_mls *source, *dest; @@ -1556,7 +1556,7 @@ static void mac_mls_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, - struct socket *socket, struct label *socketpeerlabel) + struct xsocket *socket, struct label *socketpeerlabel) { struct mac_mls *source, *dest; @@ -1575,8 +1575,8 @@ } static void -mac_mls_set_socket_peer_from_socket(struct socket *oldsocket, - struct label *oldsocketlabel, struct socket *newsocket, +mac_mls_set_socket_peer_from_socket(struct xsocket *oldsocket, + struct label *oldsocketlabel, struct xsocket *newsocket, struct label *newsocketpeerlabel) { struct mac_mls *source, *dest; @@ -2236,7 +2236,7 @@ } static int -mac_mls_check_socket_accept(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_accept(struct ucred *cred, struct xsocket *socket, struct label *socklabel) { struct mac_mls *subj, *obj; @@ -2254,7 +2254,7 @@ } static int -mac_mls_check_socket_bind(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_bind(struct ucred *cred, struct xsocket *socket, struct label *socklabel, struct sockaddr *addr) { struct mac_mls *subj, *obj; @@ -2272,7 +2272,7 @@ } static int -mac_mls_check_socket_connect(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_connect(struct ucred *cred, struct xsocket *socket, struct label *socklabel, struct sockaddr *addr) { struct mac_mls *subj, *obj; @@ -2297,7 +2297,7 @@ } static int -mac_mls_check_socket_deliver(struct socket *so, struct label *so_label, +mac_mls_check_socket_deliver(struct xsocket *so, struct label *so_label, struct mbuf *m, struct label *m_label) { struct mac_mls *src, *dest; @@ -2324,7 +2324,7 @@ static int mac_mls_check_socket_kqfilter(struct ucred *cred, struct knote *kn, - struct socket *so, struct label *solabel) + struct xsocket *so, struct label *solabel) { struct mac_mls *subj, *obj; @@ -2338,7 +2338,7 @@ } static int -mac_mls_check_socket_listen(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_listen(struct ucred *cred, struct xsocket *socket, struct label *socklabel) { struct mac_mls *subj, *obj; @@ -2356,7 +2356,7 @@ } static int -mac_mls_check_socket_receive(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_receive(struct ucred *cred, struct xsocket *socket, struct label *socklabel) { struct mac_mls *subj, *obj; @@ -2374,7 +2374,7 @@ } static int -mac_mls_check_socket_relabel(struct ucred *cred, struct socket *so, +mac_mls_check_socket_relabel(struct ucred *cred, struct xsocket *so, struct label *socklabel, struct label *newlabel) { struct mac_mls *subj, *obj, *new; @@ -2432,7 +2432,7 @@ } static int -mac_mls_check_socket_select(struct ucred *cred, struct socket *so, +mac_mls_check_socket_select(struct ucred *cred, struct xsocket *so, struct label *socklabel, int which) { struct mac_mls *subj, *obj; @@ -2450,7 +2450,7 @@ } static int -mac_mls_check_socket_send(struct ucred *cred, struct socket *so, +mac_mls_check_socket_send(struct ucred *cred, struct xsocket *so, struct label *socklabel) { struct mac_mls *subj, *obj; @@ -2468,7 +2468,7 @@ } static int -mac_mls_check_socket_stat(struct ucred *cred, struct socket *so, +mac_mls_check_socket_stat(struct ucred *cred, struct xsocket *so, struct label *socklabel) { struct mac_mls *subj, *obj; ==== //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#2 (text+ko) ==== @@ -2328,7 +2328,7 @@ static void -mac_test_create_socket(struct ucred *cred, struct socket *so, +mac_test_create_socket(struct ucred *cred, struct xsocket *so, struct label *solabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2343,8 +2343,8 @@ static void -mac_test_create_socket_from_socket(struct socket *oldsock, - struct label *oldlabel, struct socket *newsock, +mac_test_create_socket_from_socket(struct xsocket *oldsock, + struct label *oldlabel, struct xsocket *newsock, struct label *newlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2393,7 +2393,7 @@ } static void -mac_test_relabel_socket(struct ucred *cred, struct socket *so, +mac_test_relabel_socket(struct ucred *cred, struct xsocket *so, struct label *oldlabel, struct label *newlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2408,8 +2408,8 @@ } static void -mac_test_set_socket_peer_from_socket(struct socket *oldsocket, - struct label *oldsocketlabel, struct socket *newsocket, +mac_test_set_socket_peer_from_socket(struct xsocket *oldsocket, + struct label *oldsocketlabel, struct xsocket *newsocket, struct label *newsocketpeerlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2435,7 +2435,7 @@ } static int -mac_test_check_socket_accept(struct ucred *cred, struct socket *so, +mac_test_check_socket_accept(struct ucred *cred, struct xsocket *so, struct label *so_label) { // KASSERT(thread_funnel_get() == network_flock, @@ -2450,7 +2450,7 @@ } static int -mac_test_check_socket_bind(struct ucred *cred, struct socket *socket, +mac_test_check_socket_bind(struct ucred *cred, struct xsocket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { // KASSERT(thread_funnel_get() == network_flock, @@ -2465,7 +2465,7 @@ } static int -mac_test_check_socket_connect(struct ucred *cred, struct socket *socket, +mac_test_check_socket_connect(struct ucred *cred, struct xsocket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { // KASSERT(thread_funnel_get() == network_flock, @@ -2493,7 +2493,7 @@ static int mac_test_check_socket_kqfilter(struct ucred *cred, struct knote *kn, - struct socket *so, struct label *socklabel) + struct xsocket *so, struct label *socklabel) { CHECKNULL(cred); @@ -2507,7 +2507,7 @@ } static int -mac_test_check_socket_listen(struct ucred *cred, struct socket *socket, +mac_test_check_socket_listen(struct ucred *cred, struct xsocket *socket, struct label *socketlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2522,7 +2522,7 @@ } static int -mac_test_check_socket_receive(struct ucred *cred, struct socket *so, +mac_test_check_socket_receive(struct ucred *cred, struct xsocket *so, struct label *socketlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2538,7 +2538,7 @@ static int -mac_test_check_socket_relabel(struct ucred *cred, struct socket *socket, +mac_test_check_socket_relabel(struct ucred *cred, struct xsocket *socket, struct label *oldlabel, struct label *newlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2554,7 +2554,7 @@ } static int -mac_test_check_socket_select(struct ucred *cred, struct socket *so, +mac_test_check_socket_select(struct ucred *cred, struct xsocket *so, struct label *socketlabel, int which) { // KASSERT(thread_funnel_get() == network_flock, @@ -2569,7 +2569,7 @@ } static int -mac_test_check_socket_send(struct ucred *cred, struct socket *so, +mac_test_check_socket_send(struct ucred *cred, struct xsocket *so, struct label *socketlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2584,7 +2584,7 @@ } static int -mac_test_check_socket_stat(struct ucred *cred, struct socket *so, struct label *solabel) +mac_test_check_socket_stat(struct ucred *cred, struct xsocket *so, struct label *solabel) { // KASSERT(thread_funnel_get() == network_flock, // "mac_test_check_socket_stat: not holding the network funnel!"); @@ -2608,7 +2608,7 @@ } static int -mac_test_check_socket_deliver(struct socket *so, struct label *so_label, +mac_test_check_socket_deliver(struct xsocket *so, struct label *so_label, struct mbuf *m, struct label *m_label) { // KASSERT(thread_funnel_get() == network_flock, @@ -2639,7 +2639,7 @@ static void mac_test_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, - struct socket *socket, struct label *socketpeerlabel) + struct xsocket *socket, struct label *socketpeerlabel) { CHECKNULL(mbuf); CHECKNULL(socket); @@ -2681,7 +2681,7 @@ } static void -mac_test_create_mbuf_from_socket(struct socket *so, struct label *so_label, +mac_test_create_mbuf_from_socket(struct xsocket *so, struct label *so_label, struct mbuf *m, struct label *m_label) { // KASSERT(thread_funnel_get() == network_flock, From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 18:41:55 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C402816A4E6 for ; Wed, 16 Aug 2006 18:41:55 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F261943D53 for ; Wed, 16 Aug 2006 18:41:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 87BB546CDE for ; Wed, 16 Aug 2006 14:41:51 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 110D4587E9; Wed, 16 Aug 2006 18:41:11 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F368E16A4E6; Wed, 16 Aug 2006 18:41:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8B1316A4E2 for ; Wed, 16 Aug 2006 18:41:10 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8687143D53 for ; Wed, 16 Aug 2006 18:41:10 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GIfAmM009127 for ; Wed, 16 Aug 2006 18:41:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GIfAul009124 for perforce@freebsd.org; Wed, 16 Aug 2006 18:41:10 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 18:41:10 GMT Message-Id: <200608161841.k7GIfAul009124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104270 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 18:41:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=104270 Change 104270 by millert@millert_macbook on 2006/08/16 18:40:36 Fix typo Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#2 (text+ko) ==== @@ -64,7 +64,7 @@ #define lh_unlock io_unlock /* - * Check the number of references the label handle a left. + * Check the number of references the label handle has left. * If there are 0 references and this is a kernel-allocated * label handle, deallocate the associated port. The * storage space for the label handle will be deallocated From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 18:42:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C638716A4E1 for ; Wed, 16 Aug 2006 18:42:30 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E95643D72 for ; Wed, 16 Aug 2006 18:42:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A871846CA5 for ; Wed, 16 Aug 2006 14:42:20 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A154891AA8; Wed, 16 Aug 2006 18:42:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 905B416A4E0; Wed, 16 Aug 2006 18:42:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AA0816A4DA for ; Wed, 16 Aug 2006 18:42:15 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 597EF43D77 for ; Wed, 16 Aug 2006 18:42:12 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GIgCud009217 for ; Wed, 16 Aug 2006 18:42:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GIgCsi009214 for perforce@freebsd.org; Wed, 16 Aug 2006 18:42:12 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 18:42:12 GMT Message-Id: <200608161842.k7GIgCsi009214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104271 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 18:42:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=104271 Change 104271 by millert@millert_macbook on 2006/08/16 18:41:28 Just treat the return value of mac_check_service_access() as 0 or non-zero instead of trying to interpret BSD errno values (which are not visible here). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/security.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/security.c#2 (text+ko) ==== @@ -124,15 +124,7 @@ mac_destroy_task_label(&subjl); mac_destroy_task_label(&objl); - switch (rc) { - case 0: - return KERN_SUCCESS; - case 22: - /* EINVAL */ - return KERN_INVALID_ARGUMENT; - default: - return KERN_NO_ACCESS; - } + return rc ? KERN_NO_ACCESS : KERN_SUCCESS; } kern_return_t @@ -191,15 +183,7 @@ io_unlock (objp); mac_destroy_task_label(&subjl); - switch (rc) { - case 0: - return KERN_SUCCESS; - case 22: - /* EINVAL */ - return KERN_INVALID_ARGUMENT; - default: - return KERN_NO_ACCESS; - } + return rc ? KERN_NO_ACCESS : KERN_SUCCESS; } kern_return_t @@ -248,15 +232,7 @@ io_unlock(objp); ipc_port_multiple_unlock(); - switch (rc) { - case 0: - return KERN_SUCCESS; - case 22: - /* EINVAL */ - return KERN_INVALID_ARGUMENT; - default: - return KERN_NO_ACCESS; - } + return rc ? KERN_NO_ACCESS : KERN_SUCCESS; errout: io_unlocklabel(subp); @@ -314,19 +290,7 @@ io_unlock(objp); ipc_port_multiple_unlock(); - switch (rc) { - case 0: - kr = labelh_new_user(space, &outl, outlabel); - break; - case 22: - /* EINVAL */ - kr = KERN_INVALID_ARGUMENT; - break; - default: - kr = KERN_NO_ACCESS; - break; - } - + kr = rc ? KERN_NO_ACCESS : KERN_SUCCESS; if (kr != KERN_SUCCESS) mac_destroy_port_label(&outl); From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 18:48:14 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E9E8016A4DA for ; Wed, 16 Aug 2006 18:48:14 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F378043D72 for ; Wed, 16 Aug 2006 18:48:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C88C646CC1 for ; Wed, 16 Aug 2006 14:48:01 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8ABD273D9A; Wed, 16 Aug 2006 18:47:26 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7976E16A4DE; Wed, 16 Aug 2006 18:47:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47EA616A4DA for ; Wed, 16 Aug 2006 18:47:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7243743D5E for ; Wed, 16 Aug 2006 18:47:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GIlOx7009492 for ; Wed, 16 Aug 2006 18:47:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GIlKhF009461 for perforce@freebsd.org; Wed, 16 Aug 2006 18:47:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 18:47:20 GMT Message-Id: <200608161847.k7GIlKhF009461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104273 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 18:48:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=104273 Change 104273 by rwatson@rwatson_zoo on 2006/08/16 18:46:58 Integrate TrustedBSD mac2 branch. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/mem.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files#4 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.amd64#3 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.i386#3 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/kern.post.mk#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/kmod.mk#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.arm#3 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/label/g_label.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/conf/XBOX#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/support.s#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/trap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/isa/clock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/init_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_lock.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_subr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_sx.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_time.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.master#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/systrace_args.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_proto.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/trustedbsd/mac2/sys/libkern/strstr.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/linux/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/bpf.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/net/bridgestp.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_tun.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_vlan.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pci/agp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pci/if_xl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/dirent.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/domain.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/eventhandler.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/imgact.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/libkern.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/lockmgr.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/param.h#4 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sx.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscall.mk#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysctl.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysent.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysproto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/device_pager.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/swap_pager.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_fault.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_object.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_page.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_page.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac2/sys/Makefile#2 (text+ko) ==== @@ -1,13 +1,11 @@ -# $FreeBSD: src/sys/Makefile,v 1.37 2006/07/04 14:14:16 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.38 2006/08/10 06:29:43 imp Exp $ .include # The boot loader .if ${MK_BOOT} != "no" -.if ${MACHINE_ARCH} != "arm" SUBDIR= boot .endif -.endif # Directories to include in cscope name file and TAGS. CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ ==== //depot/projects/trustedbsd/mac2/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.20 2006/03/27 15:59:48 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.21 2006/08/11 19:22:55 jhb Exp $"); #include #include @@ -203,15 +203,15 @@ /* * Map in the RSDP. Since ACPI uses AcpiOsMapMemory() which in turn - * calls pmap_mapdev() to find the RSDP, we assume that we can use - * pmap_mapdev() to map the RSDP. + * calls pmap_mapbios() to find the RSDP, we assume that we can use + * pmap_mapbios() to map the RSDP. */ if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) return (ENXIO); #ifdef __i386__ KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); #endif - rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); + rsdp = pmap_mapbios(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); if (rsdp == NULL) { if (bootverbose) printf("MADT: Failed to map RSDP\n"); @@ -261,7 +261,7 @@ break; madt_unmap_table(rsdt); } - pmap_unmapdev((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); + pmap_unmapbios((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); if (madt_physaddr == 0) { if (bootverbose) printf("MADT: No MADT table found\n"); @@ -335,7 +335,7 @@ madt_setup_local(void) { - madt = pmap_mapdev(madt_physaddr, madt_length); + madt = pmap_mapbios(madt_physaddr, madt_length); lapic_init((uintptr_t)madt->LocalApicAddress); printf("ACPI APIC Table: <%.*s %.*s>\n", (int)sizeof(madt->OemId), madt->OemId, ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.569 2006/08/06 06:29:16 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.571 2006/08/14 15:39:41 jhb Exp $"); /* * Manages physical address maps. @@ -665,6 +665,84 @@ * Low level helper routines..... ***************************************************/ +/* + * Determine the appropriate bits to set in a PTE or PDE for a specified + * caching mode. + */ +static int +pmap_cache_bits(int mode, boolean_t is_pde) +{ + int pat_flag, pat_index, cache_bits; + + /* The PAT bit is different for PTE's and PDE's. */ + pat_flag = is_pde ? PG_PDE_PAT : PG_PTE_PAT; + + /* If we don't support PAT, map extended modes to older ones. */ + if (!(cpu_feature & CPUID_PAT)) { + switch (mode) { + case PAT_UNCACHEABLE: + case PAT_WRITE_THROUGH: + case PAT_WRITE_BACK: + break; + case PAT_UNCACHED: + case PAT_WRITE_COMBINING: + case PAT_WRITE_PROTECTED: + mode = PAT_UNCACHEABLE; + break; + } + } + + /* Map the caching mode to a PAT index. */ + switch (mode) { +#ifdef PAT_WORKS + case PAT_UNCACHEABLE: + pat_index = 3; + break; + case PAT_WRITE_THROUGH: + pat_index = 1; + break; + case PAT_WRITE_BACK: + pat_index = 0; + break; + case PAT_UNCACHED: + pat_index = 2; + break; + case PAT_WRITE_COMBINING: + pat_index = 5; + break; + case PAT_WRITE_PROTECTED: + pat_index = 4; + break; +#else + case PAT_UNCACHED: + case PAT_UNCACHEABLE: + case PAT_WRITE_PROTECTED: + pat_index = 3; + break; + case PAT_WRITE_THROUGH: + pat_index = 1; + break; + case PAT_WRITE_BACK: + pat_index = 0; + break; + case PAT_WRITE_COMBINING: + pat_index = 2; + break; +#endif + default: + panic("Unknown caching mode %d\n", mode); + } + + /* Map the 3-bit index value into the PAT, PCD, and PWT bits. */ + cache_bits = 0; + if (pat_index & 0x4) + cache_bits |= pat_flag; + if (pat_index & 0x2) + cache_bits |= PG_NC_PCD; + if (pat_index & 0x1) + cache_bits |= PG_NC_PWT; + return (cache_bits); +} #ifdef SMP /* * For SMP, these functions have to use the IPI mechanism for coherence. @@ -962,6 +1040,15 @@ pte_store(pte, pa | PG_RW | PG_V | PG_G); } +PMAP_INLINE void +pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) +{ + pt_entry_t *pte; + + pte = vtopte(va); + pte_store(pte, pa | PG_RW | PG_V | PG_G | pmap_cache_bits(mode, 0)); +} + /* * Remove a page from the kernel pagetables. * Note: not SMP coherent. @@ -3101,6 +3188,46 @@ * Miscellaneous support routines follow */ +/* Adjust the cache mode for a 4KB page mapped via a PTE. */ +static __inline void +pmap_pte_attr(vm_offset_t va, int mode) +{ + pt_entry_t *pte; + u_int opte, npte; + + pte = vtopte(va); + + /* + * The cache mode bits are all in the low 32-bits of the + * PTE, so we can just spin on updating the low 32-bits. + */ + do { + opte = *(u_int *)pte; + npte = opte & ~(PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT); + npte |= pmap_cache_bits(mode, 0); + } while (npte != opte && !atomic_cmpset_int((u_int *)pte, opte, npte)); +} + +/* Adjust the cache mode for a 2MB page mapped via a PDE. */ +static __inline void +pmap_pde_attr(vm_offset_t va, int mode) +{ + pd_entry_t *pde; + u_int opde, npde; + + pde = pmap_pde(kernel_pmap, va); + + /* + * The cache mode bits are all in the low 32-bits of the + * PDE, so we can just spin on updating the low 32-bits. + */ + do { + opde = *(u_int *)pde; + npde = opde & ~(PG_PDE_PAT | PG_NC_PCD | PG_NC_PWT); + npde |= pmap_cache_bits(mode, 1); + } while (npde != opde && !atomic_cmpset_int((u_int *)pde, opde, npde)); +} + /* * Map a set of physical memory pages into the kernel virtual * address space. Return a pointer to where it is mapped. This @@ -3108,12 +3235,15 @@ * NOT real memory. */ void * -pmap_mapdev(vm_paddr_t pa, vm_size_t size) +pmap_mapdev_attr(vm_paddr_t pa, vm_size_t size, int mode) { vm_offset_t va, tmpva, offset; - /* If this fits within the direct map window, use it */ - if (pa < dmaplimit && (pa + size) < dmaplimit) + /* + * If this fits within the direct map window and use WB caching + * mode, use the direct map. + */ + if (pa < dmaplimit && (pa + size) < dmaplimit && mode == PAT_WRITE_BACK) return ((void *)PHYS_TO_DMAP(pa)); offset = pa & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); @@ -3122,15 +3252,30 @@ panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); pa = trunc_page(pa); for (tmpva = va; size > 0; ) { - pmap_kenter(tmpva, pa); + pmap_kenter_attr(tmpva, pa, mode); size -= PAGE_SIZE; tmpva += PAGE_SIZE; pa += PAGE_SIZE; } pmap_invalidate_range(kernel_pmap, va, tmpva); + pmap_invalidate_cache(); return ((void *)(va + offset)); } +void * +pmap_mapdev(vm_paddr_t pa, vm_size_t size) +{ + + return (pmap_mapdev_attr(pa, size, PAT_UNCACHEABLE)); +} + +void * +pmap_mapbios(vm_paddr_t pa, vm_size_t size) +{ + + return (pmap_mapdev_attr(pa, size, PAT_WRITE_BACK)); +} + void pmap_unmapdev(vm_offset_t va, vm_size_t size) { @@ -3148,6 +3293,73 @@ kmem_free(kernel_map, base, size); } +int +pmap_change_attr(va, size, mode) + vm_offset_t va; + vm_size_t size; + int mode; +{ + vm_offset_t base, offset, tmpva; + pd_entry_t *pde; + pt_entry_t *pte; + + base = va & PG_FRAME; + offset = va & PAGE_MASK; + size = roundup(offset + size, PAGE_SIZE); + + /* Only supported on kernel virtual addresses. */ + if (base <= VM_MAXUSER_ADDRESS) + return (EINVAL); + + /* + * XXX: We have to support tearing 2MB pages down into 4k pages if + * needed here. + */ + /* Pages that aren't mapped aren't supported. */ + for (tmpva = base; tmpva < (base + size); ) { + pde = pmap_pde(kernel_pmap, tmpva); + if (*pde == 0) + return (EINVAL); + if (*pde & PG_PS) { + /* Handle 2MB pages that are completely contained. */ + if (size >= NBPDR) { + tmpva += NBPDR; + continue; + } + return (EINVAL); + } + pte = vtopte(va); + if (*pte == 0) + return (EINVAL); + tmpva += PAGE_SIZE; + } + + /* + * Ok, all the pages exist, so run through them updating their + * cache mode. + */ + for (tmpva = base; size > 0; ) { + pde = pmap_pde(kernel_pmap, tmpva); + if (*pde & PG_PS) { + pmap_pde_attr(tmpva, mode); + tmpva += NBPDR; + size -= NBPDR; + } else { + pmap_pte_attr(tmpva, mode); + tmpva += PAGE_SIZE; + size -= PAGE_SIZE; + } + } + + /* + * Flush CPU caches to make sure any data isn't cached that shouldn't + * be, etc. + */ + pmap_invalidate_range(kernel_pmap, base, tmpva); + pmap_invalidate_cache(); + return (0); +} + /* * perform the pmap work for mincore */ ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/support.S#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.116 2005/09/27 18:32:46 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.118 2006/08/15 22:43:02 davidxu Exp $ */ #include "opt_ddb.h" @@ -432,7 +432,7 @@ ja fusufault movq %rsi,(%rdi) - xorl %eax,%eax + xorq %rax,%rax movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.307 2006/07/28 20:22:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.310 2006/08/14 19:53:53 alc Exp $"); /* * AMD64 Trap and System call handling @@ -535,7 +535,7 @@ { vm_offset_t va; struct vmspace *vm = NULL; - vm_map_t map = 0; + vm_map_t map; int rv = 0; vm_prot_t ftype; struct thread *td = curthread; @@ -566,8 +566,14 @@ map = &vm->vm_map; } + /* + * PGEX_I is defined only if the execute disable bit capability is + * supported and enabled. + */ if (frame->tf_err & PGEX_W) ftype = VM_PROT_WRITE; + else if ((frame->tf_err & PGEX_I) && pg_nx != 0) + ftype = VM_PROT_EXECUTE; else ftype = VM_PROT_READ; ==== //depot/projects/trustedbsd/mac2/sys/amd64/include/pmap.h#3 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.133 2006/08/02 16:24:23 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.134 2006/08/11 19:22:56 jhb Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -302,14 +302,19 @@ extern vm_offset_t virtual_end; #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) +#define pmap_unmapbios(va, sz) pmap_unmapdev((va), (sz)) void pmap_bootstrap(vm_paddr_t *); +int pmap_change_attr(vm_offset_t, vm_size_t, int); void pmap_init_pat(void); void pmap_kenter(vm_offset_t va, vm_paddr_t pa); +void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); void *pmap_kenter_temporary(vm_paddr_t pa, int i); vm_paddr_t pmap_kextract(vm_offset_t); void pmap_kremove(vm_offset_t); +void *pmap_mapbios(vm_paddr_t, vm_size_t); void *pmap_mapdev(vm_paddr_t, vm_size_t); +void *pmap_mapdev_attr(vm_paddr_t, vm_size_t, int); void pmap_unmapdev(vm_offset_t, vm_size_t); void pmap_invalidate_page(pmap_t, vm_offset_t); void pmap_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux.h#2 (text+ko) ==== @@ -27,13 +27,17 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.2 2006/03/18 18:24:38 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.3 2006/08/15 12:54:29 netchild Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ #define _AMD64_LINUX_LINUX_H_ #include /* for sigval union */ +#include +#include +#include +#include #include @@ -495,6 +499,7 @@ extern int bsd_to_linux_signal[]; extern int linux_to_bsd_signal[]; +extern struct sysentvec elf_linux_sysvec; /* * Pluggable ioctl handlers @@ -527,6 +532,11 @@ #define LINUX_O_NDELAY LINUX_O_NONBLOCK #define LINUX_O_SYNC 010000 #define LINUX_FASYNC 020000 +#define LINUX_O_DIRECT 040000 /* direct disk access hint */ +#define LINUX_O_LARGEFILE 0100000 +#define LINUX_O_DIRECTORY 0200000 /* must be a directory */ +#define LINUX_O_NOFOLLOW 0400000 /* don't follow links */ +#define LINUX_O_NOATIME 01000000 #define LINUX_F_DUPFD 0 #define LINUX_F_GETFD 1 @@ -737,4 +747,99 @@ l_short revents; } __packed; +struct l_user_desc { + l_uint entry_number; + l_uint base_addr; + l_uint limit; + l_uint seg_32bit:1; + l_uint contents:2; + l_uint read_exec_only:1; + l_uint limit_in_pages:1; + l_uint seg_not_present:1; + l_uint useable:1; +}; + +struct l_desc_struct { + unsigned long a,b; +}; + + +#define LINUX_LOWERWORD 0x0000ffff + +/* macros which does the same thing as those in linux include/asm-um/ldt-i386.h + * these convert linux user-space descriptor to machine one + */ +#define LDT_entry_a(info) \ + ((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD)) + +#define ENTRY_B_READ_EXEC_ONLY 9 +#define ENTRY_B_CONTENTS 10 +#define ENTRY_B_SEG_NOT_PRESENT 15 +#define ENTRY_B_BASE_ADDR 16 +#define ENTRY_B_USEABLE 20 +#define ENTRY_B_SEG32BIT 22 +#define ENTRY_B_LIMIT 23 + +#define LDT_entry_b(info) \ + (((info)->base_addr & 0xff000000) | \ + ((info)->limit & 0xf0000) | \ + ((info)->contents << ENTRY_B_CONTENTS) | \ + (((info)->seg_not_present == 0) << ENTRY_B_SEG_NOT_PRESENT) | \ + (((info)->base_addr & 0x00ff0000) >> ENTRY_B_BASE_ADDR) | \ + (((info)->read_exec_only == 0) << ENTRY_B_READ_EXEC_ONLY) | \ + ((info)->seg_32bit << ENTRY_B_SEG32BIT) | \ + ((info)->useable << ENTRY_B_USEABLE) | \ + ((info)->limit_in_pages << ENTRY_B_LIMIT) | 0x7000) + +#define LDT_empty(info) (\ + (info)->base_addr == 0 && \ + (info)->limit == 0 && \ + (info)->contents == 0 && \ + (info)->seg_not_present == 1 && \ + (info)->read_exec_only == 1 && \ + (info)->seg_32bit == 0 && \ + (info)->limit_in_pages == 0 && \ + (info)->useable == 0 ) + +/* macros for converting segments, they do the same as those in arch/i386/kernel/process.c */ +#define GET_BASE(desc) ( \ + (((desc)->a >> 16) & LINUX_LOWERWORD) | \ + (((desc)->b << 16) & 0x00ff0000) | \ + ( (desc)->b & 0xff000000) ) + +#define GET_LIMIT(desc) ( \ + ((desc)->a & LINUX_LOWERWORD) | \ + ((desc)->b & 0xf0000) ) + +#define GET_32BIT(desc) (((desc)->b >> ENTRY_B_SEG32BIT) & 1) +#define GET_CONTENTS(desc) (((desc)->b >> ENTRY_B_CONTENTS) & 3) +#define GET_WRITABLE(desc) (((desc)->b >> ENTRY_B_READ_EXEC_ONLY) & 1) +#define GET_LIMIT_PAGES(desc) (((desc)->b >> ENTRY_B_LIMIT) & 1) +#define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) +#define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) + +#define LINUX_CLOCK_REALTIME 0 +#define LINUX_CLOCK_MONOTONIC 1 +#define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 +#define LINUX_CLOCK_THREAD_CPUTIME_ID 3 +#define LINUX_CLOCK_REALTIME_HR 4 +#define LINUX_CLOCK_MONOTONIC_HR 5 + +typedef int l_timer_t; +typedef int l_mqd_t; + +#define CLONE_VM 0x100 +#define CLONE_FS 0x200 +#define CLONE_FILES 0x400 +#define CLONE_SIGHAND 0x800 +#define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ +#define CLONE_PARENT 0x00008000 +#define CLONE_THREAD 0x10000 +#define CLONE_SETTLS 0x80000 +#define CLONE_CHILD_CLEARTID 0x00200000 +#define CLONE_CHILD_SETTID 0x01000000 +#define CLONE_PARENT_SETTID 0x00100000 + +#define THREADING_FLAGS (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND) + #endif /* !_AMD64_LINUX_LINUX_H_ */ ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_dummy.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.3 2006/06/21 08:45:40 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.4 2006/08/15 12:54:29 netchild Exp $"); #include #include @@ -72,19 +72,13 @@ DUMMY(epoll_ctl); DUMMY(epoll_wait); DUMMY(remap_file_pages); -DUMMY(set_tid_address); DUMMY(timer_create); DUMMY(timer_settime); DUMMY(timer_gettime); DUMMY(timer_getoverrun); DUMMY(timer_delete); -DUMMY(clock_settime); -DUMMY(clock_gettime); -DUMMY(clock_getres); -DUMMY(clock_nanosleep); DUMMY(statfs64); DUMMY(fstatfs64); -DUMMY(tgkill); DUMMY(utimes); DUMMY(fadvise64_64); DUMMY(mbind); ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_machdep.c#2 (text+ko) ==== @@ -29,12 +29,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.12 2006/03/08 20:21:53 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.13 2006/08/15 12:54:29 netchild Exp $"); #include #include #include #include +#include #include #include #include @@ -472,12 +473,6 @@ return (0); } -#define CLONE_VM 0x100 -#define CLONE_FS 0x200 -#define CLONE_FILES 0x400 -#define CLONE_SIGHAND 0x800 -#define CLONE_PID 0x1000 - int linux_clone(struct thread *td, struct linux_clone_args *args) { @@ -491,14 +486,9 @@ printf(ARGS(clone, "flags %x, stack %x"), (unsigned int)(uintptr_t)args->flags, (unsigned int)(uintptr_t)args->stack); - if (args->flags & CLONE_PID) - printf(LMSG("CLONE_PID not yet supported")); } #endif - if (!args->stack) - return (EINVAL); - exit_signal = args->flags & 0x000000ff; if (exit_signal >= LINUX_NSIG) return (EINVAL); @@ -522,7 +512,11 @@ p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - td2->td_frame->tf_rsp = PTROUT(args->stack); + /* in a case of stack = NULL we are supposed to COW calling process stack + * this is what normal fork() does so we just keep the tf_rsp arg intact + */ + if (args->stack) + td2->td_frame->tf_rsp = PTROUT(args->stack); #ifdef DEBUG if (ldebug(clone)) ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.19 2006/07/28 19:08:35 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.21 2006/08/15 17:36:58 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -11,11 +11,10 @@ #include #include -#include -#include #include +#include -#include +#include struct proc; @@ -197,6 +196,9 @@ char dev_l_[PADL_(l_dev_t)]; l_dev_t dev; char dev_r_[PADR_(l_dev_t)]; char ubuf_l_[PADL_(struct l_ustat *)]; struct l_ustat * ubuf; char ubuf_r_[PADR_(struct l_ustat *)]; }; +struct linux_getppid_args { + register_t dummy; +}; struct linux_sigaction_args { char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)]; char nsa_l_[PADL_(l_osigaction_t *)]; l_osigaction_t * nsa; char nsa_r_[PADR_(l_osigaction_t *)]; @@ -368,6 +370,9 @@ struct linux_clone_args { char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void *)]; + char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char parent_tidptr_r_[PADR_(void *)]; + char dummy_l_[PADL_(int)]; int dummy; char dummy_r_[PADR_(int)]; + char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char child_tidptr_r_[PADR_(void *)]; }; struct linux_newuname_args { char buf_l_[PADL_(struct l_new_utsname *)]; struct l_new_utsname * buf; char buf_r_[PADR_(struct l_new_utsname *)]; @@ -668,6 +673,9 @@ char cmd_l_[PADL_(l_uint)]; l_uint cmd; char cmd_r_[PADR_(l_uint)]; char arg_l_[PADL_(uintptr_t)]; uintptr_t arg; char arg_r_[PADR_(uintptr_t)]; }; +struct linux_gettid_args { + register_t dummy; +}; struct linux_setxattr_args { register_t dummy; }; @@ -704,9 +712,24 @@ struct linux_fremovexattr_args { register_t dummy; }; +struct linux_tkill_args { + char tid_l_[PADL_(int)]; int tid; char tid_r_[PADR_(int)]; + char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; +}; +struct linux_sys_futex_args { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 16 19:47:07 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2910916A503 for ; Wed, 16 Aug 2006 19:47:07 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD36643D46 for ; Wed, 16 Aug 2006 19:47:05 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 83CD646C52 for ; Wed, 16 Aug 2006 15:47:04 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7719191DE7; Wed, 16 Aug 2006 19:46:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B4D616A597; Wed, 16 Aug 2006 19:46:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C61516A590 for ; Wed, 16 Aug 2006 19:46:45 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE59043D58 for ; Wed, 16 Aug 2006 19:46:43 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GJkhnH015893 for ; Wed, 16 Aug 2006 19:46:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GJkhLl015890 for perforce@freebsd.org; Wed, 16 Aug 2006 19:46:43 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 19:46:43 GMT Message-Id: <200608161946.k7GJkhLl015890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104282 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 19:47:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=104282 Change 104282 by millert@millert_macbook on 2006/08/16 19:46:16 Remove prototype for non-existent mac_check_ipc_semctl function. The actualy function is mac_check_sysv_semctl() (which has its own prototype). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#3 (text+ko) ==== @@ -352,8 +352,6 @@ */ int mac_check_ioctl(struct ucred *cred, struct fileproc *fp, int com, void *data); -int mac_check_ipc_semctl(struct ucred *cred, - struct semid_kernel *semakptr, int cmd); int mac_check_sysv_semget(struct ucred *cred, struct semid_kernel *semakptr); int mac_check_sysv_semop(struct ucred *cred,struct semid_kernel *semakptr, From owner-trustedbsd-cvs@FreeBSD.ORG Thu Aug 17 15:54:11 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B628716A4DA for ; Thu, 17 Aug 2006 15:54:11 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B17343D5F for ; Thu, 17 Aug 2006 15:53:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9C12946D61 for ; Thu, 17 Aug 2006 11:53:06 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 4283914B5A6; Thu, 17 Aug 2006 15:52:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 5088A16A511; Thu, 17 Aug 2006 15:52:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BFBB16A50E for ; Thu, 17 Aug 2006 15:52:04 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 217C943D62 for ; Thu, 17 Aug 2006 15:52:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HFq24H054862 for ; Thu, 17 Aug 2006 15:52:02 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HFq1iO054859 for perforce@freebsd.org; Thu, 17 Aug 2006 15:52:01 GMT (envelope-from millert@freebsd.org) Date: Thu, 17 Aug 2006 15:52:01 GMT Message-Id: <200608171552.k7HFq1iO054859@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104412 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 15:54:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=104412 Change 104412 by millert@millert_g4tower on 2006/08/17 15:51:45 Make the sedarwin dirs in export if they don't already exist. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile#3 (text+ko) ==== @@ -36,13 +36,14 @@ install: ./update_plist --policy=$(POLICY) --migscs=sebsd_migscs ../sedarwin/mac_sedarwin.kext/Contents/Info.plist && make -C ../sedarwin mac_sedarwin.kext.tar install + mkdir -p $(DESTDIR)/private/etc/sedarwin + (cd $(CURDIR)/.. && tar -X policy/excludes -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/ && tar -xf -) + (cd $(FLASK)/.. && tar -cf - flask) | (cd $(DESTDIR)/private/etc/sedarwin/policy && tar -xf -) + cp -f Makefile.install $(DESTDIR)/private/etc/sedarwin/policy/Makefile $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${DESTDIR}/private/etc/sedarwin/policy $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 sebsd_migscs ${DESTDIR}/private/etc/sedarwin/policy $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 failsafe_context ${DESTDIR}/private/etc/sedarwin/contexts $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/sedarwin - (cd $(CURDIR)/.. && tar -X policy/excludes -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/ && tar -xf -) - (cd $(FLASK)/.. && tar -cf - flask) | (cd $(DESTDIR)/private/etc/sedarwin/policy && tar -xf -) - cp -f Makefile.install $(DESTDIR)/private/etc/sedarwin/policy/Makefile # Mig security classes and access vectors From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 23 05:01:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED15E16A4E6 for ; Wed, 23 Aug 2006 05:01:39 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57C4343D46 for ; Wed, 23 Aug 2006 05:01:39 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9A7D046DC3 for ; Wed, 23 Aug 2006 01:01:38 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E56C562EDB; Wed, 23 Aug 2006 05:01:37 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id DE47D16A4E5; Wed, 23 Aug 2006 05:01:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAA4516A4DE for ; Wed, 23 Aug 2006 05:01:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48F4943D4C for ; Wed, 23 Aug 2006 05:01:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7N51bix000963 for ; Wed, 23 Aug 2006 05:01:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7N51ahr000960 for perforce@freebsd.org; Wed, 23 Aug 2006 05:01:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Aug 2006 05:01:36 GMT Message-Id: <200608230501.k7N51ahr000960@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 104823 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 05:01:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=104823 Change 104823 by rwatson@rwatson_sesame on 2006/08/23 05:00:49 Don't encode the string "bsm" into the audit filter API, prefer the string "audit". Suggested by: Martin Englund Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#7 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#4 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#6 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#7 $ */ #include @@ -106,13 +106,13 @@ * Present raw BSM to a set of registered and interested filters. */ static void -present_bsmrecord(struct timespec *ts, u_char *data, u_int len) +present_auditrecord(struct timespec *ts, u_char *data, u_int len) { struct auditfilter_module *am; TAILQ_FOREACH(am, &filter_list, am_list) { - if (am->am_bsmrecord != NULL) - (am->am_bsmrecord)(am->am_instance, ts, data, len); + if (am->am_auditrecord != NULL) + (am->am_auditrecord)(am->am_instance, ts, data, len); } } @@ -191,7 +191,7 @@ continue; if (clock_gettime(CLOCK_REALTIME, &ts) < 0) err(-1, "clock_gettime"); - present_bsmrecord(&ts, buf, reclen); + present_auditrecord(&ts, buf, reclen); present_tokens(&ts, buf, reclen); free(buf); } @@ -241,7 +241,7 @@ continue; if (clock_gettime(CLOCK_REALTIME, &ts) < 0) err(-1, "clock_gettime"); - present_bsmrecord(&ts, record, reclen); + present_auditrecord(&ts, record, reclen); present_tokens(&ts, record, reclen); } } ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#4 $ */ #define AUDITFILTERD_CONFFILE "/etc/security/audit_filter" @@ -57,7 +57,7 @@ audit_filter_attach_t am_attach; audit_filter_reinit_t am_reinit; audit_filter_record_t am_record; - audit_filter_bsmrecord_t am_bsmrecord; + audit_filter_auditrecord_t am_auditrecord; audit_filter_detach_t am_detach; /* ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#4 $ */ /* @@ -149,8 +149,8 @@ am->am_attach = dlsym(am->am_dlhandle, AUDIT_FILTER_ATTACH_STRING); am->am_reinit = dlsym(am->am_dlhandle, AUDIT_FILTER_REINIT_STRING); am->am_record = dlsym(am->am_dlhandle, AUDIT_FILTER_RECORD_STRING); - am->am_bsmrecord = dlsym(am->am_dlhandle, - AUDIT_FILTER_BSMRECORD_STRING); + am->am_auditrecord = dlsym(am->am_dlhandle, + AUDIT_FILTER_AUDITRECORD_STRING); am->am_detach = dlsym(am->am_dlhandle, AUDIT_FILTER_DETACH_STRING); if (am->am_attach != NULL) { @@ -163,7 +163,7 @@ am->am_attach = NULL; am->am_reinit = NULL; am->am_record = NULL; - am->am_bsmrecord = NULL; + am->am_auditrecord = NULL; am->am_detach = NULL; return (-1); } ==== //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#3 $ */ #ifndef _BSM_AUDIT_FILTER_H_ @@ -38,7 +38,7 @@ * audit_filter_reinit_t - arguments to module have changed * audit_filter_record_t - present parsed record to filter module, with * receipt time - * audit_filter_bsmrecord_t - present bsm format record to filter module, + * audit_filter_auditrecord_t - present BSM format record to filter module, * with receipt time * audit_filter_destach_t - filter module is being detached * @@ -49,7 +49,7 @@ typedef int (*audit_filter_reinit_t)(void *instance, int argc, char *argv[]); typedef void (*audit_filter_record_t)(void *instance, struct timespec *ts, int token_count, const tokenstr_t tok[]); -typedef void (*audit_filter_bsmrecord_t)(void *instance, struct timespec *ts, +typedef void (*audit_filter_auditrecord_t)(void *instance, struct timespec *ts, void *data, u_int len); typedef void (*audit_filter_detach_t)(void *instance); @@ -66,12 +66,12 @@ #define AUDIT_FILTER_ATTACH audit_filter_attach #define AUDIT_FILTER_REINIT audit_filter_reinit #define AUDIT_FILTER_RECORD audit_filter_record -#define AUDIT_FILTER_BSMRECORD audit_filter_bsmrecord +#define AUDIT_FILTER_AUDITRECORD audit_filter_auditrecord #define AUDIT_FILTER_DETACH audit_filter_detach #define AUDIT_FILTER_ATTACH_STRING "audit_filter_attach" #define AUDIT_FILTER_REINIT_STRING "audit_filter_reinit" #define AUDIT_FILTER_RECORD_STRING "audit_filter_record" -#define AUDIT_FILTER_BSMRECORD_STRING "audit_filter_bsmrecord" +#define AUDIT_FILTER_AUDITRECORD_STRING "audit_filter_auditrecord" #define AUDIT_FILTER_DETACH_STRING "audit_filter_detach" #endif /* !_BSM_AUDIT_FILTER_H_ */ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 23 05:09:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 216FB16A4DA for ; Wed, 23 Aug 2006 05:09:52 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D51843D46 for ; Wed, 23 Aug 2006 05:09:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id E513D46CCB for ; Wed, 23 Aug 2006 01:09:50 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 36B74574AD; Wed, 23 Aug 2006 05:09:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E38E16A4DF; Wed, 23 Aug 2006 05:09:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E50F716A4DD for ; Wed, 23 Aug 2006 05:09:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78BB543D53 for ; Wed, 23 Aug 2006 05:09:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7N59mHa002594 for ; Wed, 23 Aug 2006 05:09:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7N59mTD002591 for perforce@freebsd.org; Wed, 23 Aug 2006 05:09:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Aug 2006 05:09:48 GMT Message-Id: <200608230509.k7N59mTD002591@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 104824 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 05:09:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=104824 Change 104824 by rwatson@rwatson_sesame on 2006/08/23 05:09:16 Update for OpenBSM 1.0a9. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#23 edit .. //depot/projects/trustedbsd/openbsm/VERSION#11 edit .. //depot/projects/trustedbsd/openbsm/configure#25 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#28 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#23 (text+ko) ==== @@ -1,3 +1,8 @@ +OpenBSM 1.0 alpha 9 + +- Further refine audit filter API to avoid encoding "BSM"/"bsm" strings into + it; prefer "AUDIT"/"audit". + OpenBSM 1.0 alpha 8 - Correct typo in definition of AUR_INT. @@ -192,4 +197,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#22 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#23 $ ==== //depot/projects/trustedbsd/openbsm/VERSION#11 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_8 +OPENBSM_1_0_ALPHA_9 ==== //depot/projects/trustedbsd/openbsm/configure#25 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#26 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#27 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a8. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a9. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a8' -PACKAGE_STRING='OpenBSM 1.0a8' +PACKAGE_VERSION='1.0a9' +PACKAGE_STRING='OpenBSM 1.0a9' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a8 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a8:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a9:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a8 +OpenBSM configure 1.0a9 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a8, which was +It was created by OpenBSM $as_me 1.0a9, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a8 + VERSION=1.0a9 cat >>confdefs.h <<_ACEOF @@ -23478,7 +23478,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a8, which was +This file was extended by OpenBSM $as_me 1.0a9, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23541,7 +23541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a8 +OpenBSM config.status 1.0a9 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/openbsm/configure.ac#28 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0a8], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#27 $]) +AC_INIT([OpenBSM], [1.0a9], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#28 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 23 05:51:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B29516A4DF for ; Wed, 23 Aug 2006 05:51:54 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E235343D6B for ; Wed, 23 Aug 2006 05:51:46 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4D9E246CB3 for ; Wed, 23 Aug 2006 01:51:46 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id A792D5C551; Wed, 23 Aug 2006 05:51:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FF2416A4E1; Wed, 23 Aug 2006 05:51:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A17F16A4DE for ; Wed, 23 Aug 2006 05:51:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0C5C43D6B for ; Wed, 23 Aug 2006 05:51: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.6/8.13.6) with ESMTP id k7N5pg5k004983 for ; Wed, 23 Aug 2006 05:51:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7N5pgrU004980 for perforce@freebsd.org; Wed, 23 Aug 2006 05:51:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Aug 2006 05:51:42 GMT Message-Id: <200608230551.k7N5pgrU004980@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 104826 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 05:51:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=104826 Change 104826 by rwatson@rwatson_sesame on 2006/08/23 05:51:15 Catch up with BSM->AUDIT rename for filter API. Affected files ... .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#3 $ */ /* @@ -60,7 +60,7 @@ } void -AUDIT_FILTER_BSMRECORD(void *instance, struct timespec *ts, u_char *data, +AUDIT_FILTER_AUDITRECORD(void *instance, struct timespec *ts, u_char *data, u_int len) { From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 23 06:08:47 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 15B3C16A4E0 for ; Wed, 23 Aug 2006 06:08:47 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C74843D94 for ; Wed, 23 Aug 2006 06:08:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 8765C46CF8 for ; Wed, 23 Aug 2006 02:08:22 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id DB5A4D0138; Wed, 23 Aug 2006 06:08:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D3F3916A4E7; Wed, 23 Aug 2006 06:08:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9666E16A4E5 for ; Wed, 23 Aug 2006 06:08:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D0EE43DA0 for ; Wed, 23 Aug 2006 06:08: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.6/8.13.6) with ESMTP id k7N68420007062 for ; Wed, 23 Aug 2006 06:08:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7N684lv007059 for perforce@freebsd.org; Wed, 23 Aug 2006 06:08:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Aug 2006 06:08:04 GMT Message-Id: <200608230608.k7N684lv007059@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 104827 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 06:08:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=104827 Change 104827 by rwatson@rwatson_sesame on 2006/08/23 06:07:35 Rename OpenBSM-internal audit header and trailer size constants to use AUDIT_ instead of BSM_ prefixes. Suggested by: Martin Englund Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#14 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#27 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#40 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#14 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#14 $ */ #ifndef _AUDIT_INTERNAL_H @@ -68,15 +68,15 @@ typedef struct au_record au_record_t; -/* We could determined the header and trailer sizes by - * defining appropriate structures. We hold off that approach - * till we have a consistant way of using structures for all tokens. - * This is not straightforward since these token structures may - * contain pointers of whose contents we dont know the size - * (e.g text tokens) +/* + * We could determined the header and trailer sizes by defining appropriate + * structures. We hold off that approach until we have a consistant way of + * using structures for all tokens. This is not straightforward since these + * token structures may contain pointers of whose contents we dont know the + * size (e.g text tokens). */ -#define BSM_HEADER_SIZE 18 -#define BSM_TRAILER_SIZE 7 +#define AUDIT_HEADER_SIZE 18 +#define AUDIT_TRAILER_SIZE 7 /* * BSM token streams store fields in big endian byte order, so as to be ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#27 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#26 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#27 $ */ #include @@ -174,7 +174,7 @@ return (-1); /* Invalid descriptor */ } - if (rec->len + tok->len + BSM_TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) { + if (rec->len + tok->len + AUDIT_TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) { errno = ENOMEM; return (-1); } @@ -208,7 +208,7 @@ u_char *dptr; int error; - tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; + tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; header = au_to_header32(tot_rec_size, event, 0); if (header == NULL) return (-1); @@ -285,7 +285,7 @@ goto cleanup; } - tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; + tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; if (tot_rec_size > MAX_AUDIT_RECORD_SIZE) { /* @@ -335,7 +335,7 @@ } retval = 0; - tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; + tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; if ((tot_rec_size > MAX_AUDIT_RECORD_SIZE) || (tot_rec_size > *buflen)) { /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#40 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#39 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#40 $ */ #include @@ -2448,7 +2448,7 @@ int err = 0; int recoversize; - recoversize = len - (tok->len + BSM_TRAILER_SIZE); + recoversize = len - (tok->len + AUDIT_TRAILER_SIZE); if (recoversize <= 0) return (-1); From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 23 06:15:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29C5316A4FB for ; Wed, 23 Aug 2006 06:15:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67BBC43D6E for ; Wed, 23 Aug 2006 06:15:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B600846CF4 for ; Wed, 23 Aug 2006 02:15:15 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 146865568D; Wed, 23 Aug 2006 06:15:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CBDA16A4E0; Wed, 23 Aug 2006 06:15:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C2DB916A4DE for ; Wed, 23 Aug 2006 06:15:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53BFF43D6E for ; Wed, 23 Aug 2006 06:15:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7N6FEgR007443 for ; Wed, 23 Aug 2006 06:15:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7N6FDCN007440 for perforce@freebsd.org; Wed, 23 Aug 2006 06:15:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Aug 2006 06:15:13 GMT Message-Id: <200608230615.k7N6FDCN007440@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 104828 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 06:15:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=104828 Change 104828 by rwatson@rwatson_sesame on 2006/08/23 06:14:44 Rename more OpenBSM-specific constants from BSM_ to AUDIT_, including the header version identifiers, and maximum groups/args/env values. Suggested by: Martin Englund Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#23 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#27 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#51 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#23 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#23 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -199,7 +199,7 @@ #define PAD_NOTATTR 0x4000 /* nonattributable event */ #define PAD_FAILURE 0x8000 /* fail audit event */ -#define BSM_MAX_GROUPS 16 +#define AUDIT_MAX_GROUPS 16 /* * A number of BSM versions are floating around and defined. Here are @@ -207,11 +207,11 @@ * Solaris BSM version, but has a separate version number in order to * identify a potentially different event identifier name space. */ -#define BSM_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ -#define BSM_HEADER_VERSION_SOLARIS 2 -#define BSM_HEADER_VERSION_TSOL25 3 -#define BSM_HEADER_VERSION_TSOL 4 -#define BSM_HEADER_VERSION_OPENBSM 10 +#define AUDIT_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ +#define AUDIT_HEADER_VERSION_SOLARIS 2 +#define AUDIT_HEADER_VERSION_TSOL25 3 +#define AUDIT_HEADER_VERSION_TSOL 4 +#define AUDIT_HEADER_VERSION_OPENBSM 10 /* * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#27 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#26 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#27 $ */ #ifndef _LIBBSM_H_ @@ -37,8 +37,8 @@ * solely to allow OpenSSH to compile; Darwin/Apple code should not use them. */ -#define BSM_MAX_ARGS 10 -#define BSM_MAX_ENV 10 +#define AUDIT_MAX_ARGS 10 +#define AUDIT_MAX_ENV 10 #include #include @@ -218,7 +218,7 @@ */ typedef struct { u_int32_t count; - char *text[BSM_MAX_ARGS]; + char *text[AUDIT_MAX_ARGS]; } au_execarg_t; /* @@ -227,7 +227,7 @@ */ typedef struct { u_int32_t count; - char *text[BSM_MAX_ENV]; + char *text[AUDIT_MAX_ENV]; } au_execenv_t; /* @@ -259,7 +259,7 @@ */ typedef struct { u_int16_t no; - u_int32_t list[BSM_MAX_GROUPS]; + u_int32_t list[AUDIT_MAX_GROUPS]; } au_groups_t; /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#51 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#50 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#51 $ */ #include @@ -309,7 +309,7 @@ au_to_groups(int *groups) { - return (au_to_newgroups(BSM_MAX_GROUPS, groups)); + return (au_to_newgroups(AUDIT_MAX_GROUPS, groups)); } /* @@ -1155,7 +1155,7 @@ ADD_U_CHAR(dptr, AUT_HEADER32); ADD_U_INT32(dptr, rec_size); - ADD_U_CHAR(dptr, BSM_HEADER_VERSION_OPENBSM); + ADD_U_CHAR(dptr, AUDIT_HEADER_VERSION_OPENBSM); ADD_U_INT16(dptr, e_type); ADD_U_INT16(dptr, e_mod); From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 23 06:17:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 89C8216A4E8 for ; Wed, 23 Aug 2006 06:17:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0936343D46 for ; Wed, 23 Aug 2006 06:17:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9FD0446CF8 for ; Wed, 23 Aug 2006 02:17:18 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2068856599; Wed, 23 Aug 2006 06:17:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 17EFE16A4E1; Wed, 23 Aug 2006 06:17:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E449B16A4DD for ; Wed, 23 Aug 2006 06:17:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 937AF43D49 for ; Wed, 23 Aug 2006 06:17:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7N6HHlm007585 for ; Wed, 23 Aug 2006 06:17:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7N6HH3G007582 for perforce@freebsd.org; Wed, 23 Aug 2006 06:17:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Aug 2006 06:17:17 GMT Message-Id: <200608230617.k7N6HH3G007582@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 104829 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 06:17:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=104829 Change 104829 by rwatson@rwatson_sesame on 2006/08/23 06:16:19 Update version and credit information. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#24 edit .. //depot/projects/trustedbsd/openbsm/README#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#24 (text+ko) ==== @@ -1,7 +1,8 @@ OpenBSM 1.0 alpha 9 -- Further refine audit filter API to avoid encoding "BSM"/"bsm" strings into - it; prefer "AUDIT"/"audit". +- Rename many OpenBSM-specific constants and API elements containing the + strings "BSM" and "bsm" to "AUDIT" and "audit", observing that this is + true for almost all existing constants and APIs. OpenBSM 1.0 alpha 8 @@ -197,4 +198,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#23 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#24 $ ==== //depot/projects/trustedbsd/openbsm/README#19 (text+ko) ==== @@ -75,6 +75,7 @@ Christian Peron Martin Fong Pawel Worach + Martin Englund In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -96,4 +97,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#18 $ +$P4: //depot/projects/trustedbsd/openbsm/README#19 $ From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 23 06:20:23 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D208C16A55D for ; Wed, 23 Aug 2006 06:20:23 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D4B343D46 for ; Wed, 23 Aug 2006 06:20:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A6AA946BE4 for ; Wed, 23 Aug 2006 02:20:22 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3C20955E4E; Wed, 23 Aug 2006 06:20:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 34EA116A4E2; Wed, 23 Aug 2006 06:20:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0BCFE16A4E0 for ; Wed, 23 Aug 2006 06:20:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE47943D46 for ; Wed, 23 Aug 2006 06:20:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7N6KL3w007776 for ; Wed, 23 Aug 2006 06:20:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7N6KLLT007773 for perforce@freebsd.org; Wed, 23 Aug 2006 06:20:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Aug 2006 06:20:21 GMT Message-Id: <200608230620.k7N6KLLT007773@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 104830 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 06:20:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=104830 Change 104830 by rwatson@rwatson_sesame on 2006/08/23 06:19:34 Rename two internal variables to be audit_ instead of bsm_. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#28 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#28 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#27 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#28 $ */ #include @@ -54,14 +54,14 @@ static au_record_t *open_desc_table[MAX_AUDIT_RECORDS]; /* The current number of active record descriptors */ -static int bsm_rec_count = 0; +static int audit_rec_count = 0; /* * Records that can be recycled are maintained in the list given below. The * maximum number of elements that can be present in this list is bounded by * MAX_AUDIT_RECORDS. Memory allocated for these records are never freed. */ -static LIST_HEAD(, au_record) bsm_free_q; +static LIST_HEAD(, au_record) audit_free_q; static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; @@ -93,15 +93,15 @@ pthread_mutex_lock(&mutex); - if (bsm_rec_count == 0) - LIST_INIT(&bsm_free_q); + if (audit_rec_count == 0) + LIST_INIT(&audit_free_q); /* * Find an unused descriptor, remove it from the free list, mark as * used. */ - if (!LIST_EMPTY(&bsm_free_q)) { - rec = LIST_FIRST(&bsm_free_q); + if (!LIST_EMPTY(&audit_free_q)) { + rec = LIST_FIRST(&audit_free_q); rec->used = 1; LIST_REMOVE(rec, au_rec_q); } @@ -125,7 +125,7 @@ pthread_mutex_lock(&mutex); - if (bsm_rec_count == MAX_AUDIT_RECORDS) { + if (audit_rec_count == MAX_AUDIT_RECORDS) { pthread_mutex_unlock(&mutex); free(rec->data); free(rec); @@ -134,9 +134,9 @@ errno = ENOMEM; return (-1); } - rec->desc = bsm_rec_count; - open_desc_table[bsm_rec_count] = rec; - bsm_rec_count++; + rec->desc = audit_rec_count; + open_desc_table[audit_rec_count] = rec; + audit_rec_count++; pthread_mutex_unlock(&mutex); @@ -257,7 +257,7 @@ pthread_mutex_lock(&mutex); /* Add the record to the freelist tail */ - LIST_INSERT_HEAD(&bsm_free_q, rec, au_rec_q); + LIST_INSERT_HEAD(&audit_free_q, rec, au_rec_q); pthread_mutex_unlock(&mutex); } From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 23 07:32:56 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BAEE716A55D for ; Wed, 23 Aug 2006 07:32:56 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AEE543D49 for ; Wed, 23 Aug 2006 07:32:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B91C046D05 for ; Wed, 23 Aug 2006 03:32:55 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2799855904; Wed, 23 Aug 2006 07:32:55 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2031C16A4DE; Wed, 23 Aug 2006 07:32:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D80EF16A4DA for ; Wed, 23 Aug 2006 07:32:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F69943D49 for ; Wed, 23 Aug 2006 07:32:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7N7WsQj013792 for ; Wed, 23 Aug 2006 07:32:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7N7WqbF013789 for perforce@freebsd.org; Wed, 23 Aug 2006 07:32:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Aug 2006 07:32:52 GMT Message-Id: <200608230732.k7N7WqbF013789@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 104832 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 07:32:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=104832 Change 104832 by rwatson@rwatson_sesame on 2006/08/23 07:32:42 Add comment describing the contens of auditfilterd.c, and pointing at auditfilterd_conf.c for the remainder. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#8 (text+ko) ==== @@ -25,7 +25,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#8 $ + */ + +/* + * Main file for the audit filter daemon, which presents audit records to a + * set of run-time registered loadable modules. This is the main event loop + * of the daemon, which handles starting up, waiting for records, and + * presenting records to configured modules. auditfilterd_conf.c handles the + * reading and management of the configuration, module list and module state, + * etc. */ #include From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 23 07:50:21 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 06F9616A4DD for ; Wed, 23 Aug 2006 07:50:21 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 576D243D55 for ; Wed, 23 Aug 2006 07:50:20 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 1FD5D46D05 for ; Wed, 23 Aug 2006 03:50:19 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6EF9E5B600; Wed, 23 Aug 2006 07:50:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 674D616A4E1; Wed, 23 Aug 2006 07:50:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3212616A4DA for ; Wed, 23 Aug 2006 07:50:18 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDDFE43D55 for ; Wed, 23 Aug 2006 07:50:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7N7oHa4017161 for ; Wed, 23 Aug 2006 07:50:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7N7oHO4017158 for perforce@freebsd.org; Wed, 23 Aug 2006 07:50:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Aug 2006 07:50:17 GMT Message-Id: <200608230750.k7N7oHO4017158@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 104835 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 07:50:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=104835 Change 104835 by rwatson@rwatson_sesame on 2006/08/23 07:49:54 Change the audit filter API to pass an immutable void * into module APIs, which is then used via a cookie API, rather than being owned by the module. This allows the audit filter daemon to offer services that require per-instance state -- for example, per-module preselection. Further rename am_auditrecord to am_rawrecord to make the functional distinction from am_record more clear. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#25 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#9 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#5 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#5 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#4 edit .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#25 (text+ko) ==== @@ -1,8 +1,13 @@ OpenBSM 1.0 alpha 9 - Rename many OpenBSM-specific constants and API elements containing the - strings "BSM" and "bsm" to "AUDIT" and "audit", observing that this is - true for almost all existing constants and APIs. + strings "BSM" and "bsm" to "AUDIT" and "audit", observing that this is true + for almost all existing constants and APIs. +- Instead of passing a per-instance cookie directly into all audit filter + APIs, pass in the audit filter daemon state pointer, which is then used by + the module using an audit_filter_{get,set}cookie() API. This will allow + future service APIs provided by the filter daemon to maintain their own + state -- for example, per-module preselection state. OpenBSM 1.0 alpha 8 @@ -198,4 +203,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#24 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#25 $ ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#9 $ */ /* @@ -115,13 +115,13 @@ * Present raw BSM to a set of registered and interested filters. */ static void -present_auditrecord(struct timespec *ts, u_char *data, u_int len) +present_rawrecord(struct timespec *ts, u_char *data, u_int len) { struct auditfilter_module *am; TAILQ_FOREACH(am, &filter_list, am_list) { - if (am->am_auditrecord != NULL) - (am->am_auditrecord)(am->am_instance, ts, data, len); + if (am->am_rawrecord != NULL) + (am->am_rawrecord)(am, ts, data, len); } } @@ -149,8 +149,7 @@ TAILQ_FOREACH(am, &filter_list, am_list) { if (am->am_record != NULL) - (am->am_record)(am->am_instance, ts, tokencount, - tokens); + (am->am_record)(am, ts, tokencount, tokens); } } @@ -200,7 +199,7 @@ continue; if (clock_gettime(CLOCK_REALTIME, &ts) < 0) err(-1, "clock_gettime"); - present_auditrecord(&ts, buf, reclen); + present_rawrecord(&ts, buf, reclen); present_tokens(&ts, buf, reclen); free(buf); } @@ -250,7 +249,7 @@ continue; if (clock_gettime(CLOCK_REALTIME, &ts) < 0) err(-1, "clock_gettime"); - present_auditrecord(&ts, record, reclen); + present_rawrecord(&ts, record, reclen); present_tokens(&ts, record, reclen); } } ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.h#5 $ */ #define AUDITFILTERD_CONFFILE "/etc/security/audit_filter" @@ -53,11 +53,11 @@ /* * Fields provided by or extracted from the module. */ - void *am_instance; + void *am_cookie; audit_filter_attach_t am_attach; audit_filter_reinit_t am_reinit; audit_filter_record_t am_record; - audit_filter_auditrecord_t am_auditrecord; + audit_filter_rawrecord_t am_rawrecord; audit_filter_detach_t am_detach; /* ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#5 $ */ /* @@ -38,6 +38,12 @@ * Modules are in one of two states: attached, or detached. If attach fails, * detach is not called because it was not attached. If a module is attached * and a call to its reinit method fails, we will detach it. + * + * Modules are passed a (void *) reference to their configuration state so + * that they may pass this into any common APIs we provide which may rely on + * that state. Currently, the only such API is the cookie API, which allows + * per-instance state to be maintained by a module. In the future, this will + * also be used to support per-instance preselection state. */ #include @@ -105,8 +111,8 @@ { if (am->am_detach != NULL) - am->am_detach(am->am_instance); - am->am_instance = NULL; + am->am_detach(am); + am->am_cookie = NULL; (void)dlclose(am->am_dlhandle); am->am_dlhandle = NULL; } @@ -149,21 +155,22 @@ am->am_attach = dlsym(am->am_dlhandle, AUDIT_FILTER_ATTACH_STRING); am->am_reinit = dlsym(am->am_dlhandle, AUDIT_FILTER_REINIT_STRING); am->am_record = dlsym(am->am_dlhandle, AUDIT_FILTER_RECORD_STRING); - am->am_auditrecord = dlsym(am->am_dlhandle, - AUDIT_FILTER_AUDITRECORD_STRING); + am->am_rawrecord = dlsym(am->am_dlhandle, + AUDIT_FILTER_RAWRECORD_STRING); am->am_detach = dlsym(am->am_dlhandle, AUDIT_FILTER_DETACH_STRING); if (am->am_attach != NULL) { - if (am->am_attach(&am->am_instance, am->am_argc, am->am_argv) + if (am->am_attach(am, am->am_argc, am->am_argv) != AUDIT_FILTER_SUCCESS) { warnx("auditfilter_module_attach: %s: failed", am->am_modulename); dlclose(am->am_dlhandle); am->am_dlhandle = NULL; + am->am_cookie = NULL; am->am_attach = NULL; am->am_reinit = NULL; am->am_record = NULL; - am->am_auditrecord = NULL; + am->am_rawrecord = NULL; am->am_detach = NULL; return (-1); } @@ -184,7 +191,7 @@ if (am->am_reinit == NULL) return (0); - if (am->am_reinit(&am->am_instance, am->am_argc, am->am_argv) != + if (am->am_reinit(am, am->am_argc, am->am_argv) != AUDIT_FILTER_SUCCESS) { warnx("auditfilter_module_reinit: %s: failed", am->am_modulename); @@ -483,3 +490,24 @@ auditfilter_module_list_detach(&filter_list); auditfilter_module_list_free(&filter_list); } + +/* + * APIs to allow modules to query and set their per-instance cookie. + */ +void +audit_filter_getcookie(void *instance, void **cookie) +{ + struct auditfilter_module *am; + + am = (struct auditfilter_module *)instance; + *cookie = am->am_cookie; +} + +void +audit_filter_setcookie(void *instance, void *cookie) +{ + struct auditfilter_module *am; + + am = (struct auditfilter_module *)instance; + am->am_cookie = cookie; +} ==== //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_filter.h#4 $ */ #ifndef _BSM_AUDIT_FILTER_H_ @@ -38,22 +38,28 @@ * audit_filter_reinit_t - arguments to module have changed * audit_filter_record_t - present parsed record to filter module, with * receipt time - * audit_filter_auditrecord_t - present BSM format record to filter module, + * audit_filter_rawrecord_t - present BSM format record to filter module, * with receipt time * audit_filter_destach_t - filter module is being detached * * There may be many instances of the same filter, identified by the instance * void pointer maintained by the filter instance. */ -typedef int (*audit_filter_attach_t)(void **instance, int argc, char *argv[]); +typedef int (*audit_filter_attach_t)(void *instance, int argc, char *argv[]); typedef int (*audit_filter_reinit_t)(void *instance, int argc, char *argv[]); typedef void (*audit_filter_record_t)(void *instance, struct timespec *ts, int token_count, const tokenstr_t tok[]); -typedef void (*audit_filter_auditrecord_t)(void *instance, struct timespec *ts, +typedef void (*audit_filter_rawrecord_t)(void *instance, struct timespec *ts, void *data, u_int len); typedef void (*audit_filter_detach_t)(void *instance); /* + * APIs that may be called by audit filters. + */ +void audit_filter_getcookie(void *instance, void **cookie); +void audit_filter_setcookie(void *instance, void *cookie); + +/* * Values to be returned by audit_filter_init_t. */ #define AUDIT_FILTER_SUCCESS (0) @@ -66,12 +72,12 @@ #define AUDIT_FILTER_ATTACH audit_filter_attach #define AUDIT_FILTER_REINIT audit_filter_reinit #define AUDIT_FILTER_RECORD audit_filter_record -#define AUDIT_FILTER_AUDITRECORD audit_filter_auditrecord +#define AUDIT_FILTER_RAWRECORD audit_filter_rawrecord #define AUDIT_FILTER_DETACH audit_filter_detach #define AUDIT_FILTER_ATTACH_STRING "audit_filter_attach" #define AUDIT_FILTER_REINIT_STRING "audit_filter_reinit" #define AUDIT_FILTER_RECORD_STRING "audit_filter_record" -#define AUDIT_FILTER_AUDITRECORD_STRING "audit_filter_auditrecord" +#define AUDIT_FILTER_RAWRECORD_STRING "audit_filter_rawrecord" #define AUDIT_FILTER_DETACH_STRING "audit_filter_detach" #endif /* !_BSM_AUDIT_FILTER_H_ */ ==== //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#4 $ */ /* @@ -39,7 +39,7 @@ #include int -AUDIT_FILTER_ATTACH(void **instance, int argc, char *argv[]) +AUDIT_FILTER_ATTACH(void *instance, int argc, char *argv[]) { return (0); @@ -60,7 +60,7 @@ } void -AUDIT_FILTER_AUDITRECORD(void *instance, struct timespec *ts, u_char *data, +AUDIT_FILTER_RAWRECORD(void *instance, struct timespec *ts, u_char *data, u_int len) { From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 23 17:25:26 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E2A416A4E2 for ; Wed, 23 Aug 2006 17:25:26 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D233743D4C for ; Wed, 23 Aug 2006 17:25:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id EEF9846D09 for ; Wed, 23 Aug 2006 13:25:24 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 0A98A56678; Wed, 23 Aug 2006 17:25:24 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0120716A4E6; Wed, 23 Aug 2006 17:25:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B93EF16A4E0 for ; Wed, 23 Aug 2006 17:25:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6610143D49 for ; Wed, 23 Aug 2006 17:25:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7NHPNrV028616 for ; Wed, 23 Aug 2006 17:25:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7NHPMkV028613 for perforce@freebsd.org; Wed, 23 Aug 2006 17:25:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Aug 2006 17:25:22 GMT Message-Id: <200608231725.k7NHPMkV028613@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 104850 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 17:25:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=104850 Change 104850 by rwatson@rwatson_sesame on 2006/08/23 17:24:40 Some updates of audit.log.5 to reflect improved libbsm(3) support for token creation APIs, 64-bit tokens, etc. This man page still leaves much to be desired. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#10 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2005-2006 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#9 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#10 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 @@ -91,10 +91,14 @@ token is used to mark the beginning of a complete audit record, and includes the length of the total record in bytes, a version number for the record layout, the event type and subtype, and the time at which the event occurred. -A +A 32-bit +.Dv header +token can be created using +.Xr au_to_header32 3 ; +a 64-bit .Dv header token can be created using -.Xr au_to_header32 3 . +.Xr au_to_header64 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" @@ -111,11 +115,14 @@ token is an expanded version of the .Dv header token, with the addition of a machine IPv4 or IPv6 address. -The -.Xr libbsm 3 -API cannot currently create an -.Dv expanded header -token. +A 32-bit extended +.Dv header +token can be created using +.Xr au_to_header32_ex 3 ; +a 64-bit extended +.Dv header +token can be created using +.Xr au_to_header64_ex 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" @@ -154,11 +161,10 @@ .Dv How to print field is present to specify how to print the data, but interpretation of that field is not currently defined. -The -.Xr libbsm 3 -API cannot currently create an +An .Dv arbitrary data -token. +token can be created using +.Xr au_to_data 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" From owner-trustedbsd-cvs@FreeBSD.ORG Thu Aug 24 11:00:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DEFE716A4E8 for ; Thu, 24 Aug 2006 11:00:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C1FA43D5E for ; Thu, 24 Aug 2006 11:00:40 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 206A146D4A for ; Thu, 24 Aug 2006 07:00:39 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AF19314BCE8; Thu, 24 Aug 2006 10:57:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A737B16A4E5; Thu, 24 Aug 2006 10:57:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 69A5816A4E1 for ; Thu, 24 Aug 2006 10:57:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAE4C43D49 for ; Thu, 24 Aug 2006 10:57:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7OAvb5P060486 for ; Thu, 24 Aug 2006 10:57:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7OAvbqv060483 for perforce@freebsd.org; Thu, 24 Aug 2006 10:57:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Aug 2006 10:57:37 GMT Message-Id: <200608241057.k7OAvbqv060483@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 104912 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Aug 2006 11:00:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=104912 Change 104912 by rwatson@rwatson_sesame on 2006/08/24 10:56:48 Merge OpenBSM 1.0a9 features from TrustedBSD OpenBSM branch to TrustedBSD audit3 branch: - Constant renaming, which may require further work in the audit3 branch to catch up with. - auditfilterd API updates. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#15 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_filter.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#15 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#17 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#20 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#10 (text+ko) ==== @@ -1,3 +1,14 @@ +OpenBSM 1.0 alpha 9 + +- Rename many OpenBSM-specific constants and API elements containing the + strings "BSM" and "bsm" to "AUDIT" and "audit", observing that this is true + for almost all existing constants and APIs. +- Instead of passing a per-instance cookie directly into all audit filter + APIs, pass in the audit filter daemon state pointer, which is then used by + the module using an audit_filter_{get,set}cookie() API. This will allow + future service APIs provided by the filter daemon to maintain their own + state -- for example, per-module preselection state. + OpenBSM 1.0 alpha 8 - Correct typo in definition of AUR_INT. @@ -192,4 +203,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#9 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#10 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#15 (text+ko) ==== @@ -75,6 +75,7 @@ Christian Peron Martin Fong Pawel Worach + Martin Englund In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -96,4 +97,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#14 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#15 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#11 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_8 +OPENBSM_1_0_ALPHA_9 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#4 (text+ko) ==== @@ -25,7 +25,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#3 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.c#4 $ + */ + +/* + * Main file for the audit filter daemon, which presents audit records to a + * set of run-time registered loadable modules. This is the main event loop + * of the daemon, which handles starting up, waiting for records, and + * presenting records to configured modules. auditfilterd_conf.c handles the + * reading and management of the configuration, module list and module state, + * etc. */ #include @@ -106,13 +115,13 @@ * Present raw BSM to a set of registered and interested filters. */ static void -present_bsmrecord(struct timespec *ts, u_char *data, u_int len) +present_rawrecord(struct timespec *ts, u_char *data, u_int len) { struct auditfilter_module *am; TAILQ_FOREACH(am, &filter_list, am_list) { - if (am->am_bsmrecord != NULL) - (am->am_bsmrecord)(am->am_instance, ts, data, len); + if (am->am_rawrecord != NULL) + (am->am_rawrecord)(am, ts, data, len); } } @@ -140,8 +149,7 @@ TAILQ_FOREACH(am, &filter_list, am_list) { if (am->am_record != NULL) - (am->am_record)(am->am_instance, ts, tokencount, - tokens); + (am->am_record)(am, ts, tokencount, tokens); } } @@ -191,7 +199,7 @@ continue; if (clock_gettime(CLOCK_REALTIME, &ts) < 0) err(-1, "clock_gettime"); - present_bsmrecord(&ts, buf, reclen); + present_rawrecord(&ts, buf, reclen); present_tokens(&ts, buf, reclen); free(buf); } @@ -241,7 +249,7 @@ continue; if (clock_gettime(CLOCK_REALTIME, &ts) < 0) err(-1, "clock_gettime"); - present_bsmrecord(&ts, record, reclen); + present_rawrecord(&ts, record, reclen); present_tokens(&ts, record, reclen); } } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.h#3 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd.h#4 $ */ #define AUDITFILTERD_CONFFILE "/etc/security/audit_filter" @@ -53,11 +53,11 @@ /* * Fields provided by or extracted from the module. */ - void *am_instance; + void *am_cookie; audit_filter_attach_t am_attach; audit_filter_reinit_t am_reinit; audit_filter_record_t am_record; - audit_filter_bsmrecord_t am_bsmrecord; + audit_filter_rawrecord_t am_rawrecord; audit_filter_detach_t am_detach; /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#3 $ */ /* @@ -38,6 +38,12 @@ * Modules are in one of two states: attached, or detached. If attach fails, * detach is not called because it was not attached. If a module is attached * and a call to its reinit method fails, we will detach it. + * + * Modules are passed a (void *) reference to their configuration state so + * that they may pass this into any common APIs we provide which may rely on + * that state. Currently, the only such API is the cookie API, which allows + * per-instance state to be maintained by a module. In the future, this will + * also be used to support per-instance preselection state. */ #include @@ -105,8 +111,8 @@ { if (am->am_detach != NULL) - am->am_detach(am->am_instance); - am->am_instance = NULL; + am->am_detach(am); + am->am_cookie = NULL; (void)dlclose(am->am_dlhandle); am->am_dlhandle = NULL; } @@ -149,21 +155,22 @@ am->am_attach = dlsym(am->am_dlhandle, AUDIT_FILTER_ATTACH_STRING); am->am_reinit = dlsym(am->am_dlhandle, AUDIT_FILTER_REINIT_STRING); am->am_record = dlsym(am->am_dlhandle, AUDIT_FILTER_RECORD_STRING); - am->am_bsmrecord = dlsym(am->am_dlhandle, - AUDIT_FILTER_BSMRECORD_STRING); + am->am_rawrecord = dlsym(am->am_dlhandle, + AUDIT_FILTER_RAWRECORD_STRING); am->am_detach = dlsym(am->am_dlhandle, AUDIT_FILTER_DETACH_STRING); if (am->am_attach != NULL) { - if (am->am_attach(&am->am_instance, am->am_argc, am->am_argv) + if (am->am_attach(am, am->am_argc, am->am_argv) != AUDIT_FILTER_SUCCESS) { warnx("auditfilter_module_attach: %s: failed", am->am_modulename); dlclose(am->am_dlhandle); am->am_dlhandle = NULL; + am->am_cookie = NULL; am->am_attach = NULL; am->am_reinit = NULL; am->am_record = NULL; - am->am_bsmrecord = NULL; + am->am_rawrecord = NULL; am->am_detach = NULL; return (-1); } @@ -184,7 +191,7 @@ if (am->am_reinit == NULL) return (0); - if (am->am_reinit(&am->am_instance, am->am_argc, am->am_argv) != + if (am->am_reinit(am, am->am_argc, am->am_argv) != AUDIT_FILTER_SUCCESS) { warnx("auditfilter_module_reinit: %s: failed", am->am_modulename); @@ -483,3 +490,24 @@ auditfilter_module_list_detach(&filter_list); auditfilter_module_list_free(&filter_list); } + +/* + * APIs to allow modules to query and set their per-instance cookie. + */ +void +audit_filter_getcookie(void *instance, void **cookie) +{ + struct auditfilter_module *am; + + am = (struct auditfilter_module *)instance; + *cookie = am->am_cookie; +} + +void +audit_filter_setcookie(void *instance, void *cookie) +{ + struct auditfilter_module *am; + + am = (struct auditfilter_module *)instance; + am->am_cookie = cookie; +} ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_filter.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_filter.h#3 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_filter.h#4 $ */ #ifndef _BSM_AUDIT_FILTER_H_ @@ -38,22 +38,28 @@ * audit_filter_reinit_t - arguments to module have changed * audit_filter_record_t - present parsed record to filter module, with * receipt time - * audit_filter_bsmrecord_t - present bsm format record to filter module, + * audit_filter_rawrecord_t - present BSM format record to filter module, * with receipt time * audit_filter_destach_t - filter module is being detached * * There may be many instances of the same filter, identified by the instance * void pointer maintained by the filter instance. */ -typedef int (*audit_filter_attach_t)(void **instance, int argc, char *argv[]); +typedef int (*audit_filter_attach_t)(void *instance, int argc, char *argv[]); typedef int (*audit_filter_reinit_t)(void *instance, int argc, char *argv[]); typedef void (*audit_filter_record_t)(void *instance, struct timespec *ts, int token_count, const tokenstr_t tok[]); -typedef void (*audit_filter_bsmrecord_t)(void *instance, struct timespec *ts, +typedef void (*audit_filter_rawrecord_t)(void *instance, struct timespec *ts, void *data, u_int len); typedef void (*audit_filter_detach_t)(void *instance); /* + * APIs that may be called by audit filters. + */ +void audit_filter_getcookie(void *instance, void **cookie); +void audit_filter_setcookie(void *instance, void *cookie); + +/* * Values to be returned by audit_filter_init_t. */ #define AUDIT_FILTER_SUCCESS (0) @@ -66,12 +72,12 @@ #define AUDIT_FILTER_ATTACH audit_filter_attach #define AUDIT_FILTER_REINIT audit_filter_reinit #define AUDIT_FILTER_RECORD audit_filter_record -#define AUDIT_FILTER_BSMRECORD audit_filter_bsmrecord +#define AUDIT_FILTER_RAWRECORD audit_filter_rawrecord #define AUDIT_FILTER_DETACH audit_filter_detach #define AUDIT_FILTER_ATTACH_STRING "audit_filter_attach" #define AUDIT_FILTER_REINIT_STRING "audit_filter_reinit" #define AUDIT_FILTER_RECORD_STRING "audit_filter_record" -#define AUDIT_FILTER_BSMRECORD_STRING "audit_filter_bsmrecord" +#define AUDIT_FILTER_RAWRECORD_STRING "audit_filter_rawrecord" #define AUDIT_FILTER_DETACH_STRING "audit_filter_detach" #endif /* !_BSM_AUDIT_FILTER_H_ */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#9 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#9 $ */ #ifndef _AUDIT_INTERNAL_H @@ -68,15 +68,15 @@ typedef struct au_record au_record_t; -/* We could determined the header and trailer sizes by - * defining appropriate structures. We hold off that approach - * till we have a consistant way of using structures for all tokens. - * This is not straightforward since these token structures may - * contain pointers of whose contents we dont know the size - * (e.g text tokens) +/* + * We could determined the header and trailer sizes by defining appropriate + * structures. We hold off that approach until we have a consistant way of + * using structures for all tokens. This is not straightforward since these + * token structures may contain pointers of whose contents we dont know the + * size (e.g text tokens). */ -#define BSM_HEADER_SIZE 18 -#define BSM_TRAILER_SIZE 7 +#define AUDIT_HEADER_SIZE 18 +#define AUDIT_TRAILER_SIZE 7 /* * BSM token streams store fields in big endian byte order, so as to be ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#14 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#13 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#14 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -199,7 +199,7 @@ #define PAD_NOTATTR 0x4000 /* nonattributable event */ #define PAD_FAILURE 0x8000 /* fail audit event */ -#define BSM_MAX_GROUPS 16 +#define AUDIT_MAX_GROUPS 16 /* * A number of BSM versions are floating around and defined. Here are @@ -207,11 +207,11 @@ * Solaris BSM version, but has a separate version number in order to * identify a potentially different event identifier name space. */ -#define BSM_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ -#define BSM_HEADER_VERSION_SOLARIS 2 -#define BSM_HEADER_VERSION_TSOL25 3 -#define BSM_HEADER_VERSION_TSOL 4 -#define BSM_HEADER_VERSION_OPENBSM 10 +#define AUDIT_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ +#define AUDIT_HEADER_VERSION_SOLARIS 2 +#define AUDIT_HEADER_VERSION_TSOL25 3 +#define AUDIT_HEADER_VERSION_TSOL 4 +#define AUDIT_HEADER_VERSION_OPENBSM 10 /* * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#15 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#14 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#15 $ */ #ifndef _LIBBSM_H_ @@ -37,8 +37,8 @@ * solely to allow OpenSSH to compile; Darwin/Apple code should not use them. */ -#define BSM_MAX_ARGS 10 -#define BSM_MAX_ENV 10 +#define AUDIT_MAX_ARGS 10 +#define AUDIT_MAX_ENV 10 #include #include @@ -218,7 +218,7 @@ */ typedef struct { u_int32_t count; - char *text[BSM_MAX_ARGS]; + char *text[AUDIT_MAX_ARGS]; } au_execarg_t; /* @@ -227,7 +227,7 @@ */ typedef struct { u_int32_t count; - char *text[BSM_MAX_ENV]; + char *text[AUDIT_MAX_ENV]; } au_execenv_t; /* @@ -259,7 +259,7 @@ */ typedef struct { u_int16_t no; - u_int32_t list[BSM_MAX_GROUPS]; + u_int32_t list[AUDIT_MAX_GROUPS]; } au_groups_t; /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#9 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#26 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#27 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a8. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a9. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a8' -PACKAGE_STRING='OpenBSM 1.0a8' +PACKAGE_VERSION='1.0a9' +PACKAGE_STRING='OpenBSM 1.0a9' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a8 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a8:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a9:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a8 +OpenBSM configure 1.0a9 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a8, which was +It was created by OpenBSM $as_me 1.0a9, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a8 + VERSION=1.0a9 cat >>confdefs.h <<_ACEOF @@ -23478,7 +23478,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a8, which was +This file was extended by OpenBSM $as_me 1.0a9, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23541,7 +23541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a8 +OpenBSM config.status 1.0a9 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#10 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0a8], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#9 $]) +AC_INIT([OpenBSM], [1.0a9], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#10 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#12 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#13 $ */ #include @@ -54,14 +54,14 @@ static au_record_t *open_desc_table[MAX_AUDIT_RECORDS]; /* The current number of active record descriptors */ -static int bsm_rec_count = 0; +static int audit_rec_count = 0; /* * Records that can be recycled are maintained in the list given below. The * maximum number of elements that can be present in this list is bounded by * MAX_AUDIT_RECORDS. Memory allocated for these records are never freed. */ -static LIST_HEAD(, au_record) bsm_free_q; +static LIST_HEAD(, au_record) audit_free_q; static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; @@ -93,15 +93,15 @@ pthread_mutex_lock(&mutex); - if (bsm_rec_count == 0) - LIST_INIT(&bsm_free_q); + if (audit_rec_count == 0) + LIST_INIT(&audit_free_q); /* * Find an unused descriptor, remove it from the free list, mark as * used. */ - if (!LIST_EMPTY(&bsm_free_q)) { - rec = LIST_FIRST(&bsm_free_q); + if (!LIST_EMPTY(&audit_free_q)) { + rec = LIST_FIRST(&audit_free_q); rec->used = 1; LIST_REMOVE(rec, au_rec_q); } @@ -125,7 +125,7 @@ pthread_mutex_lock(&mutex); - if (bsm_rec_count == MAX_AUDIT_RECORDS) { + if (audit_rec_count == MAX_AUDIT_RECORDS) { pthread_mutex_unlock(&mutex); free(rec->data); free(rec); @@ -134,9 +134,9 @@ errno = ENOMEM; return (-1); } - rec->desc = bsm_rec_count; - open_desc_table[bsm_rec_count] = rec; - bsm_rec_count++; + rec->desc = audit_rec_count; + open_desc_table[audit_rec_count] = rec; + audit_rec_count++; pthread_mutex_unlock(&mutex); @@ -174,7 +174,7 @@ return (-1); /* Invalid descriptor */ } - if (rec->len + tok->len + BSM_TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) { + if (rec->len + tok->len + AUDIT_TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) { errno = ENOMEM; return (-1); } @@ -208,7 +208,7 @@ u_char *dptr; int error; - tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; + tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; header = au_to_header32(tot_rec_size, event, 0); if (header == NULL) return (-1); @@ -257,7 +257,7 @@ pthread_mutex_lock(&mutex); /* Add the record to the freelist tail */ - LIST_INSERT_HEAD(&bsm_free_q, rec, au_rec_q); + LIST_INSERT_HEAD(&audit_free_q, rec, au_rec_q); pthread_mutex_unlock(&mutex); } @@ -285,7 +285,7 @@ goto cleanup; } - tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; + tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; if (tot_rec_size > MAX_AUDIT_RECORD_SIZE) { /* @@ -335,7 +335,7 @@ } retval = 0; - tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; + tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; if ((tot_rec_size > MAX_AUDIT_RECORD_SIZE) || (tot_rec_size > *buflen)) { /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#17 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#16 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#17 $ */ #include @@ -2448,7 +2448,7 @@ int err = 0; int recoversize; - recoversize = len - (tok->len + BSM_TRAILER_SIZE); + recoversize = len - (tok->len + AUDIT_TRAILER_SIZE); if (recoversize <= 0) return (-1); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#20 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#19 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#20 $ */ #include @@ -309,7 +309,7 @@ au_to_groups(int *groups) { - return (au_to_newgroups(BSM_MAX_GROUPS, groups)); + return (au_to_newgroups(AUDIT_MAX_GROUPS, groups)); } /* @@ -1155,7 +1155,7 @@ ADD_U_CHAR(dptr, AUT_HEADER32); ADD_U_INT32(dptr, rec_size); - ADD_U_CHAR(dptr, BSM_HEADER_VERSION_OPENBSM); + ADD_U_CHAR(dptr, AUDIT_HEADER_VERSION_OPENBSM); ADD_U_INT16(dptr, e_type); ADD_U_INT16(dptr, e_mod); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#9 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2005-2006 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#8 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#9 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 @@ -91,10 +91,14 @@ token is used to mark the beginning of a complete audit record, and includes the length of the total record in bytes, a version number for the record layout, the event type and subtype, and the time at which the event occurred. -A +A 32-bit +.Dv header +token can be created using +.Xr au_to_header32 3 ; +a 64-bit .Dv header token can be created using -.Xr au_to_header32 3 . +.Xr au_to_header64 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" @@ -111,11 +115,14 @@ token is an expanded version of the .Dv header token, with the addition of a machine IPv4 or IPv6 address. -The -.Xr libbsm 3 -API cannot currently create an -.Dv expanded header -token. +A 32-bit extended +.Dv header +token can be created using +.Xr au_to_header32_ex 3 ; +a 64-bit extended +.Dv header +token can be created using +.Xr au_to_header64_ex 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" @@ -154,11 +161,10 @@ .Dv How to print field is present to specify how to print the data, but interpretation of that field is not currently defined. -The -.Xr libbsm 3 -API cannot currently create an +An .Dv arbitrary data -token. +token can be created using +.Xr au_to_data 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#3 $ */ /* @@ -39,7 +39,7 @@ #include int -AUDIT_FILTER_ATTACH(void **instance, int argc, char *argv[]) +AUDIT_FILTER_ATTACH(void *instance, int argc, char *argv[]) { return (0); @@ -60,7 +60,7 @@ } void -AUDIT_FILTER_BSMRECORD(void *instance, struct timespec *ts, u_char *data, +AUDIT_FILTER_RAWRECORD(void *instance, struct timespec *ts, u_char *data, u_int len) { From owner-trustedbsd-cvs@FreeBSD.ORG Thu Aug 24 11:12:40 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6458016A4E0 for ; Thu, 24 Aug 2006 11:12:40 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53E2743D58 for ; Thu, 24 Aug 2006 11:12:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 4D7E346B11 for ; Thu, 24 Aug 2006 07:11:44 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 36D1D14CA74; Thu, 24 Aug 2006 11:09:02 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 68EAC16A4EA; Thu, 24 Aug 2006 11:08:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1322B16A4E7 for ; Thu, 24 Aug 2006 11:08:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCC8043D49 for ; Thu, 24 Aug 2006 11:08: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.6/8.13.6) with ESMTP id k7OB8qsB062522 for ; Thu, 24 Aug 2006 11:08:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7OB8qKY062519 for perforce@freebsd.org; Thu, 24 Aug 2006 11:08:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Aug 2006 11:08:52 GMT Message-Id: <200608241108.k7OB8qKY062519@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 104914 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Aug 2006 11:12:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=104914 Change 104914 by rwatson@rwatson_sesame on 2006/08/24 11:08:46 Merge OpenBSM 1.0a9 changes from contrib/openbsm to the kernel in the TrustedBSD audit3 branch. More merge work likely required. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#23 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#10 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 $ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.2 2006/03/04 16:54:21 rwatson Exp $ */ @@ -69,15 +69,15 @@ typedef struct au_record au_record_t; -/* We could determined the header and trailer sizes by - * defining appropriate structures. We hold off that approach - * till we have a consistant way of using structures for all tokens. - * This is not straightforward since these token structures may - * contain pointers of whose contents we dont know the size - * (e.g text tokens) +/* + * We could determined the header and trailer sizes by defining appropriate + * structures. We hold off that approach until we have a consistant way of + * using structures for all tokens. This is not straightforward since these + * token structures may contain pointers of whose contents we dont know the + * size (e.g text tokens). */ -#define BSM_HEADER_SIZE 18 -#define BSM_TRAILER_SIZE 7 +#define AUDIT_HEADER_SIZE 18 +#define AUDIT_TRAILER_SIZE 7 /* * BSM token streams store fields in big endian byte order, so as to be ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#18 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 $ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.3 2006/07/03 14:44:13 rwatson Exp $ */ @@ -200,7 +200,7 @@ #define PAD_NOTATTR 0x4000 /* nonattributable event */ #define PAD_FAILURE 0x8000 /* fail audit event */ -#define BSM_MAX_GROUPS 16 +#define AUDIT_MAX_GROUPS 16 /* * A number of BSM versions are floating around and defined. Here are @@ -208,11 +208,11 @@ * Solaris BSM version, but has a separate version number in order to * identify a potentially different event identifier name space. */ -#define BSM_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ -#define BSM_HEADER_VERSION_SOLARIS 2 -#define BSM_HEADER_VERSION_TSOL25 3 -#define BSM_HEADER_VERSION_TSOL 4 -#define BSM_HEADER_VERSION_OPENBSM 10 +#define AUDIT_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ +#define AUDIT_HEADER_VERSION_SOLARIS 2 +#define AUDIT_HEADER_VERSION_TSOL25 3 +#define AUDIT_HEADER_VERSION_TSOL 4 +#define AUDIT_HEADER_VERSION_OPENBSM 10 /* * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#23 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#22 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#23 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.4 2006/06/17 13:53:04 wsalamon Exp $ */ @@ -270,7 +270,7 @@ au_to_groups(int *groups) { - return (au_to_newgroups(BSM_MAX_GROUPS, groups)); + return (au_to_newgroups(AUDIT_MAX_GROUPS, groups)); } /* @@ -1166,7 +1166,7 @@ ADD_U_CHAR(dptr, AUT_HEADER32); ADD_U_INT32(dptr, rec_size); - ADD_U_CHAR(dptr, BSM_HEADER_VERSION_OPENBSM); + ADD_U_CHAR(dptr, AUDIT_HEADER_VERSION_OPENBSM); ADD_U_INT16(dptr, e_type); ADD_U_INT16(dptr, e_mod); From owner-trustedbsd-cvs@FreeBSD.ORG Thu Aug 24 12:22:23 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D03CE16A4DF for ; Thu, 24 Aug 2006 12:22:23 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04EED43D6B for ; Thu, 24 Aug 2006 12:22:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 2772A46D86 for ; Thu, 24 Aug 2006 08:22:13 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3E12A5891C; Thu, 24 Aug 2006 12:20:32 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 35ACC16A4E1; Thu, 24 Aug 2006 12:20:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 114A816A4DA for ; Thu, 24 Aug 2006 12:20:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 781CD43D70 for ; Thu, 24 Aug 2006 12:20: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.6/8.13.6) with ESMTP id k7OCKQq8068157 for ; Thu, 24 Aug 2006 12:20:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7OCKNWD068154 for perforce@freebsd.org; Thu, 24 Aug 2006 12:20:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Aug 2006 12:20:23 GMT Message-Id: <200608241220.k7OCKNWD068154@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 104919 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Aug 2006 12:22:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=104919 Change 104919 by rwatson@rwatson_sesame on 2006/08/24 12:19:53 Integrate ipfilter todo from TrustedBSD base into TrustedBSD audit3, missed in previous integration. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/todo#3 branch Differences ... From owner-trustedbsd-cvs@FreeBSD.ORG Thu Aug 24 15:04:30 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D5DF16A4E5 for ; Thu, 24 Aug 2006 15:04:30 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FD0743D4C for ; Thu, 24 Aug 2006 15:04:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5973B46D1F for ; Thu, 24 Aug 2006 11:04:25 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id F132B55F44; Thu, 24 Aug 2006 15:04:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id E8C6116A4E6; Thu, 24 Aug 2006 15:04:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFC1016A4DE for ; Thu, 24 Aug 2006 15:04:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54D3243D49 for ; Thu, 24 Aug 2006 15:04:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7OF4MNn092458 for ; Thu, 24 Aug 2006 15:04:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7OF4IYT092398 for perforce@freebsd.org; Thu, 24 Aug 2006 15:04:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Aug 2006 15:04:18 GMT Message-Id: <200608241504.k7OF4IYT092398@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 104941 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Aug 2006 15:04:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=104941 Change 104941 by rwatson@rwatson_zoo on 2006/08/24 15:03:26 Integrate TrustedBSD base from FreeBSD CVS HEAD: - IPFIREWALL_FORWARD_EXTENDED now default. - less(1) update - sendmail(8) update - fsdb(8) btime - linuxulator 2.6 support - __getpath_fromfd(), __getpath_fromaddr(). - if_sppp security fix Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#76 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#12 integrate .. //depot/projects/trustedbsd/base/UPDATING#69 integrate .. //depot/projects/trustedbsd/base/bin/date/netdate.c#9 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#23 integrate .. //depot/projects/trustedbsd/base/bin/ed/main.c#8 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#24 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/fbsd.mh#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/fbsd.mt#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/ppcfbsd-nat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/ppcfbsd-tdep.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/ppcfbsd-tdep.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/rs6000-nat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/rs6000-tdep.c#1 branch .. //depot/projects/trustedbsd/base/contrib/less/LICENSE#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/Makefile.aut#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/NEWS#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/brac.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/ch.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/charset.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/charset.h#1 branch .. //depot/projects/trustedbsd/base/contrib/less/cmd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/cmdbuf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/command.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/configure.ac#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/decode.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.ds#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.h.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.o2#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.o9#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.wn#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/edit.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/filename.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/forwback.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/funcs.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/ifile.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/input.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/jump.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.man#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.nro#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/lessecho.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/lessecho.man#1 branch .. //depot/projects/trustedbsd/base/contrib/less/lessecho.nro#1 branch .. //depot/projects/trustedbsd/base/contrib/less/lesskey.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.man#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.nro#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/lglob.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/line.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/less/linenum.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/lsystem.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/main.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/mark.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/mkhelp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/optfunc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/option.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/option.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/opttbl.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/os.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/output.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/pckeys.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/position.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/position.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/prompt.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/screen.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/scrsize.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/search.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/signal.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/tags.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/ttyin.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/version.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/pnpinfo/pnpinfo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#21 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#18 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#18 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/cidrexpand#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#18 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#18 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#18 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#58 integrate .. //depot/projects/trustedbsd/base/etc/network.subr#13 integrate .. //depot/projects/trustedbsd/base/etc/pccard_ether#15 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#41 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dhclient#15 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ramdisk#5 delete .. //depot/projects/trustedbsd/base/etc/rc.d/ramdisk-own#5 delete .. //depot/projects/trustedbsd/base/etc/rc.d/sshd#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ypxfrd#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.initdiskless#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#29 integrate .. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.mc#12 integrate .. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.submit.mc#4 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libsupc++/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#17 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/alpha/Makefile#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/alpha/config.h#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/alpha/init.c#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/powerpc/Makefile#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/powerpc/config.h#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/powerpc/init.c#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#4 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#5 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#44 integrate .. //depot/projects/trustedbsd/base/lib/csu/alpha/Makefile#6 delete .. //depot/projects/trustedbsd/base/lib/csu/alpha/crt1.c#7 delete .. //depot/projects/trustedbsd/base/lib/csu/alpha/crti.S#3 delete .. //depot/projects/trustedbsd/base/lib/csu/alpha/crtn.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/Makefile#24 integrate .. //depot/projects/trustedbsd/base/lib/libc/alpha/Makefile.inc#5 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/SYS.h#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/Symbol.map#2 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/_fpmath.h#5 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/arith.h#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/Makefile.inc#9 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/_ctx_start.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/_set_tp.c#2 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/_setjmp.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/divrem.m4#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/fabs.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/flt_rounds.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/fpgetmask.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/fpgetround.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/fpgetsticky.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/fpsetmask.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/fpsetround.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/infinity.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/makecontext.c#5 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/modf.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/rfork_thread.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/setjmp.S#5 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/signalcontext.c#2 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/sigsetjmp.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/net/byte_swap_2.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/net/byte_swap_4.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/net/htonl.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/net/htons.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/net/ntohl.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/net/ntohs.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/stdlib/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/string/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/string/bcopy.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/string/bzero.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/string/ffs.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/string/memcpy.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/string/memmove.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/sys/Makefile.inc#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/sys/Ovfork.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/sys/brk.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/sys/cerror.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/sys/exect.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/sys/fork.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/sys/pipe.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/sys/ptrace.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/sys/sbrk.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/sys/setlogin.S#4 delete .. //depot/projects/trustedbsd/base/lib/libc/alpha/sys/sigreturn.S#3 delete .. //depot/projects/trustedbsd/base/lib/libc/arm/net/htonl.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/net/htons.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/net/ntohl.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/net/ntohs.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/findfp.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/Makefile#11 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/arch/alpha/_atomic_lock.S#3 delete .. //depot/projects/trustedbsd/base/lib/libdisk/write_alpha_disk.c#9 delete .. //depot/projects/trustedbsd/base/lib/libio/Makefile#5 delete .. //depot/projects/trustedbsd/base/lib/libio/alpha_sethae.c#3 delete .. //depot/projects/trustedbsd/base/lib/libio/bwx.c#2 delete .. //depot/projects/trustedbsd/base/lib/libio/io.c#2 delete .. //depot/projects/trustedbsd/base/lib/libio/io.h#2 delete .. //depot/projects/trustedbsd/base/lib/libio/swiz.c#2 delete .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_alpha.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#16 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/alpha/Makefile.inc#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/alpha/alpha/context.S#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/alpha/alpha/enter_uts.S#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/alpha/alpha/pthread_md.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/alpha/include/atomic_ops.h#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/alpha/include/pthread_md.h#5 delete .. //depot/projects/trustedbsd/base/lib/libstand/Makefile#18 integrate .. //depot/projects/trustedbsd/base/lib/libstand/alpha/_setjmp.S#2 delete .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#15 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/alpha/Makefile.inc#3 delete .. //depot/projects/trustedbsd/base/lib/libthr/arch/alpha/alpha/pthread_md.c#2 delete .. //depot/projects/trustedbsd/base/lib/libthr/arch/alpha/include/pthread_md.h#2 delete .. //depot/projects/trustedbsd/base/lib/libthread_db/arch/alpha/libc_r_md.c#2 delete .. //depot/projects/trustedbsd/base/lib/libthread_db/arch/alpha/libpthread_md.c#2 delete .. //depot/projects/trustedbsd/base/lib/libutil/login.conf.5#13 integrate .. //depot/projects/trustedbsd/base/lib/msun/alpha/Makefile.inc#3 delete .. //depot/projects/trustedbsd/base/lib/msun/alpha/Symbol.map#2 delete .. //depot/projects/trustedbsd/base/lib/msun/alpha/fenv.c#3 delete .. //depot/projects/trustedbsd/base/lib/msun/alpha/fenv.h#4 delete .. //depot/projects/trustedbsd/base/lib/msun/alpha/s_copysign.S#2 delete .. //depot/projects/trustedbsd/base/lib/msun/alpha/s_copysignf.S#2 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/alpha/Makefile.inc#3 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/alpha/ld.so.script#3 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/alpha/reloc.c#9 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/alpha/rtld_machdep.h#6 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/alpha/rtld_start.S#4 delete .. //depot/projects/trustedbsd/base/release/Makefile#77 integrate .. //depot/projects/trustedbsd/base/release/alpha/boot_crunch.conf#8 delete .. //depot/projects/trustedbsd/base/release/alpha/mkisoimages.sh#5 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#106 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#19 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.8#11 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.c#15 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/dump/dump.8#27 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.8#11 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdbutil.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifmedia.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/libipf/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#48 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#42 integrate .. //depot/projects/trustedbsd/base/sbin/ping/Makefile#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile.inc#16 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/opensslconf-alpha.h#3 delete .. //depot/projects/trustedbsd/base/share/examples/drivers/make_pseudo_driver.sh#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/amdsmb.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ixgb.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nfsmb.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uplcom.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#61 integrate .. //depot/projects/trustedbsd/base/share/man/man8/rc.subr.8#11 integrate .. //depot/projects/trustedbsd/base/share/man/man9/lock.9#9 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#25 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.endian.mk#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/support.S#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0iic/doit.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0spi/doit.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/arm_init.s#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/common/help.common#16 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/loader.8#33 integrate .. //depot/projects/trustedbsd/base/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#33 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.c#19 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32.h#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_emul.h#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#44 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_signal.c#15 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/ntoskrnl_var.h#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#75 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#55 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#74 integrate .. //depot/projects/trustedbsd/base/sys/dev/arl/if_arlreg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#57 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#55 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/if_ic.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/iicbb.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ips/ips.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_ioctl.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#21 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/denode.h#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_raid5.h#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux.h#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#59 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#79 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#14 integrate .. //depot/projects/trustedbsd/base/sys/net/if_spppsubr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fastfwd.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw.h#26 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#50 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#50 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#47 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_crypt.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_iod.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_rq.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_rq.h#5 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_lock.c#21 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_amd64.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/nfsmb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#32 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#41 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#48 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#62 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#65 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageq.c#20 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_zeroidle.c#18 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/msun/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#50 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#51 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/alpha.h#3 delete .. //depot/projects/trustedbsd/base/usr.bin/gprof/gprof.h#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/less/defines.h#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/lessecho/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/locate/locate/locate.1#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/pkill/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/alpha-fbsd.c#10 delete .. //depot/projects/trustedbsd/base/usr.bin/uac/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.bin/uac/uac.1#4 delete .. //depot/projects/trustedbsd/base/usr.bin/uac/uac.c#4 delete .. //depot/projects/trustedbsd/base/usr.bin/xlint/arch/alpha/targparam.h#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#54 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.8#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#29 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pnpinfo/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.lockd/kern.c#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.lockd/lockd.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/devices.c#24 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/install.c#33 integrate .. //depot/projects/trustedbsd/base/usr.sbin/traceroute/Makefile#5 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#76 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.553 2006/08/22 07:51:05 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -926,9 +926,6 @@ .if ${MK_RESCUE} != "no" || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif -.if ${TARGET_ARCH} == "alpha" -_elf2exe= usr.sbin/elf2exe -.endif .if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR) _kgzip= usr.sbin/kgzip .endif @@ -941,7 +938,6 @@ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ - ${_elf2exe} \ ${_kgzip} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.49 2006/08/22 11:12:09 flz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20060822: ramdisk{,-own} have been replaced by mdconfig{,2} +OLD_FILES+=etc/rc.d/ramdisk +OLD_FILES+=etc/rc.d/ramdisk-own # 20060704: KAME compat file net_osdep.h removed OLD_FILES+=usr/include/net/net_osdep.h # 20060517: pcvt removed @@ -334,7 +337,7 @@ OLD_FILES+=usr/share/man/man1/sgsc.1.gz OLD_FILES+=usr/share/man/man4/i386/stl.4.gz OLD_FILES+=usr/share/man/man8/raidctl.8.gz -.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64" +.if ${TARGET_ARCH} != "sparc64" # 20040130: libkse renamed to libpthread OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse.so @@ -3066,7 +3069,7 @@ OLD_LIBS+=usr/lib/libisc.so.1 # 200408XX OLD_LIBS+=usr/lib/snmp_netgraph.so.1 -.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64" +.if ${TARGET_ARCH} != "sparc64" # 20040130: libkse renamed to libpthread OLD_LIBS+=usr/lib/libkse.so.1 .endif ==== //depot/projects/trustedbsd/base/UPDATING#69 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20060816: + The IPFIREWALL_FORWARD_EXTENDED option is gone and the behaviour + for IP_FIREWALL_FORWARD is now as it was before when it was first + committed and for years after. The behaviour is now ON. + 20060725: enigma(1)/crypt(1) utility has been changed on 64 bit architectures. Now it can decrypt files created from different architectures. @@ -598,4 +603,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.452 2006/07/26 16:31:10 jkim Exp $ +$FreeBSD: src/UPDATING,v 1.453 2006/08/17 00:41:05 julian Exp $ ==== //depot/projects/trustedbsd/base/bin/date/netdate.c#9 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.18 2004/04/06 20:06:45 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.19 2006/08/20 06:31:24 imp Exp $"); #include #include @@ -108,14 +108,14 @@ warnx("all ports in use"); goto bad; } + memset(&msg, 0, sizeof(msg)); msg.tsp_type = TSP_SETDATE; msg.tsp_vers = TSPVERSION; if (gethostname(hostname, sizeof(hostname))) { warn("gethostname"); goto bad; } - (void)strncpy(msg.tsp_name, hostname, sizeof(msg.tsp_name) - 1); - msg.tsp_name[sizeof(msg.tsp_name) - 1] = '\0'; + (void)strlcpy(msg.tsp_name, hostname, sizeof(msg.tsp_name)); msg.tsp_seq = htons((u_short)0); msg.tsp_time.tv_sec = htonl((u_long)tval); msg.tsp_time.tv_usec = htonl((u_long)0); ==== //depot/projects/trustedbsd/base/bin/df/df.c#23 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.64 2005/01/10 08:39:21 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.65 2006/08/20 06:32:40 imp Exp $"); #include #include @@ -113,7 +113,7 @@ memset(&totalbuf, 0, sizeof(totalbuf)); totalbuf.f_bsize = DEV_BSIZE; - strncpy(totalbuf.f_mntfromname, "total", MNAMELEN); + strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN); vfslist = NULL; while ((ch = getopt(argc, argv, "abcgHhiklmnPt:")) != -1) switch (ch) { @@ -552,7 +552,7 @@ *str = 'n'; *(str + 1) = 'o'; for (i = 0, strptr = str + 2; i < cnt; i++, strptr++) { - strncpy(strptr, listptr[i], 32); + strlcpy(strptr, listptr[i], 32); strptr += strlen(listptr[i]); *strptr = ','; free(listptr[i]); ==== //depot/projects/trustedbsd/base/bin/ed/main.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.28 2005/02/09 17:37:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.29 2006/08/17 23:00:33 imp Exp $"); /* * CREDITS @@ -292,7 +292,7 @@ errmsg = "invalid address"; \ return ERR; \ } \ -} while (0); +} while (0) /* next_addr: return the next line address in the command buffer */ long ==== //depot/projects/trustedbsd/base/bin/ps/ps.1#24 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.86 2005/04/29 11:10:27 maxim Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.88 2006/08/21 03:09:12 yar Exp $ .\" -.Dd March 20, 2005 +.Dd August 21, 2006 .Dt PS 1 .Os .Sh NAME @@ -179,14 +179,16 @@ .It Fl o Display information associated with the space or comma separated list of keywords specified. +The last keyword in the list may be appended with an equals +.Pq Ql = +sign and a string that spans the rest of the argument and can contain +space and comma characters. +This causes the printed header to use the specified string instead of +the standard header. Multiple keywords may also be given in the form of more than one .Fl o option. -Keywords may be appended with an equals -.Pq Ql = -sign and a string. -This causes the printed header to use the specified string instead of -the standard header. +So the header texts for multiple keywords can be changed. If all keywords have empty header texts, no header line is written. .It Fl p Display information about processes which match the specified process IDs. ==== //depot/projects/trustedbsd/base/contrib/gdb/FREEBSD-Xlist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.6 2004/06/20 19:15:58 marcel Exp $ +$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.7 2006/08/23 03:30:33 marcel Exp $ gdb-6.1.1/bfd/* gdb-6.1.1/config/* gdb-6.1.1/etc/* @@ -16,7 +16,6 @@ gdb-6.1.1/gdb/config/mn10300/* gdb-6.1.1/gdb/config/ns32k/* gdb-6.1.1/gdb/config/pa/* -gdb-6.1.1/gdb/config/rs6000/* gdb-6.1.1/gdb/config/sh/* gdb-6.1.1/gdb/config/v850/* gdb-6.1.1/gdb/config/vax/* @@ -34,7 +33,6 @@ gdb-6.1.1/gdb/osf-share/* gdb-6.1.1/gdb/hppa* gdb-6.1.1/gdb/rdi-share/* -gdb-6.1.1/gdb/rs6000* gdb-6.1.1/gdb/sh* gdb-6.1.1/gdb/testsuite/* gdb-6.1.1/gdb/v850* ==== //depot/projects/trustedbsd/base/contrib/less/LICENSE#4 (text+ko) ==== @@ -2,7 +2,7 @@ ------------ Less -Copyright (C) 1984-2002 Mark Nudelman +Copyright (C) 1984-2005 Mark Nudelman Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/trustedbsd/base/contrib/less/Makefile.aut#5 (text+ko) ==== @@ -24,9 +24,10 @@ ${SRC} regexp.c regexp.h \ COPYING INSTALL LICENSE Makefile.in Makefile.aut NEWS README \ configure configure.ac lesskey.c lessecho.c scrsize.c \ - cmd.h funcs.h lglob.h less.h lesskey.h option.h pckeys.h position.h \ + charset.h cmd.h funcs.h lglob.h less.h lesskey.h option.h pckeys.h position.h \ install.sh defines.h.in mkinstalldirs \ - less.nro lesskey.nro less.man lesskey.man less.hlp \ + less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man \ + less.hlp \ mkfuncs.awk mkhelp.c \ ${DISTFILES_W} @@ -55,7 +56,8 @@ clean: rm -f Makefile config.status config.log config.cache defines.h stamp-h \ - README NEWS less.nro lesskey.nro less.man lesskey.man + README NEWS \ + less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man distclean: clean realclean: clean @@ -78,6 +80,8 @@ ${REPLACE_VERSION} ${srcdir}/less.nro.VER ${srcdir}/lesskey.nro: ${srcdir}/lesskey.nro.VER ${srcdir}/version.c ${REPLACE_VERSION} ${srcdir}/lesskey.nro.VER +${srcdir}/lessecho.nro: ${srcdir}/lessecho.nro.VER ${srcdir}/version.c + ${REPLACE_VERSION} ${srcdir}/lessecho.nro.VER ${srcdir}/less.hlp: ${srcdir}/less.hlp.VER ${srcdir}/version.c ${REPLACE_VERSION} ${srcdir}/less.hlp.VER @@ -85,6 +89,8 @@ ${NROFF} ${srcdir}/less.nro >${srcdir}/less.man ${srcdir}/lesskey.man: ${srcdir}/lesskey.nro ${NROFF} ${srcdir}/lesskey.nro >${srcdir}/lesskey.man +${srcdir}/lessecho.man: ${srcdir}/lessecho.nro + ${NROFF} ${srcdir}/lessecho.nro >${srcdir}/lessecho.man distfiles: ${DISTFILES} ==== //depot/projects/trustedbsd/base/contrib/less/Makefile.in#5 (text+ko) ==== @@ -59,12 +59,13 @@ ${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h -install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro installdirs +install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro ${srcdir}/lessecho.nro installdirs ${INSTALL_PROGRAM} less ${bindir}/${binprefix}less ${INSTALL_PROGRAM} lesskey ${bindir}/${binprefix}lesskey ${INSTALL_PROGRAM} lessecho ${bindir}/${binprefix}lessecho ${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/man${manext}/${manprefix}less.${manext} ${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/man${manext}/${manprefix}lesskey.${manext} + ${INSTALL_DATA} ${srcdir}/lessecho.nro ${mandir}/man${manext}/${manprefix}lessecho.${manext} install-strip: ${MAKE} INSTALL_PROGRAM='${INSTALL_PROGRAM} -s' install ==== //depot/projects/trustedbsd/base/contrib/less/Makefile.wnb#2 (text+ko) ==== @@ -1,20 +1,27 @@ # Makefile for less. # Windows version +# Bolarnd C++ 5.5.1 free command line tools #### Start of system configuration section. #### +# +# Borland's make knows its own location in the +# filesystem. +# CC = bcc32 -LIBDIR = d:\bc45\lib +LIBDIR = $(MAKEDIR)\..\lib CFLAGS = -O2 -w-pro -TWC -P-c -v- -d -f- -ff- -vi -LDFLAGS = /Tpe /v- /ap /c /x -LD = tlink32 +LDFLAGS = -Tpe -v- -ap -c -x -V4.0 -GF:AGGRESSIVE +LD = ilink32 LIBS = ${LIBDIR}\import32.lib ${LIBDIR}\cw32.lib #### End of system configuration section. #### +# # This rule allows us to supply the necessary -D options # in addition to whatever the user asks for. +# .c.obj: ${CC} -c -I. ${CPPFLAGS} ${CFLAGS} $< @@ -25,16 +32,20 @@ position.obj prompt.obj search.obj signal.obj tags.obj \ ttyin.obj version.obj regexp.obj -all: less lesskey +all: less lesskey lessecho +# # This is really horrible, but the command line is too long for # MS-DOS if we try to link ${OBJ}. +# less: ${OBJ} - -del lesskey.obj - ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj *.obj, $@,,${LIBS} + ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj $**, $@,,${LIBS} lesskey: lesskey.obj version.obj - ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj lesskey.obj version.obj, $@,,${LIBS} + ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj $**, $@,,${LIBS} + +lessecho: lessecho.obj version.obj + ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj $**, $@,,${LIBS} defines.h: defines.wn -del defines.h @@ -44,6 +55,16 @@ clean: -del *.obj + -del *.il? + -del *.tds + -del defines.h + +spotless: clean -del less.exe -del lesskey.exe + -del lessecho.exe + +realclean: spotless + +distclean: spotless ==== //depot/projects/trustedbsd/base/contrib/less/NEWS#5 (text+ko) ==== @@ -7,11 +7,66 @@ http://www.greenwoodsoftware.com/less You can also download the latest version of less from there. - To report bugs, suggestions or comments, send email to - bug-less@gnu.org or markn@greenwoodsoftware.com. + To report bugs, suggestions or comments, send email to bug-less@gnu.org. + +====================================================================== + + + Major changes between "less" versions 382 and 394 + +* Add history file to save search and shell command history between + invocations of less. + +* Improve behavior of history list for search and shell commands. + +* Add -K (or --quit-on-intr) option to make less exit immediately on ctrl-C. + +* Improve handling of UTF-8 files and commands, including better + line wrapping and handling double-width chars. + +* Added LESSUTFBINFMT environment variable to control display of + non-printable characters in a UTF-8 file. + +* Add --with-secure option to configure, to make it easier to + build a secure version of less. + +* Show search matches in the status column even if search highlights + are disabled via the -G option or the ESC-u command. + +* Improve performance when the file contains very long lines. + +* Add "windows" charset. + +* Add man page for lessecho. + +* Add support for erase2 character, treated same as erase. + +* Use ASCII lowercase/uppercase logic when operating on the command line. + +* Update makefile for Borland C++ 5.5.1. + +* Fix bug in calculating number of pages for %D prompt. + +* Fix bug in handling tag file error. + +* Fix obscure bug if input file is deleted while viewing help. + +* Fix bug handling filenames which include square brackets. + +* Fix possible buffer overflow in "global" tag search. + +* Fix possible buffer overflow in usage of LESSOPEN and LESSCLOSE. + +* Fix buffer overflow in reverse search. ====================================================================== + Major changes between "less" versions 381 and 382 + +* Removed some old copyrighted code. + This probably breaks OS/9 support. + +====================================================================== Major changes between "less" versions 378 and 381 ==== //depot/projects/trustedbsd/base/contrib/less/README#5 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 381 + Less, version 394 - This is the distribution of less, version 381, released 17 Jan 2003. + This is the distribution of less, version 394, released 03 Dec 2005. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or @@ -57,6 +57,10 @@ regcomp Use the V8-compatible regcomp. regcomp-local Use Henry Spencer's V8-compatible regcomp (source is supplied with less). + --with-secure + Builds a "secure" version of less, with some features disabled + to prevent users from viewing other files, accessing shell + commands, etc. 3. It is a good idea to look over the generated Makefile and defines.h and make sure they look ok. If you know of any peculiarities of @@ -67,9 +71,6 @@ -lncurses -lcurses -ltermcap -ltermlib If you wish, you may edit defines.h to remove some optional features. - If you wish to build a "secure" version of less (which disables all - features which might allow a user to do unintended things to the system - on which less is running), edit defines.h and define SECURE to 1. If you choose not to include some features in your version, you may wish to edit the manual page "less.nro" and the help page "less.hlp" to remove the descriptions of the features which you are removing. ==== //depot/projects/trustedbsd/base/contrib/less/brac.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2002 Mark Nudelman + * Copyright (C) 1984-2004 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/trustedbsd/base/contrib/less/ch.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2002 Mark Nudelman + * Copyright (C) 1984-2004 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/trustedbsd/base/contrib/less/charset.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2002 Mark Nudelman + * Copyright (C) 1984-2005 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -18,8 +18,11 @@ #if HAVE_LOCALE #include #include +#include #endif +#include "charset.h" + public int utf_mode = 0; /* @@ -31,23 +34,76 @@ int *p_flag; char *desc; } charsets[] = { - { "ascii", NULL, "8bcccbcc18b95.b" }, - { "dos", NULL, "8bcccbcc12bc5b223.b" }, - { "ebcdic", NULL, "5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b." }, - { "IBM-1047", NULL, "4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc191.b" }, - { "iso8859", NULL, "8bcccbcc18b95.33b." }, - { "koi8-r", NULL, "8bcccbcc18b95.b128." }, - { "next", NULL, "8bcccbcc18b95.bb125.bb" }, - { "utf-8", &utf_mode, "8bcccbcc18b." }, + { "ascii", NULL, "8bcccbcc18b95.b" }, + { "utf-8", &utf_mode, "8bcccbcc18b95.b126.bb" }, + { "iso8859", NULL, "8bcccbcc18b95.33b." }, + { "latin3", NULL, "8bcccbcc18b95.33b5.b8.b15.b4.b12.b18.b12.b." }, + { "arabic", NULL, "8bcccbcc18b95.33b.3b.7b2.13b.3b.b26.5b19.b" }, + { "greek", NULL, "8bcccbcc18b95.33b4.2b4.b3.b35.b44.b" }, + { "greek2005", NULL, "8bcccbcc18b95.33b14.b35.b44.b" }, + { "hebrew", NULL, "8bcccbcc18b95.33b.b29.32b28.2b2.b" }, + { "koi8-r", NULL, "8bcccbcc18b95.b." }, + { "KOI8-T", NULL, "8bcccbcc18b95.b8.b6.b8.b.b.5b7.3b4.b4.b3.b.b.3b." }, + { "georgianps", NULL, "8bcccbcc18b95.3b11.4b12.2b." }, + { "tcvn", NULL, "b..b...bcccbccbbb7.8b95.b48.5b." }, + { "TIS-620", NULL, "8bcccbcc18b95.b.4b.11b7.8b." }, + { "next", NULL, "8bcccbcc18b95.bb125.bb" }, + { "dos", NULL, "8bcccbcc12bc5b95.b." }, + { "windows-1251", NULL, "8bcccbcc12bc5b95.b24.b." }, + { "windows-1252", NULL, "8bcccbcc12bc5b95.b.b11.b.2b12.b." }, + { "windows-1255", NULL, "8bcccbcc12bc5b95.b.b8.b.5b9.b.4b." }, + { "ebcdic", NULL, "5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b." }, + { "IBM-1047", NULL, "4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc191.b" }, { NULL, NULL, NULL } }; +/* + * Support "locale charmap"/nl_langinfo(CODESET) values, as well as others. + */ struct cs_alias { char *name; char *oname; } cs_aliases[] = { - { "latin1", "iso8859" }, - { "latin9", "iso8859" }, + { "UTF-8", "utf-8" }, + { "ANSI_X3.4-1968", "ascii" }, + { "US-ASCII", "ascii" }, + { "latin1", "iso8859" }, + { "ISO-8859-1", "iso8859" }, + { "latin9", "iso8859" }, + { "ISO-8859-15", "iso8859" }, + { "latin2", "iso8859" }, + { "ISO-8859-2", "iso8859" }, + { "ISO-8859-3", "latin3" }, + { "latin4", "iso8859" }, + { "ISO-8859-4", "iso8859" }, + { "cyrillic", "iso8859" }, + { "ISO-8859-5", "iso8859" }, + { "ISO-8859-6", "arabic" }, + { "ISO-8859-7", "greek" }, + { "IBM9005", "greek2005" }, + { "ISO-8859-8", "hebrew" }, + { "latin5", "iso8859" }, + { "ISO-8859-9", "iso8859" }, + { "latin6", "iso8859" }, + { "ISO-8859-10", "iso8859" }, + { "latin7", "iso8859" }, + { "ISO-8859-13", "iso8859" }, + { "latin8", "iso8859" }, + { "ISO-8859-14", "iso8859" }, + { "latin10", "iso8859" }, + { "ISO-8859-16", "iso8859" }, + { "IBM437", "dos" }, + { "EBCDIC-US", "ebcdic" }, + { "IBM1047", "IBM-1047" }, + { "KOI8-R", "koi8-r" }, + { "KOI8-U", "koi8-r" }, + { "GEORGIAN-PS", "georgianps" }, + { "TCVN5712-1", "tcvn" }, + { "NEXTSTEP", "next" }, + { "windows", "windows-1252" }, /* backward compatibility */ + { "CP1251", "windows-1251" }, + { "CP1252", "windows-1252" }, + { "CP1255", "windows-1255" }, { NULL, NULL } }; @@ -56,6 +112,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Thu Aug 24 15:10:03 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEAE116A4E0 for ; Thu, 24 Aug 2006 15:10:03 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D699443D6A for ; Thu, 24 Aug 2006 15:09:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id C75BB46D71 for ; Thu, 24 Aug 2006 11:09:48 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AACD2555AE; Thu, 24 Aug 2006 15:09:45 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A1CF316A4DF; Thu, 24 Aug 2006 15:09:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A19616A4DD for ; Thu, 24 Aug 2006 15:09:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C27D43D70 for ; Thu, 24 Aug 2006 15:09: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.6/8.13.6) with ESMTP id k7OF9XMG095215 for ; Thu, 24 Aug 2006 15:09:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7OF9TSY095212 for perforce@freebsd.org; Thu, 24 Aug 2006 15:09:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Aug 2006 15:09:29 GMT Message-Id: <200608241509.k7OF9TSY095212@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 104943 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Aug 2006 15:10:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=104943 Change 104943 by rwatson@rwatson_zoo on 2006/08/24 15:09:21 Integrate TrustedBSD audit3 branch from TrustedBSD base branch; full description in @104941. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile.inc1#13 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#8 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#13 integrate .. //depot/projects/trustedbsd/audit3/bin/date/netdate.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/df/df.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/ed/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/ps/ps.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdb/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/powerpc/fbsd.mh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/powerpc/fbsd.mt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/ppcfbsd-nat.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/ppcfbsd-tdep.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/ppcfbsd-tdep.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/rs6000-nat.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gdb/gdb/rs6000-tdep.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/less/LICENSE#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/Makefile.aut#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/NEWS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/brac.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/ch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/charset.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/charset.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/less/cmd.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/cmdbuf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/command.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/configure#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/configure.ac#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/decode.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/defines.ds#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/defines.h.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/defines.o2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/defines.o9#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/defines.wn#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/edit.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/filename.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/forwback.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/funcs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/ifile.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/input.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/jump.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/less.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/less.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/less.nro#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/lessecho.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/lessecho.man#1 branch .. //depot/projects/trustedbsd/audit3/contrib/less/lessecho.nro#1 branch .. //depot/projects/trustedbsd/audit3/contrib/less/lesskey.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/lesskey.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/lesskey.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/lesskey.nro#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/lglob.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/line.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/linenum.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/lsystem.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/mark.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/mkhelp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/optfunc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/option.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/option.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/opttbl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/os.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/output.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/pckeys.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/position.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/position.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/prompt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/screen.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/scrsize.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/search.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/signal.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/tags.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/ttyin.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/version.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/RELEASE_NOTES#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/submit.cf#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/version.m4#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/contrib/cidrexpand#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/main.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/queue.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/srvrsmtp.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/version.c#7 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#16 integrate .. //depot/projects/trustedbsd/audit3/etc/network.subr#8 integrate .. //depot/projects/trustedbsd/audit3/etc/pccard_ether#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#14 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/dhclient#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ramdisk#3 delete .. //depot/projects/trustedbsd/audit3/etc/rc.d/ramdisk-own#4 delete .. //depot/projects/trustedbsd/audit3/etc/rc.d/sshd#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ypxfrd#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.initdiskless#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.subr#10 integrate .. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.mc#5 integrate .. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.submit.mc#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libsupc++/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/alpha/Makefile#3 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/alpha/config.h#3 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/alpha/init.c#3 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/powerpc/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/powerpc/config.h#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/arch/powerpc/init.c#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#4 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/Makefile#13 integrate .. //depot/projects/trustedbsd/audit3/lib/csu/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/lib/csu/alpha/crt1.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/csu/alpha/crti.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/csu/alpha/crtn.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/Makefile.inc#5 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/SYS.h#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/Symbol.map#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/_fpmath.h#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/arith.h#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/Makefile.inc#4 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/_ctx_start.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/_set_tp.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/_setjmp.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/divrem.m4#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/fabs.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/flt_rounds.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/fpgetmask.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/fpgetround.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/fpgetsticky.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/fpsetmask.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/fpsetround.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/infinity.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/makecontext.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/modf.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/rfork_thread.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/setjmp.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/signalcontext.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/gen/sigsetjmp.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/net/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/net/byte_swap_2.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/net/byte_swap_4.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/net/htonl.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/net/htons.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/net/ntohl.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/net/ntohs.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/stdlib/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/string/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/string/bcopy.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/string/bzero.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/string/ffs.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/string/memcpy.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/string/memmove.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/sys/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/sys/Ovfork.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/sys/brk.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/sys/cerror.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/sys/exect.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/sys/fork.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/sys/pipe.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/sys/ptrace.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/sys/sbrk.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/sys/setlogin.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/sys/sigreturn.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/arm/net/htonl.S#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/net/htons.S#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/net/ntohl.S#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/net/ntohs.S#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc_r/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc_r/arch/alpha/_atomic_lock.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libdisk/write_alpha_disk.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libio/Makefile#5 delete .. //depot/projects/trustedbsd/audit3/lib/libio/alpha_sethae.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libio/bwx.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libio/io.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libio/io.h#2 delete .. //depot/projects/trustedbsd/audit3/lib/libio/swiz.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_alpha.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libpthread/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/alpha/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/alpha/alpha/context.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/alpha/alpha/enter_uts.S#3 delete .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/alpha/alpha/pthread_md.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/alpha/include/atomic_ops.h#2 delete .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/alpha/include/pthread_md.h#3 delete .. //depot/projects/trustedbsd/audit3/lib/libstand/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libstand/alpha/_setjmp.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/libthr/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/alpha/Makefile.inc#3 delete .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/alpha/alpha/pthread_md.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libthr/arch/alpha/include/pthread_md.h#2 delete .. //depot/projects/trustedbsd/audit3/lib/libthread_db/arch/alpha/libc_r_md.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libthread_db/arch/alpha/libpthread_md.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libutil/login.conf.5#5 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/alpha/Makefile.inc#3 delete .. //depot/projects/trustedbsd/audit3/lib/msun/alpha/Symbol.map#2 delete .. //depot/projects/trustedbsd/audit3/lib/msun/alpha/fenv.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/msun/alpha/fenv.h#3 delete .. //depot/projects/trustedbsd/audit3/lib/msun/alpha/s_copysign.S#2 delete .. //depot/projects/trustedbsd/audit3/lib/msun/alpha/s_copysignf.S#2 delete .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/alpha/Makefile.inc#2 delete .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/alpha/ld.so.script#2 delete .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/alpha/reloc.c#5 delete .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/alpha/rtld_machdep.h#3 delete .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/alpha/rtld_start.S#2 delete .. //depot/projects/trustedbsd/audit3/release/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/release/alpha/boot_crunch.conf#4 delete .. //depot/projects/trustedbsd/audit3/release/alpha/mkisoimages.sh#4 delete .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 integrate .. //depot/projects/trustedbsd/audit3/rescue/rescue/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/camcontrol/camcontrol.8#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/camcontrol/camcontrol.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/dhclient.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/dhclient.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/dump/dump.8#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/fsdb/fsdb.8#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/fsdb/fsdb.c#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/fsdb/fsdbutil.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/ggate/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifmedia.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipf/libipf/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw.8#12 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#11 integrate .. //depot/projects/trustedbsd/audit3/sbin/ping/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/secure/lib/libcrypto/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/audit3/secure/lib/libcrypto/opensslconf-alpha.h#2 delete .. //depot/projects/trustedbsd/audit3/share/examples/drivers/make_pseudo_driver.sh#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/amdsmb.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ixgb.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/nfsmb.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uplcom.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/rc.subr.8#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/lock.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.cpu.mk#7 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.endian.mk#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/support.S#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot0iic/doit.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot0spi/doit.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootspi/arm_init.s#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/common/help.common#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/common/loader.8#7 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#21 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_emul.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_signal.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#15 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.pc98#10 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/arl/if_arlreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athvar.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iicbus/if_ic.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ips/ips.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_ioctl.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_pci.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/brgphy.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_port.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_raid5.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysvec.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thr.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#39 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#13 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_spppsubr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_input.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_output.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netsmb/smb_crypt.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netsmb/smb_iod.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netsmb/smb_rq.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netsmb/smb_rq.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_amd64.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/nfsmb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_vnops.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_object.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pageq.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_zeroidle.c#7 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/lib/msun/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#13 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/gprof/alpha.h#2 delete .. //depot/projects/trustedbsd/audit3/usr.bin/gprof/gprof.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/less/defines.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/lessecho/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/locate/locate/locate.1#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/pkill/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/alpha-fbsd.c#4 delete .. //depot/projects/trustedbsd/audit3/usr.bin/uac/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/usr.bin/uac/uac.1#3 delete .. //depot/projects/trustedbsd/audit3/usr.bin/uac/uac.c#2 delete .. //depot/projects/trustedbsd/audit3/usr.bin/xlint/arch/alpha/targparam.h#2 delete .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#19 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/arp/arp.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/crunch/crunchide/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/newsyslog/newsyslog.c#9 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pnpinfo/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.lockd/kern.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.lockd/lockd.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/devices.c#10 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/install.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/traceroute/Makefile#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.553 2006/08/22 07:51:05 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -926,9 +926,6 @@ .if ${MK_RESCUE} != "no" || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif -.if ${TARGET_ARCH} == "alpha" -_elf2exe= usr.sbin/elf2exe -.endif .if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR) _kgzip= usr.sbin/kgzip .endif @@ -941,7 +938,6 @@ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ - ${_elf2exe} \ ${_kgzip} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.49 2006/08/22 11:12:09 flz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20060822: ramdisk{,-own} have been replaced by mdconfig{,2} +OLD_FILES+=etc/rc.d/ramdisk +OLD_FILES+=etc/rc.d/ramdisk-own # 20060704: KAME compat file net_osdep.h removed OLD_FILES+=usr/include/net/net_osdep.h # 20060517: pcvt removed @@ -334,7 +337,7 @@ OLD_FILES+=usr/share/man/man1/sgsc.1.gz OLD_FILES+=usr/share/man/man4/i386/stl.4.gz OLD_FILES+=usr/share/man/man8/raidctl.8.gz -.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64" +.if ${TARGET_ARCH} != "sparc64" # 20040130: libkse renamed to libpthread OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse.so @@ -3066,7 +3069,7 @@ OLD_LIBS+=usr/lib/libisc.so.1 # 200408XX OLD_LIBS+=usr/lib/snmp_netgraph.so.1 -.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64" +.if ${TARGET_ARCH} != "sparc64" # 20040130: libkse renamed to libpthread OLD_LIBS+=usr/lib/libkse.so.1 .endif ==== //depot/projects/trustedbsd/audit3/UPDATING#13 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20060816: + The IPFIREWALL_FORWARD_EXTENDED option is gone and the behaviour + for IP_FIREWALL_FORWARD is now as it was before when it was first + committed and for years after. The behaviour is now ON. + 20060725: enigma(1)/crypt(1) utility has been changed on 64 bit architectures. Now it can decrypt files created from different architectures. @@ -598,4 +603,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.452 2006/07/26 16:31:10 jkim Exp $ +$FreeBSD: src/UPDATING,v 1.453 2006/08/17 00:41:05 julian Exp $ ==== //depot/projects/trustedbsd/audit3/bin/date/netdate.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.18 2004/04/06 20:06:45 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.19 2006/08/20 06:31:24 imp Exp $"); #include #include @@ -108,14 +108,14 @@ warnx("all ports in use"); goto bad; } + memset(&msg, 0, sizeof(msg)); msg.tsp_type = TSP_SETDATE; msg.tsp_vers = TSPVERSION; if (gethostname(hostname, sizeof(hostname))) { warn("gethostname"); goto bad; } - (void)strncpy(msg.tsp_name, hostname, sizeof(msg.tsp_name) - 1); - msg.tsp_name[sizeof(msg.tsp_name) - 1] = '\0'; + (void)strlcpy(msg.tsp_name, hostname, sizeof(msg.tsp_name)); msg.tsp_seq = htons((u_short)0); msg.tsp_time.tv_sec = htonl((u_long)tval); msg.tsp_time.tv_usec = htonl((u_long)0); ==== //depot/projects/trustedbsd/audit3/bin/df/df.c#4 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.64 2005/01/10 08:39:21 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.65 2006/08/20 06:32:40 imp Exp $"); #include #include @@ -113,7 +113,7 @@ memset(&totalbuf, 0, sizeof(totalbuf)); totalbuf.f_bsize = DEV_BSIZE; - strncpy(totalbuf.f_mntfromname, "total", MNAMELEN); + strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN); vfslist = NULL; while ((ch = getopt(argc, argv, "abcgHhiklmnPt:")) != -1) switch (ch) { @@ -552,7 +552,7 @@ *str = 'n'; *(str + 1) = 'o'; for (i = 0, strptr = str + 2; i < cnt; i++, strptr++) { - strncpy(strptr, listptr[i], 32); + strlcpy(strptr, listptr[i], 32); strptr += strlen(listptr[i]); *strptr = ','; free(listptr[i]); ==== //depot/projects/trustedbsd/audit3/bin/ed/main.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.28 2005/02/09 17:37:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.29 2006/08/17 23:00:33 imp Exp $"); /* * CREDITS @@ -292,7 +292,7 @@ errmsg = "invalid address"; \ return ERR; \ } \ -} while (0); +} while (0) /* next_addr: return the next line address in the command buffer */ long ==== //depot/projects/trustedbsd/audit3/bin/ps/ps.1#4 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.86 2005/04/29 11:10:27 maxim Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.88 2006/08/21 03:09:12 yar Exp $ .\" -.Dd March 20, 2005 +.Dd August 21, 2006 .Dt PS 1 .Os .Sh NAME @@ -179,14 +179,16 @@ .It Fl o Display information associated with the space or comma separated list of keywords specified. +The last keyword in the list may be appended with an equals +.Pq Ql = +sign and a string that spans the rest of the argument and can contain +space and comma characters. +This causes the printed header to use the specified string instead of +the standard header. Multiple keywords may also be given in the form of more than one .Fl o option. -Keywords may be appended with an equals -.Pq Ql = -sign and a string. -This causes the printed header to use the specified string instead of -the standard header. +So the header texts for multiple keywords can be changed. If all keywords have empty header texts, no header line is written. .It Fl p Display information about processes which match the specified process IDs. ==== //depot/projects/trustedbsd/audit3/contrib/gdb/FREEBSD-Xlist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.6 2004/06/20 19:15:58 marcel Exp $ +$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.7 2006/08/23 03:30:33 marcel Exp $ gdb-6.1.1/bfd/* gdb-6.1.1/config/* gdb-6.1.1/etc/* @@ -16,7 +16,6 @@ gdb-6.1.1/gdb/config/mn10300/* gdb-6.1.1/gdb/config/ns32k/* gdb-6.1.1/gdb/config/pa/* -gdb-6.1.1/gdb/config/rs6000/* gdb-6.1.1/gdb/config/sh/* gdb-6.1.1/gdb/config/v850/* gdb-6.1.1/gdb/config/vax/* @@ -34,7 +33,6 @@ gdb-6.1.1/gdb/osf-share/* gdb-6.1.1/gdb/hppa* gdb-6.1.1/gdb/rdi-share/* -gdb-6.1.1/gdb/rs6000* gdb-6.1.1/gdb/sh* gdb-6.1.1/gdb/testsuite/* gdb-6.1.1/gdb/v850* ==== //depot/projects/trustedbsd/audit3/contrib/less/LICENSE#2 (text+ko) ==== @@ -2,7 +2,7 @@ ------------ Less -Copyright (C) 1984-2002 Mark Nudelman +Copyright (C) 1984-2005 Mark Nudelman Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/trustedbsd/audit3/contrib/less/Makefile.aut#2 (text+ko) ==== @@ -24,9 +24,10 @@ ${SRC} regexp.c regexp.h \ COPYING INSTALL LICENSE Makefile.in Makefile.aut NEWS README \ configure configure.ac lesskey.c lessecho.c scrsize.c \ - cmd.h funcs.h lglob.h less.h lesskey.h option.h pckeys.h position.h \ + charset.h cmd.h funcs.h lglob.h less.h lesskey.h option.h pckeys.h position.h \ install.sh defines.h.in mkinstalldirs \ - less.nro lesskey.nro less.man lesskey.man less.hlp \ + less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man \ + less.hlp \ mkfuncs.awk mkhelp.c \ ${DISTFILES_W} @@ -55,7 +56,8 @@ clean: rm -f Makefile config.status config.log config.cache defines.h stamp-h \ - README NEWS less.nro lesskey.nro less.man lesskey.man + README NEWS \ + less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man distclean: clean realclean: clean @@ -78,6 +80,8 @@ ${REPLACE_VERSION} ${srcdir}/less.nro.VER ${srcdir}/lesskey.nro: ${srcdir}/lesskey.nro.VER ${srcdir}/version.c ${REPLACE_VERSION} ${srcdir}/lesskey.nro.VER +${srcdir}/lessecho.nro: ${srcdir}/lessecho.nro.VER ${srcdir}/version.c + ${REPLACE_VERSION} ${srcdir}/lessecho.nro.VER ${srcdir}/less.hlp: ${srcdir}/less.hlp.VER ${srcdir}/version.c ${REPLACE_VERSION} ${srcdir}/less.hlp.VER @@ -85,6 +89,8 @@ ${NROFF} ${srcdir}/less.nro >${srcdir}/less.man ${srcdir}/lesskey.man: ${srcdir}/lesskey.nro ${NROFF} ${srcdir}/lesskey.nro >${srcdir}/lesskey.man +${srcdir}/lessecho.man: ${srcdir}/lessecho.nro + ${NROFF} ${srcdir}/lessecho.nro >${srcdir}/lessecho.man distfiles: ${DISTFILES} ==== //depot/projects/trustedbsd/audit3/contrib/less/Makefile.in#2 (text+ko) ==== @@ -59,12 +59,13 @@ ${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h -install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro installdirs +install: all ${srcdir}/less.nro ${srcdir}/lesskey.nro ${srcdir}/lessecho.nro installdirs ${INSTALL_PROGRAM} less ${bindir}/${binprefix}less ${INSTALL_PROGRAM} lesskey ${bindir}/${binprefix}lesskey ${INSTALL_PROGRAM} lessecho ${bindir}/${binprefix}lessecho ${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/man${manext}/${manprefix}less.${manext} ${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/man${manext}/${manprefix}lesskey.${manext} + ${INSTALL_DATA} ${srcdir}/lessecho.nro ${mandir}/man${manext}/${manprefix}lessecho.${manext} install-strip: ${MAKE} INSTALL_PROGRAM='${INSTALL_PROGRAM} -s' install ==== //depot/projects/trustedbsd/audit3/contrib/less/Makefile.wnb#2 (text+ko) ==== @@ -1,20 +1,27 @@ # Makefile for less. # Windows version +# Bolarnd C++ 5.5.1 free command line tools #### Start of system configuration section. #### +# +# Borland's make knows its own location in the +# filesystem. +# CC = bcc32 -LIBDIR = d:\bc45\lib +LIBDIR = $(MAKEDIR)\..\lib CFLAGS = -O2 -w-pro -TWC -P-c -v- -d -f- -ff- -vi -LDFLAGS = /Tpe /v- /ap /c /x -LD = tlink32 +LDFLAGS = -Tpe -v- -ap -c -x -V4.0 -GF:AGGRESSIVE +LD = ilink32 LIBS = ${LIBDIR}\import32.lib ${LIBDIR}\cw32.lib #### End of system configuration section. #### +# # This rule allows us to supply the necessary -D options # in addition to whatever the user asks for. +# .c.obj: ${CC} -c -I. ${CPPFLAGS} ${CFLAGS} $< @@ -25,16 +32,20 @@ position.obj prompt.obj search.obj signal.obj tags.obj \ ttyin.obj version.obj regexp.obj -all: less lesskey +all: less lesskey lessecho +# # This is really horrible, but the command line is too long for # MS-DOS if we try to link ${OBJ}. +# less: ${OBJ} - -del lesskey.obj - ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj *.obj, $@,,${LIBS} + ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj $**, $@,,${LIBS} lesskey: lesskey.obj version.obj - ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj lesskey.obj version.obj, $@,,${LIBS} + ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj $**, $@,,${LIBS} + +lessecho: lessecho.obj version.obj + ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj $**, $@,,${LIBS} defines.h: defines.wn -del defines.h @@ -44,6 +55,16 @@ clean: -del *.obj + -del *.il? + -del *.tds + -del defines.h + +spotless: clean -del less.exe -del lesskey.exe + -del lessecho.exe + +realclean: spotless + +distclean: spotless ==== //depot/projects/trustedbsd/audit3/contrib/less/NEWS#2 (text+ko) ==== @@ -7,11 +7,66 @@ http://www.greenwoodsoftware.com/less You can also download the latest version of less from there. - To report bugs, suggestions or comments, send email to - bug-less@gnu.org or markn@greenwoodsoftware.com. + To report bugs, suggestions or comments, send email to bug-less@gnu.org. + +====================================================================== + + + Major changes between "less" versions 382 and 394 + +* Add history file to save search and shell command history between + invocations of less. + +* Improve behavior of history list for search and shell commands. + +* Add -K (or --quit-on-intr) option to make less exit immediately on ctrl-C. + +* Improve handling of UTF-8 files and commands, including better + line wrapping and handling double-width chars. + +* Added LESSUTFBINFMT environment variable to control display of + non-printable characters in a UTF-8 file. + +* Add --with-secure option to configure, to make it easier to + build a secure version of less. + +* Show search matches in the status column even if search highlights + are disabled via the -G option or the ESC-u command. + +* Improve performance when the file contains very long lines. + +* Add "windows" charset. + +* Add man page for lessecho. + +* Add support for erase2 character, treated same as erase. + +* Use ASCII lowercase/uppercase logic when operating on the command line. + +* Update makefile for Borland C++ 5.5.1. + +* Fix bug in calculating number of pages for %D prompt. + +* Fix bug in handling tag file error. + +* Fix obscure bug if input file is deleted while viewing help. + +* Fix bug handling filenames which include square brackets. + +* Fix possible buffer overflow in "global" tag search. + +* Fix possible buffer overflow in usage of LESSOPEN and LESSCLOSE. + +* Fix buffer overflow in reverse search. ====================================================================== + Major changes between "less" versions 381 and 382 + +* Removed some old copyrighted code. + This probably breaks OS/9 support. + +====================================================================== Major changes between "less" versions 378 and 381 ==== //depot/projects/trustedbsd/audit3/contrib/less/README#2 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 381 + Less, version 394 - This is the distribution of less, version 381, released 17 Jan 2003. + This is the distribution of less, version 394, released 03 Dec 2005. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or @@ -57,6 +57,10 @@ regcomp Use the V8-compatible regcomp. regcomp-local Use Henry Spencer's V8-compatible regcomp (source is supplied with less). + --with-secure + Builds a "secure" version of less, with some features disabled + to prevent users from viewing other files, accessing shell + commands, etc. 3. It is a good idea to look over the generated Makefile and defines.h and make sure they look ok. If you know of any peculiarities of @@ -67,9 +71,6 @@ -lncurses -lcurses -ltermcap -ltermlib If you wish, you may edit defines.h to remove some optional features. - If you wish to build a "secure" version of less (which disables all - features which might allow a user to do unintended things to the system - on which less is running), edit defines.h and define SECURE to 1. If you choose not to include some features in your version, you may wish to edit the manual page "less.nro" and the help page "less.hlp" to remove the descriptions of the features which you are removing. ==== //depot/projects/trustedbsd/audit3/contrib/less/brac.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2002 Mark Nudelman + * Copyright (C) 1984-2004 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/trustedbsd/audit3/contrib/less/ch.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2002 Mark Nudelman + * Copyright (C) 1984-2004 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. ==== //depot/projects/trustedbsd/audit3/contrib/less/charset.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2002 Mark Nudelman + * Copyright (C) 1984-2005 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -18,8 +18,11 @@ #if HAVE_LOCALE #include #include +#include #endif +#include "charset.h" + public int utf_mode = 0; /* @@ -31,23 +34,76 @@ int *p_flag; char *desc; } charsets[] = { - { "ascii", NULL, "8bcccbcc18b95.b" }, - { "dos", NULL, "8bcccbcc12bc5b223.b" }, - { "ebcdic", NULL, "5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b." }, - { "IBM-1047", NULL, "4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc191.b" }, - { "iso8859", NULL, "8bcccbcc18b95.33b." }, - { "koi8-r", NULL, "8bcccbcc18b95.b128." }, - { "next", NULL, "8bcccbcc18b95.bb125.bb" }, - { "utf-8", &utf_mode, "8bcccbcc18b." }, + { "ascii", NULL, "8bcccbcc18b95.b" }, + { "utf-8", &utf_mode, "8bcccbcc18b95.b126.bb" }, + { "iso8859", NULL, "8bcccbcc18b95.33b." }, + { "latin3", NULL, "8bcccbcc18b95.33b5.b8.b15.b4.b12.b18.b12.b." }, + { "arabic", NULL, "8bcccbcc18b95.33b.3b.7b2.13b.3b.b26.5b19.b" }, + { "greek", NULL, "8bcccbcc18b95.33b4.2b4.b3.b35.b44.b" }, + { "greek2005", NULL, "8bcccbcc18b95.33b14.b35.b44.b" }, + { "hebrew", NULL, "8bcccbcc18b95.33b.b29.32b28.2b2.b" }, + { "koi8-r", NULL, "8bcccbcc18b95.b." }, + { "KOI8-T", NULL, "8bcccbcc18b95.b8.b6.b8.b.b.5b7.3b4.b4.b3.b.b.3b." }, + { "georgianps", NULL, "8bcccbcc18b95.3b11.4b12.2b." }, + { "tcvn", NULL, "b..b...bcccbccbbb7.8b95.b48.5b." }, + { "TIS-620", NULL, "8bcccbcc18b95.b.4b.11b7.8b." }, + { "next", NULL, "8bcccbcc18b95.bb125.bb" }, + { "dos", NULL, "8bcccbcc12bc5b95.b." }, + { "windows-1251", NULL, "8bcccbcc12bc5b95.b24.b." }, + { "windows-1252", NULL, "8bcccbcc12bc5b95.b.b11.b.2b12.b." }, + { "windows-1255", NULL, "8bcccbcc12bc5b95.b.b8.b.5b9.b.4b." }, + { "ebcdic", NULL, "5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b." }, + { "IBM-1047", NULL, "4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc191.b" }, { NULL, NULL, NULL } }; +/* + * Support "locale charmap"/nl_langinfo(CODESET) values, as well as others. + */ struct cs_alias { char *name; char *oname; } cs_aliases[] = { - { "latin1", "iso8859" }, - { "latin9", "iso8859" }, + { "UTF-8", "utf-8" }, + { "ANSI_X3.4-1968", "ascii" }, + { "US-ASCII", "ascii" }, + { "latin1", "iso8859" }, + { "ISO-8859-1", "iso8859" }, + { "latin9", "iso8859" }, + { "ISO-8859-15", "iso8859" }, + { "latin2", "iso8859" }, + { "ISO-8859-2", "iso8859" }, + { "ISO-8859-3", "latin3" }, + { "latin4", "iso8859" }, + { "ISO-8859-4", "iso8859" }, + { "cyrillic", "iso8859" }, + { "ISO-8859-5", "iso8859" }, + { "ISO-8859-6", "arabic" }, + { "ISO-8859-7", "greek" }, + { "IBM9005", "greek2005" }, + { "ISO-8859-8", "hebrew" }, + { "latin5", "iso8859" }, + { "ISO-8859-9", "iso8859" }, + { "latin6", "iso8859" }, + { "ISO-8859-10", "iso8859" }, + { "latin7", "iso8859" }, + { "ISO-8859-13", "iso8859" }, + { "latin8", "iso8859" }, + { "ISO-8859-14", "iso8859" }, + { "latin10", "iso8859" }, + { "ISO-8859-16", "iso8859" }, + { "IBM437", "dos" }, + { "EBCDIC-US", "ebcdic" }, + { "IBM1047", "IBM-1047" }, + { "KOI8-R", "koi8-r" }, + { "KOI8-U", "koi8-r" }, + { "GEORGIAN-PS", "georgianps" }, + { "TCVN5712-1", "tcvn" }, + { "NEXTSTEP", "next" }, + { "windows", "windows-1252" }, /* backward compatibility */ + { "CP1251", "windows-1251" }, + { "CP1252", "windows-1252" }, + { "CP1255", "windows-1255" }, { NULL, NULL } }; @@ -56,6 +112,7 @@ static char chardef[256]; static char *binfmt = NULL; +static char *utfbinfmt = NULL; public int binattr = AT_STANDOUT; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-trustedbsd-cvs@FreeBSD.ORG Thu Aug 24 16:50:57 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3391116A4E2 for ; Thu, 24 Aug 2006 16:50:57 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E47443D46 for ; Thu, 24 Aug 2006 16:50:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 7288046C56 for ; Thu, 24 Aug 2006 12:50:54 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1D80555881; Thu, 24 Aug 2006 16:50:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 170BE16A4DF; Thu, 24 Aug 2006 16:50:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDFB416A4DA for ; Thu, 24 Aug 2006 16:50:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7249E43D46 for ; Thu, 24 Aug 2006 16:50:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7OGomVs013572 for ; Thu, 24 Aug 2006 16:50:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7OGomcM013569 for perforce@freebsd.org; Thu, 24 Aug 2006 16:50:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Aug 2006 16:50:48 GMT Message-Id: <200608241650.k7OGomcM013569@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 104957 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Aug 2006 16:50:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=104957 Change 104957 by rwatson@rwatson_zoo on 2006/08/24 16:49:57 Update for s/BSM_/AUDIT_/. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#20 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#20 (text+ko) ==== @@ -118,7 +118,7 @@ token_t *cur, *hdr, *trail; struct timeval tm; - tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; + tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; if (tot_rec_size <= MAX_AUDIT_RECORD_SIZE) { /* Create the header token */ tm.tv_usec = ctime->tv_nsec / 1000; From owner-trustedbsd-cvs@FreeBSD.ORG Thu Aug 24 17:37:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96ECA16A4DA for ; Thu, 24 Aug 2006 17:37:54 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03B6143D4C for ; Thu, 24 Aug 2006 17:37:53 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 27B9846C5E for ; Thu, 24 Aug 2006 13:37:52 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 6E7F9576CA; Thu, 24 Aug 2006 17:36:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 569D116A4E7; Thu, 24 Aug 2006 17:36:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1AA0516A4DD for ; Thu, 24 Aug 2006 17:36:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0D4A43D46 for ; Thu, 24 Aug 2006 17:36:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7OHanbq019533 for ; Thu, 24 Aug 2006 17:36:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7OHanBH019530 for perforce@freebsd.org; Thu, 24 Aug 2006 17:36:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Aug 2006 17:36:49 GMT Message-Id: <200608241736.k7OHanBH019530@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 104963 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Aug 2006 17:37:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=104963 Change 104963 by rwatson@rwatson_sesame on 2006/08/24 17:35:48 Add a comment about an API usability problem relating to our whole record read model, which may cause problems when combining a series of long records with a short buffer and an event model. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#27 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#27 (text+ko) ==== @@ -912,6 +912,13 @@ * records that would be truncated if actually passed to the * process. This helps maintain the discreet record read * interface. + * + * XXXRW: This causes a somewhat tricky problem when a + * program checks for readability using kqueue/select/poll, + * then provides too small a buffer to hold any of the + * available records. We should probably, in that situation, + * also return EAGAIN rather than blocking unconditionally, + * or possible even an error each time a record is dropped. */ while ((ape = audit_pipe_pop(ap)) == NULL) { if (ap->ap_flags & AUDIT_PIPE_NBIO) { From owner-trustedbsd-cvs@FreeBSD.ORG Thu Aug 24 20:02:54 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D234E16A4DD for ; Thu, 24 Aug 2006 20:02:54 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64CDB43D9B for ; Thu, 24 Aug 2006 20:02:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9D72646C6D for ; Thu, 24 Aug 2006 16:02:14 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C215F53508; Thu, 24 Aug 2006 20:01:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id BD15516A4E2; Thu, 24 Aug 2006 20:01:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7745316A4DE for ; Thu, 24 Aug 2006 20:01:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C100A43D62 for ; Thu, 24 Aug 2006 20:01:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7OK113D029470 for ; Thu, 24 Aug 2006 20:01:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7OK10Cp029464 for perforce@freebsd.org; Thu, 24 Aug 2006 20:01:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Aug 2006 20:01:00 GMT Message-Id: <200608242001.k7OK10Cp029464@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 104982 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Aug 2006 20:02:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=104982 Change 104982 by rwatson@rwatson_zoo on 2006/08/24 20:00:39 Integrate TrustedBSD base branch from FreeBSD CVS: - Loop back audit pipe kqueue support. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#77 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#18 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#107 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.8#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fast_ipsec.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipsec.4#4 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.port.mk#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#50 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_fec.c#16 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#6 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#77 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.553 2006/08/22 07:51:05 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.554 2006/08/24 17:02:26 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1032,8 +1032,9 @@ .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) - ${_+_}@${ECHODIR} "===> ${_lib} (depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_lib}; \ + ${MAKE} DIRPRFX=${_lib}/ obj; \ ${MAKE} DIRPRFX=${_lib}/ depend; \ ${MAKE} DIRPRFX=${_lib}/ all; \ ${MAKE} DIRPRFX=${_lib}/ install @@ -1044,8 +1045,9 @@ # static PAM library, and dynamic PAM library before dynamic PAM # modules. lib/libpam__L: .PHONY - ${_+_}@${ECHODIR} "===> lib/libpam (depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \ cd ${.CURDIR}/lib/libpam; \ + ${MAKE} DIRPRFX=lib/libpam/ obj; \ ${MAKE} DIRPRFX=lib/libpam/ depend; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install ==== //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.89 2006/08/21 18:25:43 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.90 2006/08/24 15:46:29 marcel Exp $ .include @@ -24,7 +24,7 @@ sort \ ${_texinfo} -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_ARCH} == "arm" MK_GDB= no # not yet .endif ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#107 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.963 2006/08/23 03:42:36 gshapiro Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.964 2006/08/24 14:45:56 bmah Exp $ 2000 @@ -350,9 +350,9 @@ implemented. &os; now runs on the Xbox, whose architecture is nearly identical - to the i386. For details of the latest development, - see - and . + to the i386. For details of the latest development, see + . + &merged; Boot Loader Changes @@ -767,6 +767,13 @@ for example, by using tagged rule option. For more details, see &man.ipfw.8;. + The IPFIREWALL_FORWARD_EXTENDED kernel + option has been removed. This option was used to permit + &man.ipfw.4; to redirect packets with local destinations. + This behavior is now always enabled when + the IPFIREWALL_FORWARD kernel option is + enabled. &merged; + The ip6fw(8) packet filter has been removed. Since &man.ipfw.4; has gained IPv6 support, it should be used instead. Please note that some rules might need to be adjusted. @@ -1084,6 +1091,10 @@ flag, which causes it to ignore files and directories with the nodump flag set. &merged; + The &man.fsdb.8; utility now supports changing the birth + time of files on UFS2 file systems using the new + the btime command. + The &man.find.1; program now supports and other related primaries, which can be used to create expressions based on a file's creation time. &merged; @@ -1557,7 +1568,7 @@ &merged; IPFilter has been updated from - 4.1.8 to 4.1.13. + 4.1.8 to 4.1.13. &merged; less has been updated from v381 to v394. ==== //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.8#12 (text+ko) ==== @@ -26,9 +26,9 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/fsdb/fsdb.8,v 1.30 2006/08/23 22:44:00 ceri Exp $ +.\" $FreeBSD: src/sbin/fsdb/fsdb.8,v 1.31 2006/08/24 09:14:02 ceri Exp $ .\" -.Dd August 23, 2006 +.Dd August 24, 2006 .Dt FSDB 8 .Os .Sh NAME @@ -224,6 +224,9 @@ or .Va atimensec field will be set to zero. +Note that +.Cm btime +is available on UFS2 file systems only. .Pp .It Cm quit , q , exit , Em Exit the program. ==== //depot/projects/trustedbsd/base/share/man/man4/fast_ipsec.4#5 (text+ko) ==== @@ -22,9 +22,9 @@ .\" 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/fast_ipsec.4,v 1.4 2006/06/26 22:30:07 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/fast_ipsec.4,v 1.5 2006/08/24 17:07:19 danger Exp $ .\" -.Dd January 20, 2003 +.Dd August 24, 2006 .Dt FAST_IPSEC 4 .Os .Sh NAME @@ -32,6 +32,7 @@ .Nd hardware-accelerated IP Security Protocols .Sh SYNOPSIS .Cd "options FAST_IPSEC" +.Cd "options IPSEC_FILTERGIF" .Cd "device crypto" .Pp .Bl -item -compact @@ -69,6 +70,11 @@ The user should refer to .Xr ipsec 4 for basic information on setting up and using these protocols. +Note that it is not currently possible to use +.Nm +in conjuction with the +.Tn "KAME IPsec" +implementation. .Pp System configuration requires the .Xr crypto 4 @@ -83,6 +89,12 @@ .Dq enc0 , to perform packet filtering before outbound encryption and after decapsulation inbound. +.Pp +To properly filter +.Xr gif 4 +tunnels with firewalls, add +.Cd "options IPSEC_FILTERGIF" +to the kernel configuration file. .Sh DIAGNOSTICS To be added. .Sh SEE ALSO ==== //depot/projects/trustedbsd/base/share/man/man4/ipsec.4#4 (text+ko) ==== @@ -27,9 +27,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ipsec.4,v 1.18 2006/02/14 13:20:09 gnn Exp $ +.\" $FreeBSD: src/share/man/man4/ipsec.4,v 1.19 2006/08/24 17:07:19 danger Exp $ .\" -.Dd February 14, 2006 +.Dd August 24, 2006 .Dt IPSEC 4 .Os .Sh NAME @@ -39,6 +39,10 @@ .In sys/types.h .In netinet/in.h .In netinet6/ipsec.h +.Cd "options IPSEC" +.Cd "options IPSEC_DEBUG" +.Cd "options IPSEC_ESP" +.Cd "options IPSEC_FILTERGIF" .Sh DESCRIPTION .Nm is a security protocol implemented within the Internet Protocol layer @@ -253,6 +257,7 @@ .Xr ioctl 2 , .Xr socket 2 , .Xr ipsec_set_policy 3 , +.Xr fast_ipsec 4 , .Xr icmp6 4 , .Xr intro 4 , .Xr ip6 4 , ==== //depot/projects/trustedbsd/base/share/mk/bsd.port.mk#4 (text+ko) ==== @@ -1,7 +1,10 @@ -# $FreeBSD: src/share/mk/bsd.port.mk,v 1.307 2004/07/02 20:47:18 eik Exp $ +# $FreeBSD: src/share/mk/bsd.port.mk,v 1.308 2006/08/24 18:04:49 obrien Exp $ PORTSDIR?= /usr/ports BSDPORTMK?= ${PORTSDIR}/Mk/bsd.port.mk +# Needed to keep bsd.own.mk from reading in /etc/src.conf when building ports. +SRCCONF= /dev/null + .include .include "${BSDPORTMK}" ==== //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#50 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.228 2006/06/27 14:46:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.229 2006/08/24 18:52:28 marius Exp $"); #include #include @@ -693,14 +693,13 @@ if (errmsg_pos != -1 && ((2 * errmsg_pos + 1) < fsoptions->uio_iovcnt) && errmsg_len > 0 && errmsg != NULL) { if (fsoptions->uio_segflg == UIO_SYSSPACE) { - strncpy(fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, - errmsg, + bcopy(errmsg, + fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); } else { - copystr(errmsg, + copyout(errmsg, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, - fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len, - NULL); + fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); } } ==== //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#14 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.22 2006/07/24 15:20:07 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.23 2006/08/24 16:51:02 emax Exp $ */ #include @@ -1220,7 +1220,8 @@ ng_btsocket_rfcomm_session_p s = NULL; struct sockaddr_l2cap l2sa; struct sockopt l2sopt; - int mtu, error; + int error; + u_int16_t mtu; mtx_assert(&ng_btsocket_rfcomm_sessions_mtx, MA_OWNED); ==== //depot/projects/trustedbsd/base/sys/netgraph/ng_fec.c#16 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_fec.c,v 1.26 2005/11/11 16:04:57 ru Exp $ + * $FreeBSD: src/sys/netgraph/ng_fec.c,v 1.27 2006/08/24 19:50:00 ru Exp $ */ /*- * Copyright (c) 1996-1999 Whistle Communications, Inc. @@ -1093,6 +1093,7 @@ char ifname[NG_FEC_FEC_NAME_MAX + 1]; struct ifnet *ifp; priv_p priv; + const uint8_t eaddr[ETHER_ADDR_LEN] = {0, 0, 0, 0, 0, 0}; struct ng_fec_bundle *b; int error = 0; @@ -1143,7 +1144,7 @@ log(LOG_WARNING, "%s: can't acquire netgraph name\n", ifname); /* Attach the interface */ - ether_ifattach(ifp, IF_LLADDR(priv->ifp)); + ether_ifattach(ifp, eaddr); callout_handle_init(&priv->fec_ch); /* Override output method with our own */ ==== //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#6 (text) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.7 2006/06/05 14:48:17 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.8 2006/08/24 17:42:38 rwatson Exp $ */ #include @@ -172,6 +172,7 @@ static d_read_t audit_pipe_read; static d_ioctl_t audit_pipe_ioctl; static d_poll_t audit_pipe_poll; +static d_kqfilter_t audit_pipe_kqfilter; static struct cdevsw audit_pipe_cdevsw = { .d_version = D_VERSION, @@ -181,9 +182,20 @@ .d_read = audit_pipe_read, .d_ioctl = audit_pipe_ioctl, .d_poll = audit_pipe_poll, + .d_kqfilter = audit_pipe_kqfilter, .d_name = AUDIT_PIPE_NAME, }; +static int audit_pipe_kqread(struct knote *note, long hint); +static void audit_pipe_kqdetach(struct knote *note); + +static struct filterops audit_pipe_read_filterops = { + .f_isfd = 1, + .f_attach = NULL, + .f_detach = audit_pipe_kqdetach, + .f_event = audit_pipe_kqread, +}; + /* * Some global statistics on audit pipes. */ @@ -425,6 +437,7 @@ ap->ap_inserts++; ap->ap_qlen++; selwakeuppri(&ap->ap_selinfo, PSOCK); + KNOTE_LOCKED(&ap->ap_selinfo.si_note, 0); if (ap->ap_flags & AUDIT_PIPE_ASYNC) pgsigio(&ap->ap_sigio, SIGIO, 0); } @@ -520,6 +533,8 @@ return (NULL); ap->ap_qlimit = AUDIT_PIPE_QLIMIT_DEFAULT; TAILQ_INIT(&ap->ap_queue); + knlist_init(&ap->ap_selinfo.si_note, &audit_pipe_mtx, NULL, NULL, + NULL); /* * Default flags, naflags, and auid-specific preselection settings to @@ -533,6 +548,9 @@ TAILQ_INIT(&ap->ap_preselect_list); ap->ap_preselect_mode = AUDITPIPE_PRESELECT_MODE_TRAIL; + /* + * Add to global list and update global statistics. + */ TAILQ_INSERT_HEAD(&audit_pipe_list, ap, ap_list); audit_pipe_count++; audit_pipe_ever++; @@ -572,6 +590,7 @@ audit_pipe_preselect_flush_locked(ap); audit_pipe_flush(ap); + knlist_destroy(&ap->ap_selinfo.si_note); TAILQ_REMOVE(&audit_pipe_list, ap, ap_list); free(ap, M_AUDIT_PIPE); audit_pipe_count--; @@ -946,6 +965,71 @@ } /* + * Audit pipe kqfilter. + */ +static int +audit_pipe_kqfilter(struct cdev *dev, struct knote *kn) +{ + struct audit_pipe *ap; + + ap = dev->si_drv1; + KASSERT(ap != NULL, ("audit_pipe_kqfilter: ap == NULL")); + + if (kn->kn_filter != EVFILT_READ) + return (EINVAL); + + kn->kn_fop = &audit_pipe_read_filterops; + kn->kn_hook = ap; + + mtx_lock(&audit_pipe_mtx); + knlist_add(&ap->ap_selinfo.si_note, kn, 1); + mtx_unlock(&audit_pipe_mtx); + return (0); +} + +/* + * Return true if there are records available for reading on the pipe. + */ +static int +audit_pipe_kqread(struct knote *kn, long hint) +{ + struct audit_pipe_entry *ape; + struct audit_pipe *ap; + + mtx_assert(&audit_pipe_mtx, MA_OWNED); + + ap = (struct audit_pipe *)kn->kn_hook; + KASSERT(ap != NULL, ("audit_pipe_kqread: ap == NULL")); + + if (ap->ap_qlen != 0) { + ape = TAILQ_FIRST(&ap->ap_queue); + KASSERT(ape != NULL, ("audit_pipe_kqread: ape == NULL")); + + kn->kn_data = ape->ape_record_len; + return (1); + } else { + kn->kn_data = 0; + return (0); + } +} + +/* + * Detach kqueue state from audit pipe. + */ +static void +audit_pipe_kqdetach(struct knote *kn) +{ + struct audit_pipe *ap; + + ap = (struct audit_pipe *)kn->kn_hook; + KASSERT(ap != NULL, ("audit_pipe_kqdetach: ap == NULL")); + + mtx_lock(&audit_pipe_mtx); + knlist_remove(&ap->ap_selinfo.si_note, kn, 1); + mtx_unlock(&audit_pipe_mtx); +} + +/* * Initialize the audit pipe system. */ static void From owner-trustedbsd-cvs@FreeBSD.ORG Thu Aug 24 20:04:20 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C2AB16A4DE for ; Thu, 24 Aug 2006 20:04:20 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3343743D68 for ; Thu, 24 Aug 2006 20:04:12 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5B0D246D78 for ; Thu, 24 Aug 2006 16:04:11 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 3A51155C6D; Thu, 24 Aug 2006 20:04:10 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 357C816A4E1; Thu, 24 Aug 2006 20:04:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 119E716A4DF for ; Thu, 24 Aug 2006 20:04:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33A1C43D73 for ; Thu, 24 Aug 2006 20:04: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.6/8.13.6) with ESMTP id k7OK46nE031137 for ; Thu, 24 Aug 2006 20:04:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7OK45Qu031134 for perforce@freebsd.org; Thu, 24 Aug 2006 20:04:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Aug 2006 20:04:05 GMT Message-Id: <200608242004.k7OK45Qu031134@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 104983 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Aug 2006 20:04:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=104983 Change 104983 by rwatson@rwatson_zoo on 2006/08/24 20:03:28 Integrate TrustedBSD audit3 branch from TrustedBSD base branch: - Loop back audit pipe kqueue support. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile.inc1#14 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate .. //depot/projects/trustedbsd/audit3/sbin/fsdb/fsdb.8#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/fast_ipsec.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ipsec.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.port.mk#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_fec.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#28 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.553 2006/08/22 07:51:05 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.554 2006/08/24 17:02:26 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1032,8 +1032,9 @@ .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) - ${_+_}@${ECHODIR} "===> ${_lib} (depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_lib}; \ + ${MAKE} DIRPRFX=${_lib}/ obj; \ ${MAKE} DIRPRFX=${_lib}/ depend; \ ${MAKE} DIRPRFX=${_lib}/ all; \ ${MAKE} DIRPRFX=${_lib}/ install @@ -1044,8 +1045,9 @@ # static PAM library, and dynamic PAM library before dynamic PAM # modules. lib/libpam__L: .PHONY - ${_+_}@${ECHODIR} "===> lib/libpam (depend,all,install)"; \ + ${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \ cd ${.CURDIR}/lib/libpam; \ + ${MAKE} DIRPRFX=lib/libpam/ obj; \ ${MAKE} DIRPRFX=lib/libpam/ depend; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install ==== //depot/projects/trustedbsd/audit3/gnu/usr.bin/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.89 2006/08/21 18:25:43 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.90 2006/08/24 15:46:29 marcel Exp $ .include @@ -24,7 +24,7 @@ sort \ ${_texinfo} -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_ARCH} == "arm" MK_GDB= no # not yet .endif ==== //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.963 2006/08/23 03:42:36 gshapiro Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.964 2006/08/24 14:45:56 bmah Exp $ 2000 @@ -350,9 +350,9 @@ implemented. &os; now runs on the Xbox, whose architecture is nearly identical - to the i386. For details of the latest development, - see - and . + to the i386. For details of the latest development, see + . + &merged; Boot Loader Changes @@ -767,6 +767,13 @@ for example, by using tagged rule option. For more details, see &man.ipfw.8;. + The IPFIREWALL_FORWARD_EXTENDED kernel + option has been removed. This option was used to permit + &man.ipfw.4; to redirect packets with local destinations. + This behavior is now always enabled when + the IPFIREWALL_FORWARD kernel option is + enabled. &merged; + The ip6fw(8) packet filter has been removed. Since &man.ipfw.4; has gained IPv6 support, it should be used instead. Please note that some rules might need to be adjusted. @@ -1084,6 +1091,10 @@ flag, which causes it to ignore files and directories with the nodump flag set. &merged; + The &man.fsdb.8; utility now supports changing the birth + time of files on UFS2 file systems using the new + the btime command. + The &man.find.1; program now supports and other related primaries, which can be used to create expressions based on a file's creation time. &merged; @@ -1557,7 +1568,7 @@ &merged; IPFilter has been updated from - 4.1.8 to 4.1.13. + 4.1.8 to 4.1.13. &merged; less has been updated from v381 to v394. ==== //depot/projects/trustedbsd/audit3/sbin/fsdb/fsdb.8#6 (text+ko) ==== @@ -26,9 +26,9 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/fsdb/fsdb.8,v 1.30 2006/08/23 22:44:00 ceri Exp $ +.\" $FreeBSD: src/sbin/fsdb/fsdb.8,v 1.31 2006/08/24 09:14:02 ceri Exp $ .\" -.Dd August 23, 2006 +.Dd August 24, 2006 .Dt FSDB 8 .Os .Sh NAME @@ -224,6 +224,9 @@ or .Va atimensec field will be set to zero. +Note that +.Cm btime +is available on UFS2 file systems only. .Pp .It Cm quit , q , exit , Em Exit the program. ==== //depot/projects/trustedbsd/audit3/share/man/man4/fast_ipsec.4#4 (text+ko) ==== @@ -22,9 +22,9 @@ .\" 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/fast_ipsec.4,v 1.4 2006/06/26 22:30:07 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/fast_ipsec.4,v 1.5 2006/08/24 17:07:19 danger Exp $ .\" -.Dd January 20, 2003 +.Dd August 24, 2006 .Dt FAST_IPSEC 4 .Os .Sh NAME @@ -32,6 +32,7 @@ .Nd hardware-accelerated IP Security Protocols .Sh SYNOPSIS .Cd "options FAST_IPSEC" +.Cd "options IPSEC_FILTERGIF" .Cd "device crypto" .Pp .Bl -item -compact @@ -69,6 +70,11 @@ The user should refer to .Xr ipsec 4 for basic information on setting up and using these protocols. +Note that it is not currently possible to use +.Nm +in conjuction with the +.Tn "KAME IPsec" +implementation. .Pp System configuration requires the .Xr crypto 4 @@ -83,6 +89,12 @@ .Dq enc0 , to perform packet filtering before outbound encryption and after decapsulation inbound. +.Pp +To properly filter +.Xr gif 4 +tunnels with firewalls, add +.Cd "options IPSEC_FILTERGIF" +to the kernel configuration file. .Sh DIAGNOSTICS To be added. .Sh SEE ALSO ==== //depot/projects/trustedbsd/audit3/share/man/man4/ipsec.4#4 (text+ko) ==== @@ -27,9 +27,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ipsec.4,v 1.18 2006/02/14 13:20:09 gnn Exp $ +.\" $FreeBSD: src/share/man/man4/ipsec.4,v 1.19 2006/08/24 17:07:19 danger Exp $ .\" -.Dd February 14, 2006 +.Dd August 24, 2006 .Dt IPSEC 4 .Os .Sh NAME @@ -39,6 +39,10 @@ .In sys/types.h .In netinet/in.h .In netinet6/ipsec.h +.Cd "options IPSEC" +.Cd "options IPSEC_DEBUG" +.Cd "options IPSEC_ESP" +.Cd "options IPSEC_FILTERGIF" .Sh DESCRIPTION .Nm is a security protocol implemented within the Internet Protocol layer @@ -253,6 +257,7 @@ .Xr ioctl 2 , .Xr socket 2 , .Xr ipsec_set_policy 3 , +.Xr fast_ipsec 4 , .Xr icmp6 4 , .Xr intro 4 , .Xr ip6 4 , ==== //depot/projects/trustedbsd/audit3/share/mk/bsd.port.mk#3 (text+ko) ==== @@ -1,7 +1,10 @@ -# $FreeBSD: src/share/mk/bsd.port.mk,v 1.307 2004/07/02 20:47:18 eik Exp $ +# $FreeBSD: src/share/mk/bsd.port.mk,v 1.308 2006/08/24 18:04:49 obrien Exp $ PORTSDIR?= /usr/ports BSDPORTMK?= ${PORTSDIR}/Mk/bsd.port.mk +# Needed to keep bsd.own.mk from reading in /etc/src.conf when building ports. +SRCCONF= /dev/null + .include .include "${BSDPORTMK}" ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#18 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.228 2006/06/27 14:46:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.229 2006/08/24 18:52:28 marius Exp $"); #include #include @@ -694,14 +694,13 @@ if (errmsg_pos != -1 && ((2 * errmsg_pos + 1) < fsoptions->uio_iovcnt) && errmsg_len > 0 && errmsg != NULL) { if (fsoptions->uio_segflg == UIO_SYSSPACE) { - strncpy(fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, - errmsg, + bcopy(errmsg, + fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); } else { - copystr(errmsg, + copyout(errmsg, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, - fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len, - NULL); + fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); } } ==== //depot/projects/trustedbsd/audit3/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.22 2006/07/24 15:20:07 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.23 2006/08/24 16:51:02 emax Exp $ */ #include @@ -1220,7 +1220,8 @@ ng_btsocket_rfcomm_session_p s = NULL; struct sockaddr_l2cap l2sa; struct sockopt l2sopt; - int mtu, error; + int error; + u_int16_t mtu; mtx_assert(&ng_btsocket_rfcomm_sessions_mtx, MA_OWNED); ==== //depot/projects/trustedbsd/audit3/sys/netgraph/ng_fec.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_fec.c,v 1.26 2005/11/11 16:04:57 ru Exp $ + * $FreeBSD: src/sys/netgraph/ng_fec.c,v 1.27 2006/08/24 19:50:00 ru Exp $ */ /*- * Copyright (c) 1996-1999 Whistle Communications, Inc. @@ -1093,6 +1093,7 @@ char ifname[NG_FEC_FEC_NAME_MAX + 1]; struct ifnet *ifp; priv_p priv; + const uint8_t eaddr[ETHER_ADDR_LEN] = {0, 0, 0, 0, 0, 0}; struct ng_fec_bundle *b; int error = 0; @@ -1143,7 +1144,7 @@ log(LOG_WARNING, "%s: can't acquire netgraph name\n", ifname); /* Attach the interface */ - ether_ifattach(ifp, IF_LLADDR(priv->ifp)); + ether_ifattach(ifp, eaddr); callout_handle_init(&priv->fec_ch); /* Override output method with our own */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.7 2006/06/05 14:48:17 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_pipe.c,v 1.8 2006/08/24 17:42:38 rwatson Exp $ */ #include From owner-trustedbsd-cvs@FreeBSD.ORG Fri Aug 25 10:35:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 832C316A4E1 for ; Fri, 25 Aug 2006 10:35:24 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2B6C43D45 for ; Fri, 25 Aug 2006 10:35:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 3E1BF46DF2 for ; Fri, 25 Aug 2006 06:35:23 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AC77F568B1; Fri, 25 Aug 2006 10:35:22 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A5D1B16A4E0; Fri, 25 Aug 2006 10:35:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8081416A4DA for ; Fri, 25 Aug 2006 10:35:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4735A43D45 for ; Fri, 25 Aug 2006 10:35:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7PAZMDC041609 for ; Fri, 25 Aug 2006 10:35:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7PAZJJ1041606 for perforce@freebsd.org; Fri, 25 Aug 2006 10:35:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 25 Aug 2006 10:35:19 GMT Message-Id: <200608251035.k7PAZJJ1041606@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 105027 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Aug 2006 10:35:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=105027 Change 105027 by rwatson@rwatson_fledge on 2006/08/25 10:34:59 Add audit MFC news to TrustedBSD news page. Affected files ... .. //depot/projects/trustedbsd/www/news.page#7 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#7 (text+ko) ==== @@ -1,5 +1,6 @@